Bot improvements

docs/source/bot.rst

@@ -62,16 +62,31 @@ Talking to the bot
 
 Bot supports a number of commands.
 
-1. Add a torrent using ``/add`` command (torrent is downloaded to a default directory.)::
+1. To start new conversation with bot use command::
+
+    /start
+
+  and follow further instructions. You can add new, list or remove already registered torrents.
+
+  .. note::
+    If you want to cancel current operation use `/cancel` command.
+
+2. Add a torrent using ``/add`` command (torrent is downloaded to a default directory.)::
 
     /add https://rutracker.org/forum/viewtopic.php?t=1234567
 
 
-2. If you want to download a torrent to a custom directory start a new conversation::
+3. All registered torrents can be viewed with::
 
-    /start
+   /list
+
+4. To remove torrent use command::
+
+    /remove
+
+5. To show all available commands use::
 
-  and follow further instructions.
+    /help
 
 
 Supervisor configuration

torrt/bots/telegram_bot.py

@@ -1,13 +1,14 @@
 import logging
 
 from torrt.base_bot import BaseBot
-from torrt.toolbox import add_torrent_from_url, config
+from torrt.toolbox import add_torrent_from_url, get_registered_torrents, remove_torrent
 from torrt.utils import BotClassesRegistry, get_torrent_from_url, RPCObjectsRegistry
 
 try:
     import telegram
-    from telegram import ReplyKeyboardMarkup, ReplyKeyboardRemove
-    from telegram.ext import Filters, Updater, ConversationHandler, CommandHandler, MessageHandler, RegexHandler
+    from telegram import ReplyKeyboardMarkup, ReplyKeyboardRemove, InlineKeyboardMarkup, InlineKeyboardButton
+    from telegram.ext import Filters, Updater, ConversationHandler, CommandHandler, MessageHandler, RegexHandler, \
+    CallbackQueryHandler
 
 except ImportError:
     telegram = None
@@ -16,7 +17,7 @@
 
 
 class TelegramBot(BaseBot):
-    START, ASKING_URL, URL, PATH = 1, 2, 3, 4
+    START, URL, PATH = 1, 2, 3
 
     alias = 'telegram'
     url = 'https://api.telegram.org/bot'
@@ -31,12 +32,12 @@ def __init__(self, token, allowed_users=None):
             return
 
         self.token = token
-        allowed_users = allowed_users or ''
+        self.allowed_users = allowed_users or ''
         self.handler_kwargs = {}
         self.updater = Updater(token=self.token)
         self.dispatcher = self.updater.dispatcher
-        if allowed_users:
-            self.handler_kwargs = {'filters': Filters.user(username=allowed_users.split(','))}
+        if self.allowed_users:
+            self.handler_kwargs = {'filters': Filters.user(username=self.allowed_users.split(','))}
 
     def test_configuration(self):
         return telegram and bool(self.updater)
@@ -48,31 +49,51 @@ def run(self):
             self.updater.idle()
 
     def add_handlers(self):
+        path_handler_regex = r'^/(?!(cancel|start|add|list|remove|help)(?!/)).+|\.'
 
         conv_handler = ConversationHandler(
             entry_points=[CommandHandler('start', self.command_start, **self.handler_kwargs)],
 
             states={
-                self.ASKING_URL: [MessageHandler(Filters.text, self.handle_ask_url)],
                 self.URL: [RegexHandler('http[s]?://', self.handle_process_url, pass_user_data=True)],
-                self.PATH: [RegexHandler(r'^/.+|\.', self.handle_ask_download_path, pass_user_data=True)],
+                self.PATH: [RegexHandler(path_handler_regex, self.handle_ask_download_path, pass_user_data=True)],
             },
 
-            fallbacks=[CommandHandler('cancel', self.cancel_handler)]
+            fallbacks=[CommandHandler('cancel', self.cancel_handler)],
+            allow_reentry=True
         )
 
         self.dispatcher.add_handler(conv_handler)
+        self.dispatcher.add_handler(CallbackQueryHandler(self.handle_callbacks))
         self.dispatcher.add_handler(CommandHandler('add', self.command_add_torrent, **self.handler_kwargs))
+        self.dispatcher.add_handler(CommandHandler('list', self.command_list_torrents, **self.handler_kwargs))
+        self.dispatcher.add_handler(CommandHandler('remove', self.command_remove_torrents, **self.handler_kwargs))
+        self.dispatcher.add_handler(CommandHandler('help', self.command_help, **self.handler_kwargs))
+
+    def handle_callbacks(self, bot, update):
+        """Handler to process all callbacks from buttons"""
+        handlers = {
+            'add_torrent': self.handle_ask_url,
+            'list_torrents': self.command_list_torrents,
+            'delete_torrent': self.command_remove_torrents
+        }
+        handler = handlers.get(update.callback_query.data)
+        if handler:
+            handler(bot, update.callback_query)
+        elif update.callback_query.data.startswith('hash:'):
+            self.handle_remove_torrents(bot, update)
 
     def handle_ask_url(self, bot, update):
-        update.message.reply_text(text="Give me an URL and I'll do the rest.")
+        update.message.reply_text(text="Give me a URL and I'll do the rest.",
+                                  reply_markup=ReplyKeyboardRemove())
         return self.URL
 
     def handle_process_url(self, bot, update, user_data):
         torrent_url = update.message.text
         torrent_data = get_torrent_from_url(torrent_url)
         if torrent_data is None:
-            update.message.reply_text('Unable to add torrent from `%s`' % torrent_url)
+            update.message.reply_text('Unable to add torrent from `%s`' % torrent_url,
+                                      reply_markup=ReplyKeyboardRemove())
             return ConversationHandler.END
         else:
             user_data['url'] = torrent_url
@@ -82,7 +103,7 @@ def handle_process_url(self, bot, update, user_data):
                     torrents = rpc.method_get_torrents()
                     for torrent in torrents:
                         download_dirs.add(torrent['download_to'])
-            choices = [download_dirs]
+            choices = [[directory] for directory in download_dirs]
             update.message.reply_text('Where to download data? Send absolute path or "."',
                                       reply_markup=ReplyKeyboardMarkup(choices, one_time_keyboard=True))
             return self.PATH
@@ -99,28 +120,60 @@ def handle_ask_download_path(self, bot, update, user_data):
             if path == '.':
                 path = None
 
-            torrents_count = len(config.load()['torrents'])
-            add_torrent_from_url(torrent_url, download_to=path)
-            if len(config.load()['torrents']) > torrents_count:
-                update.message.reply_text('Torrent from `%s` was added' % torrent_url)
+            torrents_count = len(get_registered_torrents())
+            try:
+                add_torrent_from_url(torrent_url, download_to=path)
+            except Exception as e:
+                logging.error('Unable to add torrent: %s', e)
+                update.message.reply_text('Error was occurred during registering torrent.',
+                                          reply_markup=ReplyKeyboardRemove())
+            if len(get_registered_torrents()) > torrents_count:
+                update.message.reply_text('Torrent from `%s` was added' % torrent_url,
+                                          reply_markup=ReplyKeyboardRemove())
             else:
-                update.message.reply_text('Torrent was not added.')
+                update.message.reply_text('Unable to add torrent.', reply_markup=ReplyKeyboardRemove())
         return ConversationHandler.END
 
     def cancel_handler(self, bot, update):
-        update.message.reply_text('Bye! I hope to see tou again.',
-                                  reply_markup=ReplyKeyboardRemove())
-
+        update.message.reply_text('Bye! I hope to see you again.', reply_markup=ReplyKeyboardRemove())
         return ConversationHandler.END
 
+    def handle_remove_torrents(self, bot, update):
+        """
+        Handler for torrent remove action.
+        data is colon-joined string which is contains:
+        1. keyword `hash` - command prefix
+        2. torrent HASH from configured RPC
+        3. 0|1 - optional attribute (with_data) responsible for data removal from RPC
+        For example 'hash:1234567890' or 'hash:1234567890:0'
+        """
+        data = update.callback_query.data
+        split_data = data.split(':')[1:]
+        torrent_hash = split_data.pop(0)
+        if not split_data:
+            # with_data attribute was not set yet, ask user
+            keyboard = InlineKeyboardMarkup([[InlineKeyboardButton(text='Yes', callback_data=data + ':1'),
+                                              InlineKeyboardButton(text='No', callback_data=data + ':0')]])
+            update.callback_query.message.reply_text('Do you want to delete data?', reply_markup=keyboard)
+        else:
+            torrent_data = get_registered_torrents().get(torrent_hash)
+            if torrent_data:
+                remove_torrent(torrent_hash, with_data=bool(int(split_data[0])))
+                update.callback_query.message.reply_text('Torrent `{}` was removed'.format(torrent_data['name']))
+            else:
+                update.callback_query.message.reply_text('Torrent not found. Try one more time with /remove')
+
+        return
+
     def command_start(self, bot, update):
         """Start dialog handler"""
-        keyboard = [["Add new torrent"]]
-
-        update.message.reply_text('Do you want to add new torrents?',
-                                  reply_markup=ReplyKeyboardMarkup(keyboard, one_time_keyboard=True))
+        kb = InlineKeyboardMarkup([[InlineKeyboardButton(text='Add torrent', callback_data='add_torrent'),
+                                    InlineKeyboardButton(text='List torrents', callback_data='list_torrents'),
+                                    InlineKeyboardButton(text='Delete torrent', callback_data='delete_torrent'),
+                                    ]])
+        bot.send_message(update.message.chat_id, 'What do you want to do?', reply_markup=kb)
 
-        return self.ASKING_URL
+        return self.URL
 
     def command_add_torrent(self, bot, update):
         """Stand-alone handler to add torrent"""
@@ -129,12 +182,44 @@ def command_add_torrent(self, bot, update):
             update.message.reply_text('Please provide link to the tracker page. '
                                       'For example: \n/add https://rutracker.org/forum/viewtopic.php?t=1')
             return
-        torrents_count = len(config.load()['torrents'])
-        add_torrent_from_url(torrent_url)
-        if len(config.load()['torrents']) > torrents_count:
-            bot.send_message(chat_id=update.message.chat_id, text='Torrent from `%s` was added' % torrent_url)
+        torrents_count = len(get_registered_torrents())
+        try:
+            add_torrent_from_url(torrent_url)
+        except Exception as e:
+            logging.error('Unable to register the torrent: {}'.format(e))
+            bot.send_message(chat_id=update.message.chat_id, text='Unable to register the torrent due to an error.')
+
+        if len(get_registered_torrents()) > torrents_count:
+            bot.send_message(chat_id=update.message.chat_id, text='The torrent is successfully registered.')
         else:
-            bot.send_message(chat_id=update.message.chat_id, text='Torrent was not added.')
+            bot.send_message(chat_id=update.message.chat_id, text='Unable to register the torrent.')
+
+    def command_list_torrents(self, bot, update):
+        """Command to list all monitored torrents"""
+        for i, trnt in enumerate(get_registered_torrents().values(), 1):
+            if trnt.get('url'):
+                update.message.reply_text('{}. {} \n{}'.format(i, trnt['name'], trnt['url']))
+            else:
+                update.message.reply_text('{}. {}'.format(i, trnt['name']))
+
+    def command_remove_torrents(self, bot, update):
+        """Command to remove torrent"""
+        buttons = []
+        for trnt in get_registered_torrents().values():
+            buttons.append([InlineKeyboardButton(text=trnt['name'], callback_data='hash:{hash}'.format(**trnt))])
+
+        keyboard = InlineKeyboardMarkup(buttons)
+        bot.send_message(update.message.chat_id, text='Which torrent do you want to remove?', reply_markup=keyboard)
+
+    def command_help(self, bot, update):
+        """Command for help"""
+        helptext = 'Available commands:\n' \
+                   '/start: Interactive wizard for torrent management.\n' \
+                   '/add <URL>: Quick way to add a new torrent.\n' \
+                   '/list: Display all registered torrents.\n' \
+                   '/remove: Remove torrent.\n' \
+                   '/cancel: Cancel current operation.'
+        update.message.reply_text(helptext)
 
 
 BotClassesRegistry.add(TelegramBot)