Fixed multiple /unzipmirror commands gets all the mirrors stuck

Signed-off-by: lzzy12 <[email protected]>
frp05 · Jun 28, 2020 · 1aed50a · 1aed50a
1 parent fed3be2
commit 1aed50a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bot/helper/ext_utils/bot_utils.py b/bot/helper/ext_utils/bot_utils.py
@@ -62,7 +62,9 @@ def get_readable_file_size(size_in_bytes) -> str:
 def getDownloadByGid(gid):
     with download_dict_lock:
         for dl in download_dict.values():
-            if dl.status() != MirrorStatus.STATUS_UPLOADING and dl.status() != MirrorStatus.STATUS_ARCHIVING:
+            status = dl.status()
+            if status != MirrorStatus.STATUS_UPLOADING and status != MirrorStatus.STATUS_ARCHIVING\
+                    and status != MirrorStatus.STATUS_EXTRACTING:
                 if dl.gid() == gid:
                     return dl
     return None
@@ -146,8 +148,10 @@ def new_thread(fn):
     """To use as decorator to make a function call threaded.
     Needs import
     from threading import Thread"""
+
     def wrapper(*args, **kwargs):
         thread = threading.Thread(target=fn, args=args, kwargs=kwargs)
         thread.start()
         return thread
+
     return wrapper
diff --git a/bot/helper/mirror_utils/status_utils/extract_status.py b/bot/helper/mirror_utils/status_utils/extract_status.py
@@ -8,7 +8,7 @@ def __init__(self, name, path, size):
         self.__path = path
         self.__size = size
 
-    # The progress of Tar function cannot be tracked. So we just return dummy values.
+    # The progress of extract function cannot be tracked. So we just return dummy values.
     # If this is possible in future,we should implement it
 
     def progress(self):