Addition fixed from #91

tortoolkit/uploaders/extractor.py

@@ -19,6 +19,7 @@ async def execute(self):
         password = self._update_message.client.dl_passwords.get(self._user_message.id)
         if password is not None:
             password = password[1]
+
         start = time.time()
         await self._update_message.edit(f"{self._update_message.text}\nTrying to Extract the archive with password: `{password}`")
         wrong_pwd = False

tortoolkit/utils/zip7_utils.py

@@ -110,7 +110,9 @@ def get_size(start_path = '.'):
 async def extract_archive(path, password=""):
     if os.path.exists(path):
         if os.path.isfile(path):
-            if str(path).endswith((".zip", "7z", "tar", "gzip2", "iso", "wim", "rar", "tar.gz","tar.bz2")):
+            valid_exts = (".zip", ".7z", ".tar", ".gzip2", ".iso", ".wim", ".rar", ".tar.gz",".tar.bz2")
+            if str(path).endswith(valid_exts):
+
                 # check userdata
                 userpath = os.path.join(os.getcwd(), "userdata")
                 if not os.path.exists(userpath):
@@ -120,6 +122,10 @@ async def extract_archive(path, password=""):
                 os.mkdir(extpath)
 
                 extpath = os.path.join(extpath,os.path.basename(path))
+                for i in valid_exts:
+                    li = extpath.rsplit(i, 1)
+                    extpath = "".join(li)
+
                 if not os.path.exists(extpath):
                     os.mkdir(extpath)