Add gid method in Status class for download classes

Signed-off-by: lzzy12 <jhashivam2020@gmail.com>

bot/helper/ext_utils/bot_utils.py

@@ -1,9 +1,10 @@
-from bot import download_dict, download_dict_lock
 import logging
 import re
 import threading
 import time
 
+from bot import download_dict, download_dict_lock
+
 LOGGER = logging.getLogger(__name__)
 
 MAGNET_REGEX = r"magnet:\?xt=urn:btih:[a-zA-Z0-9]*"
@@ -54,11 +55,12 @@ def get_readable_file_size(size_in_bytes) -> str:
     except IndexError:
         return 'File too large'
 
+
 def getDownloadByGid(gid):
     with download_dict_lock:
         for dl in download_dict.values():
             if dl.status() == MirrorStatus.STATUS_DOWNLOADING:
-                if dl.download().gid == gid:
+                if dl.gid() == gid:
                     return dl
     return None
 
@@ -103,7 +105,7 @@ def get_readable_message():
                 if hasattr(download, 'is_torrent'):
                     msg += f"| P: {download.download().connections} " \
                            f"| S: {download.download().num_seeders}"
-                msg += f"\nGID: <code>{download.download().gid}</code>"
+                msg += f"\nGID: <code>{download.gid()}</code>"
             msg += "\n\n"
         return msg
 

bot/helper/mirror_utils/download_utils/telegram_downloader.py

@@ -1,15 +1,17 @@
-from .download_helper import DownloadHelper
 import threading
 import time
-from ..status_utils.telegram_download_status import TelegramDownloadStatus
+
-from bot.helper.ext_utils.bot_utils import get_readable_file_size
+from pyrogram import Client
+
 from bot import LOGGER, bot, download_dict, download_dict_lock, TELEGRAM_API, \
     TELEGRAM_HASH, USER_SESSION_STRING
-from pyrogram import Client
+from .download_helper import DownloadHelper
+from ..status_utils.telegram_download_status import TelegramDownloadStatus
 
 global_lock = threading.Lock()
 GLOBAL_GID = set()
 
+
 class TelegramDownloadHelper(DownloadHelper):
     def __init__(self, listener):
         super().__init__()
@@ -51,6 +53,7 @@ class TelegramDownloadHelper(DownloadHelper):
                 self.progress = current / self.size * 100
             except ZeroDivisionError:
                 return 0
+
     def __onDownloadComplete(self):
 
         self.__listener.onDownloadComplete()

bot/helper/mirror_utils/status_utils/aria_download_status.py

@@ -74,3 +74,7 @@ class AriaDownloadStatus(Status):
 
     def uid(self):
         return self.__uid
+
+    def gid(self):
+        self.__update()
+        return self.__gid

bot/helper/mirror_utils/status_utils/telegram_download_status.py

@@ -1,6 +1,6 @@
+from bot import DOWNLOAD_DIR
 from bot.helper.ext_utils.bot_utils import MirrorStatus, get_readable_file_size, get_readable_time
 from .status import Status
-from bot import DOWNLOAD_DIR
 
 
 class TelegramDownloadStatus(Status):
@@ -8,6 +8,9 @@ class TelegramDownloadStatus(Status):
         self.obj = obj
         self.uid = uid
 
+    def gid(self):
+        return self.obj.gid
+
     def path(self):
         return f"{DOWNLOAD_DIR}{self.uid}"