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

Fix Yet another bug due to indentation 

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>
This commit is contained in:
lzzy12 2019-09-27 00:09:05 +05:30
parent 94fc5d0022
commit d2a65adf18
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bot/helper/bot_utils.py
View File

@ -17,8 +17,8 @@ def get_download_index(_list, gid):
index += 1 index += 1
def get_download_str_list(): def get_download_str():
str_list = [] result = ""
for status in list(download_list.values()): for status in list(download_list.values()):
str_list.append(status.progress() + status.speed() + status.status()) result += (status.progress() + status.speed() + status.status())
return str_list return result

13
bot/helper/download_tools.py
View File

@ -61,17 +61,18 @@ class DownloadHelper:
# Start tracking the actual download # Start tracking the actual download
previous = None previous = None
while not self.__get_download().is_complete: download = self.__get_download()
while not download.is_complete:
status_list = get_download_status_list()
if self.__get_download().has_failed: if self.__get_download().has_failed:
self.__listener.onDownloadError(self.__get_download().error_message) self.__listener.onDownloadError(self.__get_download().error_message)
break break
# TODO: Find a better way # TODO: Find a better way
progress_str_list = get_download_str_list() progress_str_list = get_download_str()
if progress_str_list != previous: if progress_str_list != previous:
self.__listener.onDownloadProgress(status_list, self.__listener.onDownloadProgress(status_list, index)
get_download_index(status_list, self.__get_download().gid))
previous = progress_str_list previous = progress_str_list
download = self.__get_download()
sleep(DOWNLOAD_STATUS_UPDATE_INTERVAL) sleep(DOWNLOAD_STATUS_UPDATE_INTERVAL)
self.__listener.onDownloadComplete(status_list, get_download_index(status_list, self.__get_download().gid)) self.__listener.onDownloadComplete(status_list, index)

31
bot/mirror.py
View File

@ -1,12 +1,14 @@
from telegram.ext import CommandHandler, run_async from telegram.ext import CommandHandler, run_async
from telegram.error import BadRequest
from bot.helper import download_tools, gdriveTools, listeners from bot.helper import download_tools, gdriveTools, listeners
from bot import config, LOGGER, dispatcher from bot import LOGGER, dispatcher
LOGGER.info('mirror.py') LOGGER.info('mirror.py')
def get_readable_message(progress_list: list): def get_readable_message(progress_list: list):
msg = "" msg = ""
LOGGER.info(progress_list)
for status in progress_list: for status in progress_list:
msg += "<b>Name:</b> {}\n" \ msg += "<b>Name:</b> {}\n" \
"<b>status:</b> {}\n" \ "<b>status:</b> {}\n" \
@ -15,7 +17,7 @@ def get_readable_message(progress_list: list):
"<b>ETA:</b> {}\n\n".format(status.name(), status.status(), "<b>ETA:</b> {}\n\n".format(status.name(), status.status(),
status.progress(), status.size(), status.progress(), status.size(),
status.speed(), status.eta()) status.speed(), status.eta())
return msg return msg
class MirrorListener(listeners.MirrorListeners): class MirrorListener(listeners.MirrorListeners):
@ -26,18 +28,23 @@ class MirrorListener(listeners.MirrorListeners):
LOGGER.info("Adding link: " + link) LOGGER.info("Adding link: " + link)
def onDownloadProgress(self, progress_status_list: list, index: int): def onDownloadProgress(self, progress_status_list: list, index: int):
LOGGER.info("Editing message")
msg = get_readable_message(progress_status_list) msg = get_readable_message(progress_status_list)
self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id, if self.reply_message.text != msg:
chat_id=self.reply_message.chat.id, LOGGER.info("Editing message")
parse_mode='HTMl') self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id,
chat_id=self.reply_message.chat.id,
parse_mode='HTMl')
def onDownloadComplete(self, progress_status_list, index: int): def onDownloadComplete(self, progress_status_list, index: int):
msg = get_readable_message(progress_status_list) msg = get_readable_message(progress_status_list)
LOGGER.info("Download completed") LOGGER.info("Download completed")
self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id, try:
chat_id=self.reply_message.chat.id, LOGGER.info("Editing message")
parse_mode='HTMl') self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id,
chat_id=self.reply_message.chat.id,
parse_mode='HTMl')
except BadRequest:
pass
gdrive = gdriveTools.GoogleDriveHelper(self) gdrive = gdriveTools.GoogleDriveHelper(self)
gdrive.upload(progress_status_list[index].name()) gdrive.upload(progress_status_list[index].name())
@ -48,11 +55,13 @@ class MirrorListener(listeners.MirrorListeners):
parse_mode='HTMl') parse_mode='HTMl')
def onUploadStarted(self, progress_status_list: list, index: int): def onUploadStarted(self, progress_status_list: list, index: int):
msg = get_readable_message(progress_status_list) try:
if not msg != self.update.message.text: msg = get_readable_message(progress_status_list)
self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id, self.context.bot.edit_message_text(text=msg, message_id=self.reply_message.message_id,
chat_id=self.reply_message.chat.id, chat_id=self.reply_message.chat.id,
parse_mode='HTMl') parse_mode='HTMl')
except BadRequest:
pass
def onUploadComplete(self, link: str, progress_status_list: list, index: int): def onUploadComplete(self, link: str, progress_status_list: list, index: int):
msg = '<a href="{}">{}</a>'.format(link, progress_status_list[index].name()) msg = '<a href="{}">{}</a>'.format(link, progress_status_list[index].name())