quasarr 1.20.1__tar.gz → 1.20.3__tar.gz

{quasarr-1.20.1 → quasarr-1.20.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.20.1
+Version: 1.20.3
 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
@@ -39,7 +39,7 @@ Quasarr pretends to be both `Newznab Indexer` and `SABnzbd client`. Therefore, d
 indexers or download clients. It simply does not know what NZB or torrent files are.
 
 Quasarr includes a solution to quickly and easily decrypt protected links.
-[Active Sponsors get access to SponsorsHelper to do so automatically.](https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper)
+[Active monthly Sponsors get access to SponsorsHelper to do so automatically.](https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper)
 Alternatively, follow the link from the console output (or discord notification) to solve CAPTCHAs manually.
 Quasarr will confidently handle the rest.
 
@@ -258,6 +258,11 @@ docker run -d \
   -e 'DEATHBYCAPTCHA_TOKEN'='2FMum5zuDBxMmbXDIsADnllEFl73bomydIpzo7...' \
   -e 'GITHUB_TOKEN'='ghp_123.....456789' \
   -e 'FLARESOLVERR_URL'='http://10.10.0.1:8191/v1' \
+  -e 'NX_USER'='your_nx_username' \
+  -e 'NX_PASS'='your_nx_password' \
+  -e 'JUNKIES_USER'='your_junkies_username' \
+  -e 'JUNKIES_PASS'='your_junkies_password' \
+  -e 'JUNKIES_HOSTER'='your_desired_hoster' \
   ghcr.io/rix1337-sponsors/docker/helper:latest
 ```
 
@@ -266,8 +271,10 @@ docker run -d \
 * `QUASARR_URL` → Local URL of Quasarr
 * `DEATHBYCAPTCHA_TOKEN` → [DeathByCaptcha](https://deathbycaptcha.com/register?refid=6184288242b) account token
 * `GITHUB_TOKEN` → Classic GitHub PAT with the scopes listed above
-* `FLARESOLVERR_URL` → Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr)
-
+* `FLARESOLVERR_URL` → Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) - required!
+* `NX_USER` / `NX_PASS` → NX account credentials
+* `JUNKIES_USER` / `JUNKIES_PASS` → Junkies account credentials
+* `JUNKIES_HOSTER` → Preferred hoster for Junkies links
 ---
 
 ⚠️ **Without a valid GitHub token linked to an active sponsorship, the image will not run.**

{quasarr-1.20.1 → quasarr-1.20.3}/README.md

@@ -12,7 +12,7 @@ Quasarr pretends to be both `Newznab Indexer` and `SABnzbd client`. Therefore, d
 indexers or download clients. It simply does not know what NZB or torrent files are.
 
 Quasarr includes a solution to quickly and easily decrypt protected links.
-[Active Sponsors get access to SponsorsHelper to do so automatically.](https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper)
+[Active monthly Sponsors get access to SponsorsHelper to do so automatically.](https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper)
 Alternatively, follow the link from the console output (or discord notification) to solve CAPTCHAs manually.
 Quasarr will confidently handle the rest.
 
@@ -231,6 +231,11 @@ docker run -d \
   -e 'DEATHBYCAPTCHA_TOKEN'='2FMum5zuDBxMmbXDIsADnllEFl73bomydIpzo7...' \
   -e 'GITHUB_TOKEN'='ghp_123.....456789' \
   -e 'FLARESOLVERR_URL'='http://10.10.0.1:8191/v1' \
+  -e 'NX_USER'='your_nx_username' \
+  -e 'NX_PASS'='your_nx_password' \
+  -e 'JUNKIES_USER'='your_junkies_username' \
+  -e 'JUNKIES_PASS'='your_junkies_password' \
+  -e 'JUNKIES_HOSTER'='your_desired_hoster' \
   ghcr.io/rix1337-sponsors/docker/helper:latest
 ```
 
@@ -239,8 +244,10 @@ docker run -d \
 * `QUASARR_URL` → Local URL of Quasarr
 * `DEATHBYCAPTCHA_TOKEN` → [DeathByCaptcha](https://deathbycaptcha.com/register?refid=6184288242b) account token
 * `GITHUB_TOKEN` → Classic GitHub PAT with the scopes listed above
-* `FLARESOLVERR_URL` → Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr)
-
+* `FLARESOLVERR_URL` → Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) - required!
+* `NX_USER` / `NX_PASS` → NX account credentials
+* `JUNKIES_USER` / `JUNKIES_PASS` → Junkies account credentials
+* `JUNKIES_HOSTER` → Preferred hoster for Junkies links
 ---
 
 ⚠️ **Without a valid GitHub token linked to an active sponsorship, the image will not run.**

{quasarr-1.20.1 → quasarr-1.20.3}/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"]

{quasarr-1.20.1 → quasarr-1.20.3}/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.1 → quasarr-1.20.3}/quasarr/providers/version.py

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

{quasarr-1.20.1 → quasarr-1.20.3}/quasarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.20.1
+Version: 1.20.3
 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
@@ -39,7 +39,7 @@ Quasarr pretends to be both `Newznab Indexer` and `SABnzbd client`. Therefore, d
 indexers or download clients. It simply does not know what NZB or torrent files are.
 
 Quasarr includes a solution to quickly and easily decrypt protected links.
-[Active Sponsors get access to SponsorsHelper to do so automatically.](https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper)
+[Active monthly Sponsors get access to SponsorsHelper to do so automatically.](https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper)
 Alternatively, follow the link from the console output (or discord notification) to solve CAPTCHAs manually.
 Quasarr will confidently handle the rest.
 
@@ -258,6 +258,11 @@ docker run -d \
   -e 'DEATHBYCAPTCHA_TOKEN'='2FMum5zuDBxMmbXDIsADnllEFl73bomydIpzo7...' \
   -e 'GITHUB_TOKEN'='ghp_123.....456789' \
   -e 'FLARESOLVERR_URL'='http://10.10.0.1:8191/v1' \
+  -e 'NX_USER'='your_nx_username' \
+  -e 'NX_PASS'='your_nx_password' \
+  -e 'JUNKIES_USER'='your_junkies_username' \
+  -e 'JUNKIES_PASS'='your_junkies_password' \
+  -e 'JUNKIES_HOSTER'='your_desired_hoster' \
   ghcr.io/rix1337-sponsors/docker/helper:latest
 ```
 
@@ -266,8 +271,10 @@ docker run -d \
 * `QUASARR_URL` → Local URL of Quasarr
 * `DEATHBYCAPTCHA_TOKEN` → [DeathByCaptcha](https://deathbycaptcha.com/register?refid=6184288242b) account token
 * `GITHUB_TOKEN` → Classic GitHub PAT with the scopes listed above
-* `FLARESOLVERR_URL` → Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr)
-
+* `FLARESOLVERR_URL` → Local URL of [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) - required!
+* `NX_USER` / `NX_PASS` → NX account credentials
+* `JUNKIES_USER` / `JUNKIES_PASS` → Junkies account credentials
+* `JUNKIES_HOSTER` → Preferred hoster for Junkies links
 ---
 
 ⚠️ **Without a valid GitHub token linked to an active sponsorship, the image will not run.**