evanferrao
/
dump-mirrorbot
mirror of https://github.com/Box-boi/dump-mirrorbot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored Download start logic

This commit is contained in:
jaskaranSM 2019-11-10 12:24:48 +05:30 committed by lzzy12
parent df82d5944e
commit 584bd138df
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bot/helper/mirror_utils/listeners.py
View File

@ -1,10 +1,9 @@
class MirrorListeners:
def __init__(self, context, update, reply_message):
def __init__(self, context, update):
self.context = context
self.update = update
self.message = update.message
self.uid = self.message.message_id
self.reply_message = reply_message
def onDownloadStarted(self, link: str):
raise NotImplementedError

13
bot/modules/mirror.py
View File

@ -14,12 +14,15 @@ import threading
class MirrorListener(listeners.MirrorListeners):
def __init__(self, context, update, reply_message, isTar=False):
super().__init__(context, update, reply_message)
def __init__(self, context, update, isTar=False):
super().__init__(context, update)
self.isTar = isTar
def onDownloadStarted(self, link):
LOGGER.info("Adding link: " + link)
LOGGER.info(f"Adding link: {link}")
self.reply_message = sendMessage(bot_utils.get_readable_message(), self.context, self.update)
with status_reply_dict_lock:
status_reply_dict[self.update.effective_chat.id] = self.reply_message
def onDownloadProgress(self, progress_status_list: list, index: int):
msg = get_readable_message(progress_status_list)
@ -149,7 +152,6 @@ def _mirror(update, context, isTar=False):
if not bot_utils.is_url(link) and not bot_utils.is_magnet(link):
sendMessage('No download source provided', context, update)
return
reply_msg = sendMessage('Starting Download', context, update)
index = update.effective_chat.id
with status_reply_dict_lock:
if index in status_reply_dict.keys():
@ -157,8 +159,7 @@ def _mirror(update, context, isTar=False):
deleteMessage(context, status_reply_dict[index])
except BadRequest:
pass
status_reply_dict[index] = reply_msg
listener = MirrorListener(context, update, reply_msg, isTar)
listener = MirrorListener(context, update, isTar)
aria = download_tools.DownloadHelper(listener)
t = threading.Thread(target=aria.add_download, args=(link,))
t.start()

5
bot/modules/mirror_status.py
View File

@ -6,13 +6,15 @@ from bot.helper.ext_utils.bot_utils import get_readable_message
from telegram.error import BadRequest
from bot.helper.telegram_helper.filters import CustomFilters
from bot.helper.telegram_helper.bot_commands import BotCommands
import threading
@run_async
def mirror_status(update: Update, context):
message = get_readable_message()
if len(message) == 0:
message = "No active downloads"
sendMessage(message, context, update)
reply_message = sendMessage(message, context, update)
threading.Thread(target=auto_delete_message, args=(context, update.message, reply_message)).start()
return
index = update.effective_chat.id
with status_reply_dict_lock:
@ -27,6 +29,7 @@ def mirror_status(update: Update, context):
if len(message) == 0:
message = "No active downloads"
editMessage(message, context, status_reply_dict[index])
threading.Thread(target=auto_delete_message, args=(context, update.message,status_reply_dict[index])).start()
break
try:
editMessage(message, context, status_reply_dict[index])