From 4e3f412e7a0722a2271f62524ca9781119e434f3 Mon Sep 17 00:00:00 2001 From: lzzy12 Date: Sat, 28 Sep 2019 20:44:21 +0530 Subject: [PATCH] Use message_id as a key for download_dict instead of update_id Signed-off-by: lzzy12 --- bot/helper/bot_utils.py | 4 ++-- bot/helper/download_status.py | 4 ++-- bot/helper/download_tools.py | 11 ++++++----- bot/helper/gdriveTools.py | 4 ++-- bot/helper/listeners.py | 2 +- bot/helper/message_utils.py | 9 ++++----- bot/mirror.py | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/bot/helper/bot_utils.py b/bot/helper/bot_utils.py index c313afe..0bba8cf 100644 --- a/bot/helper/bot_utils.py +++ b/bot/helper/bot_utils.py @@ -2,8 +2,8 @@ from bot import download_dict -def get_download(update_id): - return download_dict[update_id].download() +def get_download(message_id): + return download_dict[message_id].download() def get_download_status_list(): diff --git a/bot/helper/download_status.py b/bot/helper/download_status.py index f12ba3a..8bddb89 100644 --- a/bot/helper/download_status.py +++ b/bot/helper/download_status.py @@ -11,10 +11,10 @@ class DownloadStatus: STATUS_WAITING = "Queued" STATUS_FAILED = "Failed. Cleaning download" - def __init__(self, gid, update_id): + def __init__(self, gid, message_id): self.__gid = gid self.__download = get_download(gid) - self.__uid = update_id + self.__uid = message_id def __update(self): self.__download = get_download(self.__gid) diff --git a/bot/helper/download_tools.py b/bot/helper/download_tools.py index 2fa6f75..18324e2 100644 --- a/bot/helper/download_tools.py +++ b/bot/helper/download_tools.py @@ -27,19 +27,20 @@ class DownloadHelper: if self.is_url(link): if link.endswith('.torrent'): self.__is_torrent = True - download = aria2.add_uris([link], {'dir': DOWNLOAD_DIR + str(self.__listener.update.update_id)}) + download = aria2.add_uris([link], {'dir': DOWNLOAD_DIR + str(self.__listener.message.message_id)}) elif self.is_magnet(link): - download = aria2.add_magnet(link, {'dir': DOWNLOAD_DIR + str(self.__listener.update.update_id)}) + download = aria2.add_magnet(link, {'dir': DOWNLOAD_DIR + str(self.__listener.message.message_id)}) self.__is_torrent = True else: self.__listener.onDownloadError("No download URL or URL malformed") return - download_dict[self.__listener.update.update_id] = DownloadStatus(download.gid, self.__listener.update.update_id) + download_dict[self.__listener.message.message_id] = DownloadStatus(download.gid, + self.__listener.message.message_id) self.__listener.onDownloadStarted(link) self.__update_download_status() def __get_download(self): - return get_download(self.__listener.update.update_id) + return get_download(self.__listener.message.message_id) def __get_followed_download_gid(self): download = self.__get_download() @@ -67,7 +68,7 @@ class DownloadHelper: self.__listener.onDownloadProgress(get_download_status_list(), index) except KillThreadException: should_update = False - download_dict[self.__listener.update.update_id] = DownloadStatus(new_gid, self.__listener.update.update_id) + download_dict[self.__listener.message.message_id] = DownloadStatus(new_gid, self.__listener.message.message_id) # Start tracking the actual download previous = None diff --git a/bot/helper/gdriveTools.py b/bot/helper/gdriveTools.py index 32bd7a6..830dc9c 100644 --- a/bot/helper/gdriveTools.py +++ b/bot/helper/gdriveTools.py @@ -57,9 +57,9 @@ class GoogleDriveHelper: def upload(self, file_name: str): _list = get_download_status_list() - index = get_download_index(_list, get_download(self.__listener.update.update_id).gid) + index = get_download_index(_list, get_download(self.__listener.message.message_id).gid) self.__listener.onUploadStarted(_list, index) - file_dir = "{}{}".format(DOWNLOAD_DIR, self.__listener.update.update_id) + file_dir = "{}{}".format(DOWNLOAD_DIR, self.__listener.message.message_id) file_path = "{}/{}".format(file_dir, file_name) link = None LOGGER.info("Uploading File: " + file_name) diff --git a/bot/helper/listeners.py b/bot/helper/listeners.py index 3d6ac87..5cb06be 100644 --- a/bot/helper/listeners.py +++ b/bot/helper/listeners.py @@ -1,7 +1,7 @@ class MirrorListeners: def __init__(self, context, update, reply_message): self.context = context - self.update = update + self.message = update.message self.reply_message = reply_message def onDownloadStarted(self, link: str): diff --git a/bot/helper/message_utils.py b/bot/helper/message_utils.py index cc2b18c..c2fcd6a 100644 --- a/bot/helper/message_utils.py +++ b/bot/helper/message_utils.py @@ -1,7 +1,6 @@ -from telegram.error import BadRequest from telegram.message import Message from telegram.update import Update -from bot import LOGGER + def sendMessage(text: str, context, update: Update): return context.bot.send_message(update.message.chat_id, @@ -10,9 +9,9 @@ def sendMessage(text: str, context, update: Update): def editMessage(text: str, context, message: Message): - context.bot.edit_message_text(text=text, message_id=message.message_id, - chat_id=message.chat.id, - parse_mode='HTMl') + context.bot.edit_message_text(text=text, message_id=message.message_id, + chat_id=message.chat.id, + parse_mode='HTMl') def deleteMessage(context, message: Message): diff --git a/bot/mirror.py b/bot/mirror.py index ceebaa2..b984b7f 100644 --- a/bot/mirror.py +++ b/bot/mirror.py @@ -1,11 +1,11 @@ from telegram.ext import CommandHandler, run_async +from telegram.error import BadRequest from bot.helper import download_tools, gdriveTools, listeners from bot import LOGGER, dispatcher from bot.helper import fs_utils from bot import download_dict, status_reply_dict from bot.helper.message_utils import * from bot.helper.bot_utils import get_readable_message, KillThreadException -LOGGER.info('mirror.py') class MirrorListener(listeners.MirrorListeners):