From 1e2fc4077d3a9e8c8448936b037ebd939b852302 Mon Sep 17 00:00:00 2001
From: anas <e.anastayyar@gmail.com>
Date: Fri, 23 Jul 2021 16:12:36 +0300
Subject: [PATCH] Minor Bugs

Signed-off-by: anas <e.anastayyar@gmail.com>
---
 .../download_utils/aria2_download.py           | 18 ++++++++----------
 .../status_utils/aria_download_status.py       |  6 ------
 bot/modules/mirror.py                          |  2 +-
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/bot/helper/mirror_utils/download_utils/aria2_download.py b/bot/helper/mirror_utils/download_utils/aria2_download.py
index fd35538..f9eeab1 100644
--- a/bot/helper/mirror_utils/download_utils/aria2_download.py
+++ b/bot/helper/mirror_utils/download_utils/aria2_download.py
@@ -17,16 +17,15 @@ class AriaDownloadHelper(DownloadHelper):
     @new_thread
     def __onDownloadStarted(self, api, gid):
         if STOP_DUPLICATE or TORRENT_DIRECT_LIMIT is not None or TAR_UNZIP_LIMIT is not None:
-            sleep(1)
+            sleep(2)
             dl = getDownloadByGid(gid)
             download = aria2.get_download(gid)
-            if STOP_DUPLICATE:
+            if STOP_DUPLICATE and dl is not None:
                 LOGGER.info(f"Checking File/Folder if already in Drive...")
-                sleep(1)
                 sname = aria2.get_download(gid).name
-                if self.listener.isTar:
+                if dl.getListener().isTar:
                     sname = sname + ".tar"
-                if self.listener.extract:
+                if dl.getListener().extract:
                     smsg = None
                 else:
                     gdrive = GoogleDriveHelper(None)
@@ -36,9 +35,9 @@ class AriaDownloadHelper(DownloadHelper):
                     aria2.remove([download], force=True)
                     sendMarkup("Here are the search results:", dl.getListener().bot, dl.getListener().update, button)
                     return
-            if TORRENT_DIRECT_LIMIT is not None or TAR_UNZIP_LIMIT is not None:
+            if (TORRENT_DIRECT_LIMIT is not None or TAR_UNZIP_LIMIT is not None) and dl is not None:
                 limit = None
-                if TAR_UNZIP_LIMIT is not None and (self.listener.isTar or self.listener.extract):
+                if TAR_UNZIP_LIMIT is not None and (dl.getListener().isTar or dl.getListener().extract):
                     LOGGER.info(f"Checking File/Folder Size...")
                     limit = TAR_UNZIP_LIMIT
                     mssg = f'Tar/Unzip limit is {TAR_UNZIP_LIMIT}'
@@ -47,7 +46,6 @@ class AriaDownloadHelper(DownloadHelper):
                     limit = TORRENT_DIRECT_LIMIT
                     mssg = f'Torrent/Direct limit is {TORRENT_DIRECT_LIMIT}'
                 if limit is not None:
-                    sleep(1.5)
                     size = aria2.get_download(gid).total_length
                     limit = limit.split(' ', maxsplit=1)
                     limitint = int(limit[0])
@@ -103,7 +101,8 @@ class AriaDownloadHelper(DownloadHelper):
         aria2.listen_to_notifications(threaded=True, on_download_start=self.__onDownloadStarted,
                                       on_download_error=self.__onDownloadError,
                                       on_download_stop=self.__onDownloadStopped,
-                                      on_download_complete=self.__onDownloadComplete)
+                                      on_download_complete=self.__onDownloadComplete,
+                                      timeout=1)
 
     def add_download(self, link: str, path, listener, filename):
         if is_magnet(link):
@@ -116,4 +115,3 @@ class AriaDownloadHelper(DownloadHelper):
         with download_dict_lock:
             download_dict[listener.uid] = AriaDownloadStatus(download.gid, listener)
             LOGGER.info(f"Started: {download.gid} DIR:{download.dir} ")
-        self.listener = listener
diff --git a/bot/helper/mirror_utils/status_utils/aria_download_status.py b/bot/helper/mirror_utils/status_utils/aria_download_status.py
index f298d10..1b3f1f9 100644
--- a/bot/helper/mirror_utils/status_utils/aria_download_status.py
+++ b/bot/helper/mirror_utils/status_utils/aria_download_status.py
@@ -77,12 +77,6 @@ class AriaDownloadStatus(Status):
     def download(self):
         return self
 
-    def updateName(self,name):
-        self.__name = name
-
-    def updateGid(self,gid):
-        self.__gid = gid
-
     def getListener(self):
         return self.__listener
     
diff --git a/bot/modules/mirror.py b/bot/modules/mirror.py
index d812cae..a4b68dd 100644
--- a/bot/modules/mirror.py
+++ b/bot/modules/mirror.py
@@ -295,7 +295,7 @@ def _mirror(bot, update, isTar=False, extract=False):
     try:
         link = direct_link_generator(link)
     except DirectDownloadLinkException as e:
-        LOGGER.info(f'{link}: {e}')
+        LOGGER.info(e)
         if "ERROR:" in str(e):
             sendMessage(f"{e}", bot, update)
             return