Fix bot bugs

Author: yididiyan

libgen_bot/bot.py

@@ -3,7 +3,7 @@
 from telegram import MessageEntity
 from  telegram.ext import Updater, MessageHandler, Filters, CommandHandler, RegexHandler
 
-from handlers import start,search, fetch, search_with_out_command
+from handlers import start,search, fetch, search_or_fetch
 from config import API_KEY
 
 
@@ -17,19 +17,19 @@
 
     updater = Updater(API_KEY)
     dispatcher = updater.dispatcher
-    message_handler = MessageHandler(Filters.text, search_with_out_command)
+    message_handler = MessageHandler(Filters.text, search_or_fetch)
     start_handler = CommandHandler('start', start)
     search_handler = CommandHandler('search', search, pass_args=True)
     test_handler = CommandHandler('test', search, pass_args=True)
-    fetch_handler = RegexHandler(re.compile('/get[0-9A-F]{32}'), fetch, pass_chat_data=True)
+    #fetch_handler = RegexHandler(re.compile('/get[0-9A-F]{32}'), fetch, pass_chat_data=True)
 
 
     ## Add handlers to dispatcher
     dispatcher.add_handler(message_handler)
     dispatcher.add_handler(start_handler)
     dispatcher.add_handler(search_handler)
     dispatcher.add_handler(test_handler)
-    dispatcher.add_handler(fetch_handler)
+    #dispatcher.add_handler(fetch_handler)
 
     print('INFO: Starting bot... ')
     updater.start_polling()

libgen_bot/handlers.py

@@ -15,7 +15,13 @@ def start(bot, update):
                     <b>Commands</b> \
                     \n/search -keyword- -- Search books by title', parse_mode=ParseMode.HTML)
 
-def fetch(bot, update, **kwargs):
+
+def search_or_fetch(bot, update, **args):
+    if update.effective_message.text.startswith('/get'): return fetch(bot, update, args)
+
+    search(bot, update, args)
+
+def fetch(bot, update, args):
     md5 = update.effective_message.text[4:]
     url = api.fetch(md5)
     bot.send_chat_action(chat_id=update.message.chat_id, action=ChatAction.TYPING)
@@ -26,11 +32,10 @@ def emojize_book_list(books):
 
 def search(bot, update, args):
     bot.send_chat_action(chat_id=update.message.chat_id, action=ChatAction.TYPING)
-    results = api.search(' '.join(args))
+    results = api.search(update.message.text)
     bot.send_message(chat_id=update.message.chat_id, text=(emojize_book_list(results) if results  else 'Oops, no results found!!'), parse_mode=ParseMode.HTML)
 
 def search_with_out_command(bot, update):
     bot.send_chat_action(chat_id=update.message.chat_id, action=ChatAction.TYPING)
     results = api.search(update.message.text)
     bot.send_message(chat_id=update.message.chat_id, text=(emojize_book_list(results) if results  else 'Oops, no results found!!'), parse_mode=ParseMode.HTML)
-    

libgen_bot/libgen/api.py

@@ -3,18 +3,15 @@
 
 
 BASE_URL = 'http://gen.lib.rus.ec/'
-BASE_DOWNLAOD_LINK = 'http://libgen.io/ads.php'
+BASE_DOWNLAOD_LINK = 'http://libgen.lc/ads.php'
 
 def browse(term):
-    url = BASE_URL + 'search.php/?req=' + (term.replace(' ', '+'))
+    url = BASE_URL + 'search.php?req=' + (term.replace(' ', '+'))
     result = urllib.request.urlopen(url)
-    assert result
-    
     return result
 
 def get_dict_of_books(result):
     results = []
-
     soup = BeautifulSoup(result, 'html.parser')
     soup = soup.find_all('table', attrs={'align': 'center'})[0]
     search_results = soup.find_all('tr') [1:]
@@ -46,7 +43,7 @@ def fetch(md5):
     result = urllib.request.urlopen(url)
     soup = BeautifulSoup(result, 'html.parser')
 
-    return soup.table.find_all('td')[2].a['href']
+    return soup.table.find_all('a')[0]['href']
 
 def search(term):
     return get_dict_of_books(browse(term))