quasarr 1.20.2__tar.gz → 1.20.4__tar.gz

{quasarr-1.20.2 → quasarr-1.20.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.20.2
+Version: 1.20.4
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Home-page: https://github.com/rix1337/Quasarr
 Author: rix1337

{quasarr-1.20.2 → quasarr-1.20.4}/quasarr/downloads/packages/__init__.py

@@ -19,7 +19,7 @@ def get_links_comment(package, package_links):
     return None
 
 
-def get_links_status(package, all_links):
+def get_links_status(package, all_links, is_archive=False):
     links_in_package = []
     package_uuid = package.get("uuid")
     if package_uuid and all_links:
@@ -65,6 +65,8 @@ def get_links_status(package, all_links):
                 if eta and link_eta > eta or not eta:
                     eta = link_eta
             all_finished = False
+        elif is_archive and link.get('status', '').lower() != 'extraction ok':
+            all_finished = False
 
     return {"all_finished": all_finished, "eta": eta, "error": error, "offline_mirror_linkids": offline_mirror_linkids}
 
@@ -188,7 +190,13 @@ def get_packages(shared_state):
     if downloader_packages and downloader_links:
         for package in downloader_packages:
             comment = get_links_comment(package, downloader_links)
-            link_details = get_links_status(package, downloader_links)
+
+            try:
+                archive_info = shared_state.get_device().extraction.get_archive_info([], [package.get("uuid")])
+                is_archive = True if archive_info and archive_info[0] else False
+            except:
+                is_archive = True # in case of error assume archive to avoid false finished state
+            link_details = get_links_status(package, downloader_links, is_archive)
 
             error = link_details["error"]
             finished = link_details["all_finished"]
@@ -249,8 +257,15 @@ def get_packages(shared_state):
                 if mb_left < 0:
                     mb_left = 0
 
+                # Check if package is actually finished (should be in history, not queue)
+                # This handles the case where finished packages haven't been moved to history yet
                 if eta is None:
-                    status = "Paused"
+                    # No ETA could mean paused OR finished
+                    # Check if download is complete
+                    if bytes_total > 0 and bytes_loaded >= bytes_total:
+                        status = "Completed"
+                    else:
+                        status = "Paused"
                 else:
                     time_left = format_eta(int(eta))
                     if mb_left == 0:

{quasarr-1.20.2 → quasarr-1.20.4}/quasarr/providers/myjd_api.py

@@ -400,6 +400,29 @@ class Downloads:
         return resp
 
 
+class Extraction:
+    """
+    Class that represents the extraction details of a Device
+    """
+
+    def __init__(self, device):
+        self.device = device
+        self.url = "/extraction"
+
+    def get_archive_info(self, link_ids=[], package_ids=[]):
+        """
+        Get ArchiveStatus for links and/or packages.
+
+        :param package_ids: Package UUID's.
+        :type: list of strings.
+        :param link_ids: link UUID's.
+        :type: list of strings
+        """
+        params = [link_ids, package_ids]
+        resp = self.device.action(self.url + "/getArchiveInfo", params)
+        return resp
+
+
 class Jddevice:
     """
     Class that represents a JDownloader device and it's functions
@@ -418,6 +441,7 @@ class Jddevice:
         self.config = Config(self)
         self.linkgrabber = Linkgrabber(self)
         self.downloads = Downloads(self)
+        self.extraction = Extraction(self)
         self.downloadcontroller = DownloadController(self)
         self.update = Update(self)
         self.__direct_connection_info = None

{quasarr-1.20.2 → quasarr-1.20.4}/quasarr/providers/version.py

@@ -8,7 +8,7 @@ import requests
 
 
 def get_version():
-    return "1.20.2"
+    return "1.20.4"
 
 
 def get_latest_version():

{quasarr-1.20.2 → quasarr-1.20.4}/quasarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.20.2
+Version: 1.20.4
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Home-page: https://github.com/rix1337/Quasarr
 Author: rix1337