diff --git a/bot/__main__.py b/bot/__main__.py index 0c0d2d6..0c21531 100644 --- a/bot/__main__.py +++ b/bot/__main__.py @@ -1,17 +1,19 @@ -from telegram.ext import CommandHandler, run_async -from bot import dispatcher, LOGGER, updater, botStartTime -from bot.helper.ext_utils import fs_utils -from .helper.ext_utils.bot_utils import get_readable_file_size, get_readable_time -import signal -import time -from bot.helper.telegram_helper.message_utils import * import shutil -from .helper.telegram_helper.filters import CustomFilters +import signal + +from telegram.ext import CommandHandler, run_async + +from bot import dispatcher, updater, botStartTime +from bot.helper.ext_utils import fs_utils from bot.helper.telegram_helper.bot_commands import BotCommands -from .modules import authorize, list, cancel_mirror, mirror_status, mirror +from bot.helper.telegram_helper.message_utils import * +from .helper.ext_utils.bot_utils import get_readable_file_size, get_readable_time +from .helper.telegram_helper.filters import CustomFilters +from .modules import authorize, list, cancel_mirror, mirror_status, mirror, clone + @run_async -def stats(bot,update): +def stats(bot, update): currentTime = get_readable_time((time.time() - botStartTime)) total, used, free = shutil.disk_usage('.') total = get_readable_file_size(total) diff --git a/bot/helper/mirror_utils/download_utils/telegram_downloader.py b/bot/helper/mirror_utils/download_utils/telegram_downloader.py index 4531681..51dc2a1 100644 --- a/bot/helper/mirror_utils/download_utils/telegram_downloader.py +++ b/bot/helper/mirror_utils/download_utils/telegram_downloader.py @@ -3,7 +3,7 @@ import time from pyrogram import Client -from bot import LOGGER, bot, download_dict, download_dict_lock, TELEGRAM_API, \ +from bot import LOGGER, download_dict, download_dict_lock, TELEGRAM_API, \ TELEGRAM_HASH, USER_SESSION_STRING from .download_helper import DownloadHelper from ..status_utils.telegram_download_status import TelegramDownloadStatus @@ -55,7 +55,8 @@ class TelegramDownloadHelper(DownloadHelper): return 0 def __onDownloadComplete(self): - + with global_lock: + GLOBAL_GID.remove(self.gid) self.__listener.onDownloadComplete() def __download(self, message, path): @@ -64,10 +65,7 @@ class TelegramDownloadHelper(DownloadHelper): self.__onDownloadComplete() def add_download(self, message, path): - if message.chat.type == "private": - _message = self.__user_bot.get_messages(bot.get_me().id, message.message_id) - else: - _message = self.__user_bot.get_messages(message.chat.id, message.message_id) + _message = self.__user_bot.get_messages(message.chat.id, message.message_id) media = None media_array = [_message.document, _message.video, _message.audio] for i in media_array: