diff --git a/bot/helper/mirror_utils/upload_utils/gdriveTools.py b/bot/helper/mirror_utils/upload_utils/gdriveTools.py index 532410b..d3b4b23 100644 --- a/bot/helper/mirror_utils/upload_utils/gdriveTools.py +++ b/bot/helper/mirror_utils/upload_utils/gdriveTools.py @@ -730,7 +730,7 @@ class GoogleDriveHelper: file_id = self.getIdFromUrl(link) except (KeyError,IndexError): msg = "Google Drive ID could not be found in the provided link" - return msg, "", "" + return msg, "", "", "" LOGGER.info(f"File ID: {file_id}") try: drive_file = self.__service.files().get(fileId=file_id, fields="id, name, mimeType, size", diff --git a/bot/modules/mirror.py b/bot/modules/mirror.py index 5061043..fe409ef 100644 --- a/bot/modules/mirror.py +++ b/bot/modules/mirror.py @@ -2,7 +2,7 @@ import requests from telegram.ext import CommandHandler from telegram import InlineKeyboardMarkup -from bot import Interval, INDEX_URL, BUTTON_FOUR_NAME, BUTTON_FOUR_URL, BUTTON_FIVE_NAME, BUTTON_FIVE_URL, BUTTON_SIX_NAME, BUTTON_SIX_URL, BLOCK_MEGA_FOLDER, BLOCK_MEGA_LINKS, VIEW_LINK, aria2 +from bot import Interval, INDEX_URL, BUTTON_FOUR_NAME, BUTTON_FOUR_URL, BUTTON_FIVE_NAME, BUTTON_FIVE_URL, BUTTON_SIX_NAME, BUTTON_SIX_URL, BLOCK_MEGA_FOLDER, BLOCK_MEGA_LINKS, VIEW_LINK, aria2, get_client from bot import dispatcher, DOWNLOAD_DIR, download_dict, download_dict_lock, SHORTENER, SHORTENER_API, TAR_UNZIP_LIMIT from bot.helper.ext_utils import fs_utils, bot_utils from bot.helper.ext_utils.bot_utils import get_mega_link_type @@ -52,6 +52,7 @@ class MirrorListener(listeners.MirrorListeners): def clean(self): try: aria2.purge() + get_client().torrents_delete(torrent_hashes="all", delete_files=True) Interval[0].cancel() del Interval[0] delete_all_messages() diff --git a/bot/modules/watch.py b/bot/modules/watch.py index 8c360dc..8b65d11 100644 --- a/bot/modules/watch.py +++ b/bot/modules/watch.py @@ -13,6 +13,7 @@ def _watch(bot: Bot, update, isTar=False): mssg = update.message.text message_args = mssg.split(' ') name_args = mssg.split('|') + try: link = message_args[1] except IndexError: @@ -23,6 +24,7 @@ def _watch(bot: Bot, update, isTar=False): msg += "This file will be downloaded in 720p quality and it's name will be Slam" sendMessage(msg, bot, update) return + try: if "|" in mssg: mssg = mssg.split("|") @@ -35,11 +37,12 @@ def _watch(bot: Bot, update, isTar=False): qual = f'bestvideo[height<={qual}]+bestaudio/best[height<={qual}]' except IndexError: qual = "bestvideo+bestaudio/best" + try: name = name_args[1] except IndexError: name = "" - reply_to = update.message.reply_to_message + pswd = "" listener = MirrorListener(bot, update, pswd, isTar) ydl = YoutubeDLHelper(listener) @@ -55,9 +58,18 @@ def watch(update, context): _watch(context.bot, update) -mirror_handler = CommandHandler(BotCommands.WatchCommand, watch, - filters=CustomFilters.authorized_chat | CustomFilters.authorized_user, run_async=True) -tar_mirror_handler = CommandHandler(BotCommands.TarWatchCommand, watchTar, - filters=CustomFilters.authorized_chat | CustomFilters.authorized_user, run_async=True) +mirror_handler = CommandHandler( + BotCommands.WatchCommand, + watch, + filters=CustomFilters.authorized_chat | CustomFilters.authorized_user, + run_async=True, +) +tar_mirror_handler = CommandHandler( + BotCommands.TarWatchCommand, + watchTar, + filters=CustomFilters.authorized_chat | CustomFilters.authorized_user, + run_async=True, +) + dispatcher.add_handler(mirror_handler) dispatcher.add_handler(tar_mirror_handler)