quasarr 2.0.0__tar.gz → 2.1.0__tar.gz

{quasarr-2.0.0 → quasarr-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.0.0
+Version: 2.1.0
 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
@@ -25,7 +25,7 @@ Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: summary
 
-#   
+#    
 
 <img src="https://raw.githubusercontent.com/rix1337/Quasarr/main/Quasarr.png" data-canonical-src="https://raw.githubusercontent.com/rix1337/Quasarr/main/Quasarr.png" width="64" height="64" />
 
@@ -41,7 +41,8 @@ indexers. It simply does not know what NZB files are.
 Quasarr includes a solution to quickly and easily decrypt protected links.
 [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. Some CAPTCHA types require [Tampermonkey](https://www.tampermonkey.net/) to be installed in your browser.
+Quasarr will confidently handle the rest. Some CAPTCHA types require [Tampermonkey](https://www.tampermonkey.net/) to be
+installed in your browser.
 
 # Instructions
 
@@ -56,9 +57,11 @@ Quasarr will confidently handle the rest. Some CAPTCHA types require [Tampermonk
 
 ## FlareSolverr (Optional)
 
-FlareSolverr is **optional** but **required for some sites** (e.g., AL) that use Cloudflare protection. You can skip FlareSolverr during setup and configure it later via the web UI.
+FlareSolverr is **optional** but **required for some sites** (e.g., AL) that use Cloudflare protection. You can skip
+FlareSolverr during setup and configure it later via the web UI.
 
 If using FlareSolverr, provide your URL including the version path:
+
 ```
 http://192.168.1.1:8191/v1
 ```
@@ -69,11 +72,13 @@ http://192.168.1.1:8191/v1
 
 ## Quasarr
 
-> ⚠️ Quasarr requires at least one valid hostname to start. It does not provide or endorse any specific sources, but community-maintained lists are available:
+> ⚠️ Quasarr requires at least one valid hostname to start. It does not provide or endorse any specific sources, but
+> community-maintained lists are available:
 
 🔗 **[https://quasarr-host.name](https://quasarr-host.name)** — community guide for finding hostnames
 
-📋 Alternatively, browse community suggestions via [pastebin search](https://pastebin.com/search?q=hostnames+quasarr) (login required).
+📋 Alternatively, browse community suggestions via [pastebin search](https://pastebin.com/search?q=hostnames+quasarr) (
+login required).
 
 > Authentication is optional but strongly recommended.
 >
@@ -84,8 +89,9 @@ http://192.168.1.1:8191/v1
 
 ## JDownloader
 
-> ⚠️ If using Docker: 
-> JDownloader's download path must be available to Radarr/Sonarr/LazyLibrarian with **identical internal and external path mappings**!
+> ⚠️ If using Docker:
+> JDownloader's download path must be available to Radarr/Sonarr/LazyLibrarian with **identical internal and external
+path mappings**!
 > Matching only the external path is not sufficient.
 
 1. Start and connect JDownloader to [My JDownloader](https://my.jdownloader.org)
@@ -94,7 +100,8 @@ http://192.168.1.1:8191/v1
 <details>
 <summary>Fresh install recommended</summary>
 
-Consider setting up a fresh JDownloader instance. Quasarr will modify JDownloader's settings to enable Radarr/Sonarr/LazyLibrarian integration.
+Consider setting up a fresh JDownloader instance. Quasarr will modify JDownloader's settings to enable
+Radarr/Sonarr/LazyLibrarian integration.
 
 </details>
 
@@ -102,7 +109,8 @@ Consider setting up a fresh JDownloader instance. Quasarr will modify JDownloade
 
 ## Radarr / Sonarr
 
-> ⚠️ **Sonarr users:** Set all shows (including anime) to the **Standard** series type. Quasarr cannot find releases for shows set to Anime/Absolute.
+> ⚠️ **Sonarr users:** Set all shows (including anime) to the **Standard** series type. Quasarr cannot find releases for
+> shows set to Anime/Absolute.
 
 
 Add Quasarr as both a **Newznab Indexer** and **SABnzbd Download Client** using your Quasarr URL and API Key.
@@ -118,9 +126,11 @@ Add Quasarr as both a **Newznab Indexer** and **SABnzbd Download Client** using
 <summary>Restrict results to a specific mirror</summary>
 
 Append the mirror name to your Newznab URL:
+
 ```
 /api/dropbox/
 ```
+
 Only releases with `dropbox` in a link will be returned. If the mirror isn't available, the release will fail.
 
 </details>
@@ -136,27 +146,29 @@ Only releases with `dropbox` in a link will be returned. If the mirror isn't ava
 
 ### SABnzbd+ Downloader
 
-| Setting | Value |
-|---------|-------|
+| Setting  | Value                      |
+|----------|----------------------------|
 | URL/Port | Your Quasarr host and port |
-| API Key | Your Quasarr API Key |
-| Category | `docs` |
+| API Key  | Your Quasarr API Key       |
+| Category | `docs`                     |
 
 ### Newznab Provider
 
-| Setting | Value |
-|---------|-------|
-| URL | Your Quasarr URL |
-| API | Your Quasarr API Key |
+| Setting | Value                |
+|---------|----------------------|
+| URL     | Your Quasarr URL     |
+| API     | Your Quasarr API Key |
 
 ### Fix Import & Processing
 
 **Importing:**
+
 - Enable `OpenLibrary api for book/author information`
 - Set Primary Information Source to `OpenLibrary`
 - Add to Import languages: `, Unknown` (German users: `, de, ger, de-DE`)
 
 **Processing → Folders:**
+
 - Add your Quasarr download path (typically `/downloads/Quasarr/`)
 
 </details>
@@ -236,7 +248,8 @@ Most feature requests can be satisfied by:
 - There are no hostname integrations in active development unless you see an open pull request
   [here](https://github.com/rix1337/Quasarr/pulls).
 - **Pull requests are welcome!** Especially for popular hostnames.
-    - A short guide to set up required dev services is found in [/docker/dev-setup.md](https://github.com/rix1337/Quasarr/blob/main/docker/dev-setup.md)
+    - A short guide to set up required dev services is found
+      in [/docker/dev-setup.md](https://github.com/rix1337/Quasarr/blob/main/docker/dev-setup.md)
     - Always reach out on Discord before starting work on a new feature to prevent waste of time.
     - Please follow the existing code style and project structure.
     - Anti-bot measures must be circumvented fully by Quasarr. Thus, you will need to provide a working solution for new
@@ -258,11 +271,11 @@ Image access is limited to [active monthly GitHub sponsors](https://github.com/u
 
 1. Start your [sponsorship](https://github.com/users/rix1337/sponsorship) first.
 2. Open [GitHub Classic Token Settings](https://github.com/settings/tokens/new?type=classic)
-3. Name it (e.g., `SponsorsHelper`) and choose unlimited expiration  
+3. Name it (e.g., `SponsorsHelper`) and choose unlimited expiration
 4. Enable these scopes:
-   - `read:packages`
-   - `read:user`
-   - `read:org`
+    - `read:packages`
+    - `read:user`
+    - `read:org`
 5. Click **Generate token** and copy it for the next steps
 
 ---

{quasarr-2.0.0 → quasarr-2.1.0}/README.md

@@ -1,4 +1,4 @@
-#   
+#    
 
 <img src="https://raw.githubusercontent.com/rix1337/Quasarr/main/Quasarr.png" data-canonical-src="https://raw.githubusercontent.com/rix1337/Quasarr/main/Quasarr.png" width="64" height="64" />
 
@@ -14,7 +14,8 @@ indexers. It simply does not know what NZB files are.
 Quasarr includes a solution to quickly and easily decrypt protected links.
 [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. Some CAPTCHA types require [Tampermonkey](https://www.tampermonkey.net/) to be installed in your browser.
+Quasarr will confidently handle the rest. Some CAPTCHA types require [Tampermonkey](https://www.tampermonkey.net/) to be
+installed in your browser.
 
 # Instructions
 
@@ -29,9 +30,11 @@ Quasarr will confidently handle the rest. Some CAPTCHA types require [Tampermonk
 
 ## FlareSolverr (Optional)
 
-FlareSolverr is **optional** but **required for some sites** (e.g., AL) that use Cloudflare protection. You can skip FlareSolverr during setup and configure it later via the web UI.
+FlareSolverr is **optional** but **required for some sites** (e.g., AL) that use Cloudflare protection. You can skip
+FlareSolverr during setup and configure it later via the web UI.
 
 If using FlareSolverr, provide your URL including the version path:
+
 ```
 http://192.168.1.1:8191/v1
 ```
@@ -42,11 +45,13 @@ http://192.168.1.1:8191/v1
 
 ## Quasarr
 
-> ⚠️ Quasarr requires at least one valid hostname to start. It does not provide or endorse any specific sources, but community-maintained lists are available:
+> ⚠️ Quasarr requires at least one valid hostname to start. It does not provide or endorse any specific sources, but
+> community-maintained lists are available:
 
 🔗 **[https://quasarr-host.name](https://quasarr-host.name)** — community guide for finding hostnames
 
-📋 Alternatively, browse community suggestions via [pastebin search](https://pastebin.com/search?q=hostnames+quasarr) (login required).
+📋 Alternatively, browse community suggestions via [pastebin search](https://pastebin.com/search?q=hostnames+quasarr) (
+login required).
 
 > Authentication is optional but strongly recommended.
 >
@@ -57,8 +62,9 @@ http://192.168.1.1:8191/v1
 
 ## JDownloader
 
-> ⚠️ If using Docker: 
-> JDownloader's download path must be available to Radarr/Sonarr/LazyLibrarian with **identical internal and external path mappings**!
+> ⚠️ If using Docker:
+> JDownloader's download path must be available to Radarr/Sonarr/LazyLibrarian with **identical internal and external
+path mappings**!
 > Matching only the external path is not sufficient.
 
 1. Start and connect JDownloader to [My JDownloader](https://my.jdownloader.org)
@@ -67,7 +73,8 @@ http://192.168.1.1:8191/v1
 <details>
 <summary>Fresh install recommended</summary>
 
-Consider setting up a fresh JDownloader instance. Quasarr will modify JDownloader's settings to enable Radarr/Sonarr/LazyLibrarian integration.
+Consider setting up a fresh JDownloader instance. Quasarr will modify JDownloader's settings to enable
+Radarr/Sonarr/LazyLibrarian integration.
 
 </details>
 
@@ -75,7 +82,8 @@ Consider setting up a fresh JDownloader instance. Quasarr will modify JDownloade
 
 ## Radarr / Sonarr
 
-> ⚠️ **Sonarr users:** Set all shows (including anime) to the **Standard** series type. Quasarr cannot find releases for shows set to Anime/Absolute.
+> ⚠️ **Sonarr users:** Set all shows (including anime) to the **Standard** series type. Quasarr cannot find releases for
+> shows set to Anime/Absolute.
 
 
 Add Quasarr as both a **Newznab Indexer** and **SABnzbd Download Client** using your Quasarr URL and API Key.
@@ -91,9 +99,11 @@ Add Quasarr as both a **Newznab Indexer** and **SABnzbd Download Client** using
 <summary>Restrict results to a specific mirror</summary>
 
 Append the mirror name to your Newznab URL:
+
 ```
 /api/dropbox/
 ```
+
 Only releases with `dropbox` in a link will be returned. If the mirror isn't available, the release will fail.
 
 </details>
@@ -109,27 +119,29 @@ Only releases with `dropbox` in a link will be returned. If the mirror isn't ava
 
 ### SABnzbd+ Downloader
 
-| Setting | Value |
-|---------|-------|
+| Setting  | Value                      |
+|----------|----------------------------|
 | URL/Port | Your Quasarr host and port |
-| API Key | Your Quasarr API Key |
-| Category | `docs` |
+| API Key  | Your Quasarr API Key       |
+| Category | `docs`                     |
 
 ### Newznab Provider
 
-| Setting | Value |
-|---------|-------|
-| URL | Your Quasarr URL |
-| API | Your Quasarr API Key |
+| Setting | Value                |
+|---------|----------------------|
+| URL     | Your Quasarr URL     |
+| API     | Your Quasarr API Key |
 
 ### Fix Import & Processing
 
 **Importing:**
+
 - Enable `OpenLibrary api for book/author information`
 - Set Primary Information Source to `OpenLibrary`
 - Add to Import languages: `, Unknown` (German users: `, de, ger, de-DE`)
 
 **Processing → Folders:**
+
 - Add your Quasarr download path (typically `/downloads/Quasarr/`)
 
 </details>
@@ -209,7 +221,8 @@ Most feature requests can be satisfied by:
 - There are no hostname integrations in active development unless you see an open pull request
   [here](https://github.com/rix1337/Quasarr/pulls).
 - **Pull requests are welcome!** Especially for popular hostnames.
-    - A short guide to set up required dev services is found in [/docker/dev-setup.md](https://github.com/rix1337/Quasarr/blob/main/docker/dev-setup.md)
+    - A short guide to set up required dev services is found
+      in [/docker/dev-setup.md](https://github.com/rix1337/Quasarr/blob/main/docker/dev-setup.md)
     - Always reach out on Discord before starting work on a new feature to prevent waste of time.
     - Please follow the existing code style and project structure.
     - Anti-bot measures must be circumvented fully by Quasarr. Thus, you will need to provide a working solution for new
@@ -231,11 +244,11 @@ Image access is limited to [active monthly GitHub sponsors](https://github.com/u
 
 1. Start your [sponsorship](https://github.com/users/rix1337/sponsorship) first.
 2. Open [GitHub Classic Token Settings](https://github.com/settings/tokens/new?type=classic)
-3. Name it (e.g., `SponsorsHelper`) and choose unlimited expiration  
+3. Name it (e.g., `SponsorsHelper`) and choose unlimited expiration
 4. Enable these scopes:
-   - `read:packages`
-   - `read:user`
-   - `read:org`
+    - `read:packages`
+    - `read:user`
+    - `read:org`
 5. Click **Generate token** and copy it for the next steps
 
 ---

{quasarr-2.0.0 → quasarr-2.1.0}/quasarr/api/__init__.py

@@ -66,7 +66,7 @@ def get_api(shared_state_dict, shared_state_lock):
         # JDownloader status
         jd_status = f"""
             <div class="status-bar">
-                <span class="status-item {'status-ok' if jd_connected else 'status-error'}">
+                <span class="status-pill {'success' if jd_connected else 'error'}">
                     {'✅' if jd_connected else '❌'} JDownloader {'Connected' if jd_connected else 'Disconnected'}
                 </span>
             </div>
@@ -389,8 +389,8 @@ def get_api(shared_state_dict, shared_state_lock):
         </script>
         """
         # Add logout link for form auth
-        logout_html = '<div class="logout-link"><a href="/logout">Logout</a></div>' if show_logout_link() else ''
-        return render_centered_html(info + logout_html)
+        logout_html = '<a href="/logout">Logout</a>' if show_logout_link() else ''
+        return render_centered_html(info, footer_content=logout_html)
 
     @app.get('/regenerate-api-key')
     def regenerate_api_key():

{quasarr-2.0.0 → quasarr-2.1.0}/quasarr/api/arr/__init__.py

@@ -34,18 +34,57 @@ def require_api_key(func):
     return decorated
 
 
+def parse_payload(payload_str):
+    """
+    Parse the base64-encoded payload string into its components.
+
+    Supports both legacy 6-field format and new 7-field format:
+    - Legacy (6 fields): title|url|mirror|size_mb|password|imdb_id
+    - New (7 fields): title|url|mirror|size_mb|password|imdb_id|source_key
+
+    Returns:
+        dict with keys: title, url, mirror, size_mb, password, imdb_id, source_key
+    """
+    decoded = urlsafe_b64decode(payload_str.encode()).decode()
+    parts = decoded.split("|")
+
+    if len(parts) == 6:
+        # Legacy format - no source_key provided
+        title, url, mirror, size_mb, password, imdb_id = parts
+        source_key = None
+    elif len(parts) == 7:
+        # New format with source_key
+        title, url, mirror, size_mb, password, imdb_id, source_key = parts
+    else:
+        raise ValueError(f"expected 6 or 7 fields, got {len(parts)}")
+
+    return {
+        "title": title,
+        "url": url,
+        "mirror": None if mirror == "None" else mirror,
+        "size_mb": size_mb,
+        "password": password if password else None,
+        "imdb_id": imdb_id if imdb_id else None,
+        "source_key": source_key if source_key else None
+    }
+
+
 def setup_arr_routes(app):
     @app.get('/download/')
     def fake_nzb_file():
         payload = request.query.payload
         decoded_payload = urlsafe_b64decode(payload).decode("utf-8").split("|")
+
+        # Support both 6 and 7 field formats
         title = decoded_payload[0]
         url = decoded_payload[1]
         mirror = decoded_payload[2]
         size_mb = decoded_payload[3]
         password = decoded_payload[4]
         imdb_id = decoded_payload[5]
-        return f'<nzb><file title="{title}" url="{url}" mirror="{mirror}" size_mb="{size_mb}" password="{password}" imdb_id="{imdb_id}"/></nzb>'
+        source_key = decoded_payload[6] if len(decoded_payload) > 6 else ""
+
+        return f'<nzb><file title="{title}" url="{url}" mirror="{mirror}" size_mb="{size_mb}" password="{password}" imdb_id="{imdb_id}" source_key="{source_key}"/></nzb>'
 
     @app.post('/api')
     @require_api_key
@@ -65,10 +104,12 @@ def setup_arr_routes(app):
             size_mb = root.find(".//file").attrib["size_mb"]
             password = root.find(".//file").attrib.get("password")
             imdb_id = root.find(".//file").attrib.get("imdb_id")
+            source_key = root.find(".//file").attrib.get("source_key") or None
 
             info(f'Attempting download for "{title}"')
             request_from = request.headers.get('User-Agent')
-            downloaded = download(shared_state, request_from, title, url, mirror, size_mb, password, imdb_id)
+            downloaded = download(shared_state, request_from, title, url, mirror, size_mb, password, imdb_id,
+                                  source_key)
             try:
                 success = downloaded["success"]
                 package_id = downloaded["package_id"]
@@ -166,37 +207,31 @@ def setup_arr_routes(app):
                     if not payload:
                         abort(400, "missing 'payload' parameter in URL")
 
-                    title = url = mirror = size_mb = password = imdb_id = None
                     try:
-                        decoded = urlsafe_b64decode(payload.encode()).decode()
-                        parts = decoded.split("|")
-                        if len(parts) != 6:
-                            raise ValueError(f"expected 6 fields, got {len(parts)}")
-                        title, url, mirror, size_mb, password, imdb_id = parts
+                        parsed_payload = parse_payload(payload)
                     except Exception as e:
                         abort(400, f"invalid payload format: {e}")
 
-                    mirror = None if mirror == "None" else mirror
-
                     nzo_ids = []
-                    info(f'Attempting download for "{title}"')
+                    info(f'Attempting download for "{parsed_payload["title"]}"')
                     request_from = "lazylibrarian"
 
                     downloaded = download(
                         shared_state,
                         request_from,
-                        title,
-                        url,
-                        mirror,
-                        size_mb,
-                        password or None,
-                        imdb_id or None,
+                        parsed_payload["title"],
+                        parsed_payload["url"],
+                        parsed_payload["mirror"],
+                        parsed_payload["size_mb"],
+                        parsed_payload["password"],
+                        parsed_payload["imdb_id"],
+                        parsed_payload["source_key"],
                     )
 
                     try:
                         success = downloaded["success"]
                         package_id = downloaded["package_id"]
-                        title = downloaded.get("title", title)
+                        title = downloaded.get("title", parsed_payload["title"])
 
                         if success:
                             info(f'"{title}" added successfully!')
@@ -204,7 +239,7 @@ def setup_arr_routes(app):
                             info(f'"{title}" added unsuccessfully! See log for details.')
                         nzo_ids.append(package_id)
                     except KeyError:
-                        info(f'Failed to download "{title}" - no package_id returned')
+                        info(f'Failed to download "{parsed_payload["title"]}" - no package_id returned')
 
                     return {
                         "status": True,
@@ -353,7 +388,8 @@ def setup_arr_routes(app):
                             <enclosure url="{release.get("link", "")}" length="{release.get("size", 0)}" type="application/x-nzb" />
                         </item>'''
 
-                    requires_placeholder_item = not getattr(request.query, 'imdbid', '') and not getattr(request.query, 'q', '')
+                    requires_placeholder_item = not getattr(request.query, 'imdbid', '') and not getattr(request.query,
+                                                                                                         'q', '')
                     if requires_placeholder_item and not items:
                         items = f'''
                         <item>

{quasarr-2.0.0 → quasarr-2.1.0}/quasarr/api/config/__init__.py

@@ -235,7 +235,7 @@ def setup_config(app, shared_state):
         }}
         </script>
         '''
-        return render_form("Configure FlareSolverr", form_html)
+        return render_form("FlareSolverr", form_html)
 
     @app.post('/api/flaresolverr')
     def set_flaresolverr_url():