Commit 55db268a authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Telebot update: stop reload current page

parent 177de4b1

opds_catalog/dl.py

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ def getFileDataConv(book, convert_type): 


    popen_args = ("\"%s\" \"%s\" \"%s\"" % (converter_path, tmp_fb2_path, tmp_conv_path))

    proc = subprocess.Popen(popen_args, shell=True, stdout=subprocess.PIPE)

    # У следующий строки 2 функции 1-получение информации по конвертации и 2- ожидание конца конвертации

    # В силу 2й функции ее удаление приведет к ошибке выдачи сконвертированного файла

    out = proc.stdout.readlines()



    if os.path.isfile(tmp_conv_path):

opds_catalog/management/commands/sopds_telebot.py

+3 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ class Command(BaseCommand): 


        buttons = [InlineKeyboardButton('1 <<', callback_data='%s%s%s'%(query,query_delimiter,1)),

                   InlineKeyboardButton('%s <'%op.previous_page_number , callback_data='%s%s%s'%(query,query_delimiter,op.previous_page_number)),

                   InlineKeyboardButton('[ %s ]'%op.number , callback_data='%s%s%s'%(query,query_delimiter,op.number)),

                   InlineKeyboardButton('[ %s ]'%op.number , callback_data='%s%s%s'%(query,query_delimiter,'current')),

                   InlineKeyboardButton('> %s'%op.next_page_number , callback_data='%s%s%s'%(query,query_delimiter,op.next_page_number)),

                   InlineKeyboardButton('>> %s'%op.num_pages, callback_data='%s%s%s'%(query,query_delimiter,op.num_pages))]
@@ -173,6 +173,8 @@ class Command(BaseCommand): 
    def getBooksPage(self, bot, update, user_data):

        callback_query = update.callback_query

        (query,page_num) = callback_query.data.split(query_delimiter, maxsplit=1)

        if (page_num == 'current'):

            return

        try:

            page_num = int(page_num)

        except: