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 status msg for mega (#155) 

* fix

* fix
This commit is contained in:
Anas 2021-06-10 08:11:40 +03:00 committed by GitHub
parent 89369ccac9
commit 65c71add56
Signed by untrusted user: GitHub
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bot/helper/mirror_utils/download_utils/mega_downloader.py
View File

@ -1,7 +1,7 @@
from bot import LOGGER, MEGA_API_KEY, download_dict_lock, download_dict, MEGA_EMAIL_ID, MEGA_PASSWORD from bot import LOGGER, MEGA_API_KEY, download_dict_lock, download_dict, MEGA_EMAIL_ID, MEGA_PASSWORD
import threading import threading
from mega import (MegaApi, MegaListener, MegaRequest, MegaTransfer, MegaError) from mega import (MegaApi, MegaListener, MegaRequest, MegaTransfer, MegaError)
from bot.helper.telegram_helper.message_utils import update_all_messages, sendMarkup, deleteMessage, sendMessage from bot.helper.telegram_helper.message_utils import *
import os import os
from bot.helper.ext_utils.bot_utils import new_thread, get_mega_link_type, get_readable_file_size from bot.helper.ext_utils.bot_utils import new_thread, get_mega_link_type, get_readable_file_size
from bot.helper.mirror_utils.status_utils.mega_download_status import MegaDownloadStatus from bot.helper.mirror_utils.status_utils.mega_download_status import MegaDownloadStatus
@ -168,6 +168,7 @@ class MegaDownloadHelper:
node = folder_api.authorizeNode(mega_listener.node) node = folder_api.authorizeNode(mega_listener.node)
if STOP_DUPLICATE_MEGA: if STOP_DUPLICATE_MEGA:
msg = sendMessage('Check the File/Folder if already in drive...', listener.bot, listener.update) msg = sendMessage('Check the File/Folder if already in drive...', listener.bot, listener.update)
LOGGER.info(f'Check the File/Folder if already in drive')
mname = node.getName() mname = node.getName()
if listener.isTar == True: if listener.isTar == True:
mname = mname + ".tar" mname = mname + ".tar"
@ -185,6 +186,7 @@ class MegaDownloadHelper:
deleteMessage(listener.bot, msg) deleteMessage(listener.bot, msg)
if MEGA_LIMIT is not None: if MEGA_LIMIT is not None:
msg2 = sendMessage('Check the File/Folder size...', listener.bot, listener.update) msg2 = sendMessage('Check the File/Folder size...', listener.bot, listener.update)
LOGGER.info(f'Check the File/Folder size')
limit = MEGA_LIMIT limit = MEGA_LIMIT
limit = limit.split(' ', maxsplit=1) limit = limit.split(' ', maxsplit=1)
limitint = int(limit[0]) limitint = int(limit[0])
@ -203,6 +205,7 @@ class MegaDownloadHelper:
return return
else: else:
deleteMessage(listener.bot, msg2) deleteMessage(listener.bot, msg2)
sendStatusMessage(listener.update, listener.bot)
with download_dict_lock: with download_dict_lock:
download_dict[listener.uid] = MegaDownloadStatus(mega_listener, listener) download_dict[listener.uid] = MegaDownloadStatus(mega_listener, listener)
os.makedirs(path) os.makedirs(path)

1
bot/modules/mirror.py
View File

@ -298,7 +298,6 @@ def _mirror(bot, update, isTar=False, extract=False):
else: else:
mega_dl = MegaDownloadHelper() mega_dl = MegaDownloadHelper()
mega_dl.add_download(link, f'{DOWNLOAD_DIR}/{listener.uid}/', listener) mega_dl.add_download(link, f'{DOWNLOAD_DIR}/{listener.uid}/', listener)
sendStatusMessage(update, bot)
else: else:
ariaDlManager.add_download(link, f'{DOWNLOAD_DIR}/{listener.uid}/', listener, name) ariaDlManager.add_download(link, f'{DOWNLOAD_DIR}/{listener.uid}/', listener, name)
sendStatusMessage(update, bot) sendStatusMessage(update, bot)