Minor bug fixes in source

Signed-off-by: harshhaareddy <[email protected]>

bot/helper/mirror_utils/status_utils/aria_download_status.py

@@ -3,7 +3,10 @@
 from .status import Status
 
 def get_download(gid):
-    return aria2.get_download(gid)
+    try:
+        return aria2.get_download(gid)
+    except Exception as e:
+        LOGGER.error(f'{e}: while getting torrent info')
 
 
 class AriaDownloadStatus(Status):
@@ -39,7 +42,8 @@ def processed_bytes(self):
         return self.aria_download().completed_length
 
     def speed(self):
-        return self.aria_download().download_speed_string()
+        self.__update()
+        return self.__download.download_speed_string()
 
     def name(self):
         return self.aria_download().name

bot/helper/mirror_utils/status_utils/qbit_download_status.py

@@ -5,7 +5,13 @@
 from bot import DOWNLOAD_DIR, LOGGER, get_client
 from bot.helper.ext_utils.bot_utils import MirrorStatus, get_readable_file_size, get_readable_time
 from .status import Status
+from time import sleep
 
+def get_download(client, hash_):
+    try:
+        return client.torrents_info(torrent_hashes=hash_)[0]
+    except Exception as e:
+        LOGGER.error(f'{e}: while getting torrent info')
 
 class QbDownloadStatus(Status):
 
@@ -37,7 +43,8 @@ def processed_bytes(self):
         return self.torrent_info().downloaded
 
     def speed(self):
-        return f"{get_readable_file_size(self.torrent_info().dlspeed)}/s"
+        self.__update()
+        return f"{get_readable_file_size(self.__info.dlspeed)}/s"
 
     def name(self):
         return self.torrent_info().name

bot/helper/telegram_helper/filters.py

@@ -1,6 +1,6 @@
 from telegram.ext import MessageFilter
 from telegram import Message
-from bot import AUTHORIZED_CHATS, SUDO_USERS, OWNER_ID, download_dict, download_dict_lock
+from bot import AUTHORIZED_CHATS, SUDO_USERS, OWNER_ID
 
 
 class CustomFilters:
@@ -28,20 +28,3 @@ def filter(self,message):
             return bool(message.from_user.id in SUDO_USERS)
 
     sudo_user = _SudoUser()
-
-    class _MirrorOwner(MessageFilter):
-        def filter(self, message: Message):
-            user_id = message.from_user.id
-            if user_id == OWNER_ID:
-                return True
-            args = str(message.text).split(' ')
-            if len(args) > 1:
-                # Cancelling by gid
-                with download_dict_lock:
-                    return any(status.gid() == args[1] and status.message.from_user.id == user_id for message_id, status in download_dict.items())
-            if not message.reply_to_message and len(args) == 1:
-                return True
-            # Cancelling by replying to original mirror message
-            reply_user = message.reply_to_message.from_user.id
-            return bool(reply_user == user_id)
-    mirror_owner_filter = _MirrorOwner()

bot/modules/cancel_mirror.py

@@ -1,8 +1,11 @@
 from telegram.ext import CommandHandler
-from bot import download_dict, dispatcher, download_dict_lock, DOWNLOAD_DIR
+from bot import download_dict, dispatcher, download_dict_lock, DOWNLOAD_DIR, SUDO_USERS, OWNER_ID
 from bot.helper.ext_utils.fs_utils import clean_download
 from bot.helper.telegram_helper.bot_commands import BotCommands
 from bot.helper.telegram_helper.filters import CustomFilters
+from bot.helper.telegram_helper.message_utils import sendMessage, sendMarkup
+from bot.helper.ext_utils.bot_utils import getDownloadByGid, MirrorStatus, getAllDownload
+from bot.helper.telegram_helper import button_build
 from bot.helper.telegram_helper.message_utils import *
 
 from time import sleep
@@ -11,37 +14,31 @@
 
 def cancel_mirror(update, context):
     args = update.message.text.split(" ", maxsplit=1)
-    mirror_message = None
+    user_id = update.message.from_user.id
     if len(args) > 1:
         gid = args[1]
         dl = getDownloadByGid(gid)
         if not dl:
-            sendMessage(f"GID: <code>{gid}</code> 𝐍𝐨𝐭 𝐅𝐨𝐮𝐧𝐝.", context.bot, update)
-            return
-        mirror_message = dl.message
+            return sendMessage(f"GID: <code>{gid}</code> 𝐍𝐨𝐭 𝐅𝐨𝐮𝐧𝐝.", context.bot, update.message)
     elif update.message.reply_to_message:
         mirror_message = update.message.reply_to_message
         with download_dict_lock:
             keys = list(download_dict.keys())
             try:
                 dl = download_dict[mirror_message.message_id]
             except:
-                pass
-    if len(args) == 1:
-        msg = f"Please reply to the <code>/{BotCommands.MirrorCommand}</code> message which was used to start the download or send <code>/{BotCommands.CancelMirror} GID</code> to cancel it!"
-        if mirror_message and mirror_message.message_id not in keys:
-            if BotCommands.MirrorCommand in mirror_message.text or \
-               BotCommands.TarMirrorCommand in mirror_message.text or \
-               BotCommands.UnzipMirrorCommand in mirror_message.text:
-                msg1 = "𝐌𝐢𝐫𝐫𝐨𝐫 𝐀𝐥𝐫𝐞𝐚𝐝𝐲 𝐇𝐚𝐯𝐞 𝐁𝐞𝐞𝐧 𝐂𝐚𝐧𝐜𝐞𝐥𝐥𝐞𝐝"
-                sendMessage(msg1, context.bot, update)
-                return
-            else:
-                sendMessage(msg, context.bot, update)
-                return
-        elif not mirror_message:
-            sendMessage(msg, context.bot, update)
-            return
+                dl = None
+        if not dl:
+            return sendMessage(f"𝐓𝐡𝐢𝐬 𝐢𝐬 𝐧𝐨𝐭 𝐚𝐧 𝐚𝐜𝐭𝐢𝐯𝐞 𝐭𝐚𝐬𝐤!", context.bot, update.message)
+    elif len(args) == 1:
+        msg = f"𝐑𝐞𝐩𝐥𝐲 𝐭𝐨 𝐚𝐧 𝐚𝐜𝐭𝐢𝐯𝐞 <code>/{BotCommands.MirrorCommand}</code> 𝐦𝐞𝐬𝐬𝐚𝐠𝐞 𝐰𝐡𝐢𝐜𝐡 𝐰𝐚𝐬 𝐮𝐬𝐞𝐝 𝐭𝐨 𝐬𝐭𝐚𝐫𝐭 𝐭𝐡𝐞 𝐝𝐨𝐰𝐧𝐥𝐨𝐚𝐝 𝐨𝐫 𝐬𝐞𝐧𝐝 <code>/{BotCommands.CancelMirror} GID</code> 𝐭𝐨 𝐜𝐚𝐧𝐜𝐞𝐥 𝐢𝐭!"
+        return sendMessage(msg, context.bot, update.message)
+
+    if OWNER_ID == user_id or dl.message.from_user.id == user_id or user_id in SUDO_USERS:
+        pass
+    else:
+        return sendMessage("𝐓𝐡𝐢𝐬 𝐭𝐚𝐬𝐤 𝐝𝐨𝐞𝐬𝐧'𝐭 𝐛𝐞𝐥𝐨𝐧𝐠 𝐭𝐨 𝐲𝐨𝐮!", context.bot, update.message)
+
     if dl.status() == MirrorStatus.STATUS_ARCHIVING:
         sendMessage("𝐀𝐫𝐜𝐡𝐢𝐯𝐚𝐥 𝐢𝐧 𝐏𝐫𝐨𝐠𝐫𝐞𝐬𝐬, 𝐘𝐨𝐮 𝐂𝐚𝐧'𝐭 𝐂𝐚𝐧𝐜𝐞𝐥 𝐈𝐭.", context.bot, update)
     elif dl.status() == MirrorStatus.STATUS_EXTRACTING:
@@ -66,12 +63,34 @@ def cancel_all(update, context):
         else:
             break
     sendMessage(f'{count} 𝐃𝐨𝐰𝐧𝐥𝐨𝐚𝐝(𝐬) 𝐡𝐚𝐬 𝐛𝐞𝐞𝐧 𝐂𝐚𝐧𝐜𝐞𝐥𝐥𝐞𝐝!', context.bot, update)
+
+def cancell_all_buttons(update, context):
+    buttons = button_build.ButtonMaker()
+    buttons.sbutton("Downloading", "canall down")
+    buttons.sbutton("Uploading", "canall up")
+    if QB_SEED:
+        buttons.sbutton("Seeding", "canall seed")
+    buttons.sbutton("Cloning", "canall clone")
+    buttons.sbutton("All", "canall all")
+    button = InlineKeyboardMarkup(buttons.build_menu(2))
+    sendMarkup('Choose tasks to cancel.', context.bot, update.message, button)
+def cancel_all_update(update, context):
+    query = update.callback_query
+    user_id = query.from_user.id
+    data = query.data
+    data = data.split(" ")
+    if CustomFilters._owner_query(user_id):
+        query.answer()
+        query.message.delete()
+        cancel_all(data[1])
+    else:
+        query.answer(text="𝐘𝐨𝐮 𝐝𝐨𝐧'𝐭 𝐡𝐚𝐯𝐞 𝐩𝐞𝐫𝐦𝐢𝐬𝐬𝐢𝐨𝐧 𝐭𝐨 𝐮𝐬𝐞 𝐭𝐡𝐞𝐬𝐞 𝐛𝐮𝐭𝐭𝐨𝐧𝐬!", show_alert=True)
 
 
 
 cancel_mirror_handler = CommandHandler(BotCommands.CancelMirror, cancel_mirror,
-                                       filters=(CustomFilters.authorized_chat | CustomFilters.authorized_user) & CustomFilters.mirror_owner_filter | CustomFilters.sudo_user, run_async=True)
-cancel_all_handler = CommandHandler(BotCommands.CancelAllCommand, cancel_all,
+                                    filters=(CustomFilters.authorized_chat | CustomFilters.authorized_user), run_async=True)
+cancel_all_handler = CommandHandler(BotCommands.CancelAllCommand, cancell_all_buttons,
                                     filters=CustomFilters.owner_filter | CustomFilters.sudo_user, run_async=True)
 dispatcher.add_handler(cancel_all_handler)
 dispatcher.add_handler(cancel_mirror_handler)

bot/modules/clone.py

@@ -27,11 +27,18 @@ def cloneNode(update, context):
                 sendMarkup(msg3, context.bot, update, button)
                 return
         if CLONE_LIMIT is not None:
-            result = check_limit(size, CLONE_LIMIT)
-            if result:
-                msg2 = f'𝐅𝐚𝐢𝐥𝐞𝐝, 𝐂𝐥𝐨𝐧𝐞 𝐥𝐢𝐦𝐢𝐭 𝐢𝐬 {CLONE_LIMIT}.\n𝐘𝐨𝐮𝐫 𝐅𝐢𝐥𝐞/𝐅𝐨𝐥𝐝𝐞𝐫 𝐬𝐢𝐳𝐞 𝐢𝐬 {get_readable_file_size(clonesize)}.'
-                sendMessage(msg2, context.bot, update)
-                return
+            LOGGER.info('Checking File/Folder Size...')
+            if size > CLONE_LIMIT * 1024**3:
+                msg2 = f'𝐅𝐚𝐢𝐥𝐞𝐝, 𝐂𝐥𝐨𝐧𝐞 𝐥𝐢𝐦𝐢𝐭 𝐢𝐬 {CLONE_LIMIT}GB.\n𝐘𝐨𝐮𝐫 𝐅𝐢𝐥𝐞/𝐅𝐨𝐥𝐝𝐞𝐫 𝐬𝐢𝐳𝐞 𝐢𝐬 {get_readable_file_size(size)}.'
+                return sendMessage(msg2, bot, message)
+        if multi > 1:
+            sleep(1)
+            nextmsg = type('nextmsg', (object, ), {'chat_id': message.chat_id, 'message_id': message.reply_to_message.message_id + 1})
+            nextmsg = sendMessage(args[0], bot, nextmsg)
+            nextmsg.from_user.id = message.from_user.id
+            multi -= 1
+            sleep(1)
+            Thread(target=_clone, args=(nextmsg, bot, multi)).start()
         if files < 15:
             msg = sendMessage(f"𝐂𝐥𝐨𝐧𝐢𝐧𝐠: <code>{link}</code>", context.bot, update)
             result, button = gd.clone(link)

bot/modules/mirror.py

@@ -327,7 +327,7 @@ def _mirror(bot, update, isTar=False, extract=False, isZip=False, isQbit=False):
             open(file_name, "wb").write(resp.content)
             link = f"{file_name}"
         else:
-            sendMessage("ERROR: link got HTTP response:" + resp.status_code, bot, update)
+            sendMessage("𝐄𝐑𝐑𝐎𝐑: 𝐥𝐢𝐧𝐤 𝐠𝐨𝐭 𝐇𝐓𝐓𝐏 𝐫𝐞𝐬𝐩𝐨𝐧𝐬𝐞:" + resp.status_code, bot, update)
             return
 
     elif not bot_utils.is_url(link) and not bot_utils.is_magnet(link):