Telebot ubdate: pager button now is work (857869d7) · Commits · Mirror / Simple OPDS

opds_catalog/management/commands/sopds_telebot.py

+78 −49

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ from constance import config
		from telegram.ext import Updater, CommandHandler, MessageHandler, Filters, RegexHandler, CallbackQueryHandler
		from telegram import InlineKeyboardButton, InlineKeyboardMarkup, Document


		query_delimiter = "####"

		class Command(BaseCommand):
		help = 'SimpleOPDS Telegram Bot engine.'
		@@ -69,41 +69,17 @@ class Command(BaseCommand):
		(settings.SUBTITLE,update.message.from_user.username))
		self.logger.info("Start talking with user: %s"%update.message.from_user)

		def getBooks(self, bot, update):
		book_name=update.message.text
		self.logger.info("Got message from user %s: %s" % (update.message.from_user.username, book_name))

		if len(book_name)<3:
		response = 'Слишком короткая строка для поиска, попробуйте еще раз.'
		else:
		response = 'Выполняю поиск книги: %s' % (book_name)

		bot.send_message(chat_id=update.message.chat_id, text=response)
		self.logger.info("Send message to user %s: %s" % (update.message.from_user.username,response))

		if len(book_name) < 3:
		return

		def BookFilter(self, query):
		q_objects = Q()
		q_objects.add(Q(search_title__contains=book_name.upper()), Q.OR)
		q_objects.add( Q(authors__search_full_name__contains=book_name.upper()), Q.OR)

		q_objects.add(Q(search_title__contains=query.upper()), Q.OR)
		q_objects.add( Q(authors__search_full_name__contains=query.upper()), Q.OR)
		books = Book.objects.filter(q_objects).order_by('search_title', '-docdate').distinct()
		books_count = books.count()

		if books_count == 0:
		response = 'По Вашему запросу ничего не найдено, попробуйте еще раз.'
		bot.send_message(chat_id=update.message.chat_id, text=response)
		self.logger.info("Send message to user %s: %s" % (update.message.from_user.username,response))
		return

		response = 'Найдено %s книг(и). \nФормирую список, через несколько секунд выберите нужную для скачивания:' % books_count
		bot.send_message(chat_id=update.message.chat_id, text=response)
		self.logger.info("Send message to user %s: %s" % (update.message.from_user.username, response))
		return books

		page_num = 1
		#op = OPDS_Paginator(books_count, 0, page_num, config.SOPDS_MAXITEMS, HALF_PAGES_LINKS)
		op = OPDS_Paginator(books_count, 0, page_num, 8, HALF_PAGES_LINKS)
		def BookPager(self, books, page_num, query):
		books_count = books.count()
		op = OPDS_Paginator(books_count, 0, page_num, config.SOPDS_TELEBOT_MAXITEMS, HALF_PAGES_LINKS)
		items = []

		prev_title = ''
		@@ -153,15 +129,59 @@ class Command(BaseCommand):
		doubles = '(дубликатов:%s) '%b['doubles'] if b['doubles'] else ''
		response+='<b>%(title)s</b>\n%(author)s\n%(dbl)s/download%(link)s\n\n'%{'title':b['title'], 'author':authors,'link':b['id'], 'dbl':doubles}

		buttons = [InlineKeyboardButton('1 <<', callback_data='/p1'),
		InlineKeyboardButton('%s <'%op.previous_page_number , callback_data='/p%s'%op.previous_page_number),
		InlineKeyboardButton('[ %s ]'%op.number , callback_data='/p%s'%op.number),
		InlineKeyboardButton('> %s'%op.next_page_number , callback_data='/p%s'%op.next_page_number),
		InlineKeyboardButton('>> %s'%op.num_pages, callback_data='/p%s'%op.num_pages)]
		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.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))]

		markup = InlineKeyboardMarkup([buttons]) if op.num_pages>1 else None

		bot.send_message(chat_id=update.message.chat_id, text=response, parse_mode='HTML', reply_markup=markup)
		return {'message':response, 'buttons':markup}

		def getBooks(self, bot, update):
		query=update.message.text
		self.logger.info("Got message from user %s: %s" % (update.message.from_user.username, query))

		if len(query)<3:
		response = 'Слишком короткая строка для поиска, попробуйте еще раз.'
		else:
		response = 'Выполняю поиск книги: %s' % (query)

		bot.send_message(chat_id=update.message.chat_id, text=response)
		self.logger.info("Send message to user %s: %s" % (update.message.from_user.username,response))

		if len(query) < 3:
		return

		books = self.BookFilter(query)
		books_count = books.count()

		if books_count == 0:
		response = 'По Вашему запросу ничего не найдено, попробуйте еще раз.'
		bot.send_message(chat_id=update.message.chat_id, text=response)
		self.logger.info("Send message to user %s: %s" % (update.message.from_user.username,response))
		return

		response = 'Найдено %s книг(и). \nФормирую список, через несколько секунд выберите нужную для скачивания:' % books_count
		bot.send_message(chat_id=update.message.chat_id, text=response)
		self.logger.info("Send message to user %s: %s" % (update.message.from_user.username, response))

		response = self.BookPager(books, 1, query)
		bot.send_message(chat_id=update.message.chat_id, text=response['message'], parse_mode='HTML', reply_markup=response['buttons'])

		def getBooksPage(self, bot, update, user_data):
		callback_query = update.callback_query
		(query,page_num) = callback_query.data.split(query_delimiter, maxsplit=1)
		try:
		page_num = int(page_num)
		except:
		page_num = 1

		books = self.BookFilter(query)
		response = self.BookPager(books, page_num, query)
		bot.edit_message_text(chat_id=callback_query.message.chat_id, message_id=callback_query.message.message_id, text=response['message'], parse_mode='HTML', reply_markup=response['buttons'])
		return

		def downloadBooks(self, bot, update):
		book_id_set=re.findall(r'\d+$',update.message.text)
		@@ -195,10 +215,12 @@ class Command(BaseCommand):
		markup = InlineKeyboardMarkup([buttons])
		bot.sendMessage(chat_id=update.message.chat_id, text=response, parse_mode='HTML', reply_markup=markup)
		self.logger.info("Send download buttons.")
		return

		def getBookFile(self, bot, update, user_data):
		query = update.callback_query
		book_id_set=re.findall(r'\d+$',query.data)
		callback_query = update.callback_query
		query = callback_query.data
		book_id_set=re.findall(r'\d+$',query)
		if len(book_id_set)==1:
		try:
		book_id=int(book_id_set[0])
		@@ -211,46 +233,53 @@ class Command(BaseCommand):

		if book==None:
		response = 'Книга по указанной Вами ссылке не найдена, попробуйте повторить поиск книги сначала.'
		bot.sendMessage(chat_id=query.message.chat_id, text=response, parse_mode='HTML')
		bot.sendMessage(chat_id=callback_query.message.chat_id, text=response, parse_mode='HTML')
		self.logger.info("Not find download links: %s" % response)
		return

		filename = dl.getFileName(book)
		document = None

		if re.match(r'/getfileorig',query.data):
		if re.match(r'/getfileorig',query):
		document = dl.getFileData(book)
		#document = config.SOPDS_SITE_ROOT + reverse("opds_catalog:download",kwargs={"book_id": book.id, "zip_flag": 0})

		if re.match(r'/getfilezip',query.data):
		if re.match(r'/getfilezip',query):
		document = dl.getFileDataZip(book)
		#document = config.SOPDS_SITE_ROOT + reverse("opds_catalog:download", kwargs={"book_id": book.id, "zip_flag": 1})
		filename = filename + '.zip'

		if re.match(r'/getfileepub',query.data):
		if re.match(r'/getfileepub',query):
		document = dl.getFileDataEpub(book)
		#document = config.SOPDS_SITE_ROOT+reverse("opds_catalog:convert",kwargs={"book_id": book.id, "convert_type": "epub"}))]
		filename = filename + '.epub'

		if re.match(r'/getfilemobi',query.data):
		if re.match(r'/getfilemobi',query):
		document = dl.getFileDataMobi(book)
		#document = config.SOPDS_SITE_ROOT+reverse("opds_catalog:convert",kwargs={"book_id": book.id, "convert_type": "mobi"}))]
		filename = filename + '.mobi'

		if document:
		bot.send_document(chat_id=query.message.chat_id,document=document,filename=filename)
		bot.send_document(chat_id=callback_query.message.chat_id,document=document,filename=filename)
		document.close()
		self.logger.info("Send file: %s" % filename)
		else:
		response = 'Возникла техническая ошибка, обратитесь к администратору сайта.'
		bot.sendMessage(chat_id=query.message.chat_id, text=response, parse_mode='HTML')
		bot.sendMessage(chat_id=callback_query.message.chat_id, text=response, parse_mode='HTML')
		self.logger.info("Book get error: %s" % response)
		return

		user_data['type'] = query.data;
		user_data['type'] = query;

		return

		def botCallback(self, bot, update, user_data):
		query = update.callback_query
		if re.match(r'/getfile', query.data):
		return self.getBookFile(bot, update, user_data)
		else:
		return self.getBooksPage(bot, update, user_data)

		def start(self):
		writepid(self.pidfile)
		quit_command = 'CTRL-BREAK' if sys.platform == 'win32' else 'CONTROL-C'
		@@ -265,7 +294,7 @@ class Command(BaseCommand):
		updater.dispatcher.add_handler(start_command_handler)
		updater.dispatcher.add_handler(getBook_handler)
		updater.dispatcher.add_handler(download_handler)
		updater.dispatcher.add_handler(CallbackQueryHandler(self.getBookFile, pass_user_data=True))
		updater.dispatcher.add_handler(CallbackQueryHandler(self.botCallback, pass_user_data=True))

		updater.start_polling(clean=True)
		updater.idle()

opds_catalog/tests/test_constance.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ class constanceTestCase(TestCase):
		out = StringIO()
		call_command('constance', 'list', stdout=out)
		out.seek(0)
		self.assertEquals(out.getvalue().count('\n'), 35)
		self.assertEquals(out.getvalue().count('\n'), 36)
		out.close()

		def test_constance_set_get_attr(self):

sopds/settings.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -175,6 +175,7 @@ CONSTANCE_CONFIG = OrderedDict([
		('SOPDS_CACHE_TIME', (1200, _('Pages cache time'))),

		('SOPDS_TELEBOT_API_TOKEN', ('', _('Telegramm API Token'))),
		('SOPDS_TELEBOT_MAXITEMS', (5, _('Max items on page'))),

		('SOPDS_AUTH', (True,_('Enable authentication'))),
		('SOPDS_ALPHABET_MENU', (True,_('Enable alphabet submenu'))),
		@@ -218,7 +219,7 @@ CONSTANCE_CONFIG_FIELDSETS = {
		'2. Server Options': ('SOPDS_AUTH', 'SOPDS_ALPHABET_MENU', 'SOPDS_DOUBLES_HIDE', 'SOPDS_COVER_SHOW', 'SOPDS_SPLITITEMS', 'SOPDS_MAXITEMS', 'SOPDS_TITLE_AS_FILENAME', 'SOPDS_NOCOVER_PATH'),
		'3. Scanner Options': ('SOPDS_FB2SAX','SOPDS_ZIPSCAN','SOPDS_ZIPCODEPAGE', 'SOPDS_INPX_ENABLE', 'SOPDS_INPX_SKIP_UNCHANGED', 'SOPDS_INPX_TEST_ZIP', 'SOPDS_INPX_TEST_FILES', 'SOPDS_DELETE_LOGICAL'),
		'4. Scanner Shedule': ('SOPDS_SCAN_SHED_MIN', 'SOPDS_SCAN_SHED_HOUR', 'SOPDS_SCAN_SHED_DAY','SOPDS_SCAN_SHED_DOW'),
		'5. Telegramm Bot Options': ('SOPDS_TELEBOT_API_TOKEN',),
		'5. Telegramm Bot Options': ('SOPDS_TELEBOT_API_TOKEN','SOPDS_TELEBOT_MAXITEMS'),
		'6. Converters Options': ('SOPDS_FB2TOEPUB', 'SOPDS_FB2TOMOBI', 'SOPDS_TEMP_DIR'),
		'7. Log & PID Files': ('SOPDS_SERVER_LOG', 'SOPDS_SCANNER_LOG', 'SOPDS_TELEBOT_LOG','SOPDS_SERVER_PID','SOPDS_SCANNER_PID','SOPDS_TELEBOT_PID'),
		}