quasarr 2.4.11__tar.gz → 2.6.0__tar.gz

{quasarr-2.4.11 → quasarr-2.6.0}/.github/workflows/PullRequests.yml

@@ -53,10 +53,11 @@ jobs:
 
   version:
     needs: [ quality-check ]
-    if: needs.quality-check.outputs.changes_pushed != 'true' && (github.head_ref || github.ref_name) == 'dev'
+    if: needs.quality-check.outputs.changes_pushed != 'true' && ((github.head_ref == 'dev' && github.base_ref == 'main') || (github.event_name == 'workflow_dispatch' && github.ref_name == 'dev'))
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.version.outputs.version }}
+      epoch: ${{ steps.version.outputs.epoch }}
     steps:
       - uses: actions/checkout@v6
       - uses: actions/setup-python@v5
@@ -68,12 +69,14 @@ jobs:
       - id: version
         run: |
           VERSION=$(uv run python quasarr/providers/version.py)
+          EPOCH=$(date +%s)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "🏷️ Detected version: $VERSION"
+          echo "epoch=$EPOCH" >> $GITHUB_OUTPUT
+          echo "🏷️ Detected version: $VERSION ($EPOCH)"
 
   build-wheel:
     needs: [ quality-check, version ]
-    if: needs.quality-check.outputs.changes_pushed != 'true' && (github.head_ref || github.ref_name) == 'dev'
+    if: needs.quality-check.outputs.changes_pushed != 'true' && ((github.head_ref == 'dev' && github.base_ref == 'main') || (github.event_name == 'workflow_dispatch' && github.ref_name == 'dev'))
     runs-on: ubuntu-latest
     outputs:
       attestation-id: ${{ steps.attest.outputs.attestation-id }}
@@ -103,7 +106,7 @@ jobs:
 
   build-exe:
     needs: [ quality-check, version ]
-    if: needs.quality-check.outputs.changes_pushed != 'true' && (github.head_ref || github.ref_name) == 'dev'
+    if: needs.quality-check.outputs.changes_pushed != 'true' && ((github.head_ref == 'dev' && github.base_ref == 'main') || (github.event_name == 'workflow_dispatch' && github.ref_name == 'dev'))
     runs-on: windows-latest
     env:
       TMP: "D:\\a\\temp"
@@ -168,10 +171,12 @@ jobs:
       - name: Create Release Body
         run: |
           echo "📝 Generating Release Body..."
-          echo "### Docker:" > release_body.md
+          echo "# ${{ needs.version.outputs.version }} (${{ needs.version.outputs.epoch }})" > release_body.md
+          echo "" >> release_body.md
+          echo "### Docker:" >> release_body.md
           echo "\`docker pull ${{ env.GHCR_ENDPOINT }}:beta\`" >> release_body.md
           echo "### Python:" >> release_body.md
-          echo "\`uv tool upgrade quasarr\`" >> release_body.md
+          echo "\`uv tool install https://github.com/rix1337/Quasarr/releases/download/beta/quasarr-${{ needs.version.outputs.version }}-py3-none-any.whl\`" >> release_body.md
           echo "### Changelog:" >> release_body.md
           echo "${{ steps.changelog.outputs.changelog }}" >> release_body.md
           echo "[Attestation](https://github.com/${{ github.repository }}/attestations/${{ needs.build-wheel.outputs.attestation-id }})" >> release_body.md
@@ -182,14 +187,14 @@ jobs:
           removeArtifacts: true
           replacesArtifacts: true
           tag: beta
-          name: Beta Build
+          name: "${{ needs.version.outputs.version }} (${{ needs.version.outputs.epoch }})"
           bodyFile: "release_body.md"
           prerelease: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
   build-docker-amd64:
     needs: [ quality-check, version, build-wheel ]
-    if: needs.quality-check.outputs.changes_pushed != 'true' && (github.head_ref || github.ref_name) == 'dev'
+    if: needs.quality-check.outputs.changes_pushed != 'true' && ((github.head_ref == 'dev' && github.base_ref == 'main') || (github.event_name == 'workflow_dispatch' && github.ref_name == 'dev'))
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -221,7 +226,7 @@ jobs:
 
   build-docker-arm64:
     needs: [ quality-check, version, build-wheel ]
-    if: needs.quality-check.outputs.changes_pushed != 'true' && (github.head_ref || github.ref_name) == 'dev'
+    if: needs.quality-check.outputs.changes_pushed != 'true' && ((github.head_ref == 'dev' && github.base_ref == 'main') || (github.event_name == 'workflow_dispatch' && github.ref_name == 'dev'))
     runs-on: ubuntu-24.04-arm
     steps:
       - uses: actions/checkout@v6
@@ -292,12 +297,13 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           VERSION: ${{ needs.version.outputs.version }}
+          EPOCH: ${{ needs.version.outputs.epoch }}
           REPO: ${{ github.repository }}
         run: |
           echo "📢 Notifying stakeholders..."
           RELEASE_BODY=$(gh release view beta --json body --jq .body)
           if [ -n "$DISCORD_WEBHOOK" ]; then
-            jq -n --arg title "🚀 New Beta Build: $VERSION" --arg desc "$RELEASE_BODY" --arg url "https://github.com/$REPO/releases/tag/beta" '{content: null, embeds: [{title: $title, description: $desc, url: $url, color: 5814783}]}' > discord_payload.json
+            jq -n --arg title "🚀 New Beta Build: $VERSION ($EPOCH)" --arg url "https://github.com/$REPO/releases/tag/beta" '{content: null, flags: 4096, embeds: [{title: $title, url: $url, color: 5814783}]}' > discord_payload.json
             curl -H "Content-Type: application/json" -d @discord_payload.json "$DISCORD_WEBHOOK"
           fi
           PR_NUMBER=$(gh pr list --search "${{ github.sha }}" --state merged --json number --jq '.[0].number')
@@ -338,4 +344,5 @@ jobs:
           echo "| Metric | Value |" >> $GITHUB_STEP_SUMMARY
           echo "| --- | --- |" >> $GITHUB_STEP_SUMMARY
           echo "| **Version** | \`${{ needs.version.outputs.version || 'N/A' }}\` |" >> $GITHUB_STEP_SUMMARY
+          echo "| **Epoch** | \`${{ needs.version.outputs.epoch || 'N/A' }}\` |" >> $GITHUB_STEP_SUMMARY
           echo "| **Release Job** | ${{ needs.beta-release.result || 'Skipped' }} |" >> $GITHUB_STEP_SUMMARY

{quasarr-2.4.11 → quasarr-2.6.0}/.github/workflows/Release.yml

@@ -254,18 +254,24 @@ jobs:
         uses: metcalfc/changelog-generator@v4.6.2
         with:
           myToken: ${{ secrets.GITHUB_TOKEN }}
-      - name: Add PR Body to Changelog
+      - name: Get PR Body
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           PR_BODY=$(gh pr list --search "${{ github.sha }}" --state merged --json body --jq '.[0].body // empty')
-          if [ -n "$PR_BODY" ]; then echo -e "\n$PR_BODY" >> .github/Changelog.md; fi
+          if [ -n "$PR_BODY" ]; then
+            echo "$PR_BODY" > pr_body.txt
+          fi
       - name: Create Release Body
         run: |
           echo "### Docker:" > release_body.md
           echo "\`docker pull ${{ env.GHCR_ENDPOINT }}:latest\`" >> release_body.md
           echo "### Python:" >> release_body.md
           echo "\`uv tool upgrade quasarr\`" >> release_body.md
+          if [ -f pr_body.txt ]; then
+            cat pr_body.txt >> release_body.md
+            echo "" >> release_body.md
+          fi
           echo "### Changelog:" >> release_body.md
           echo "${{ steps.changelog.outputs.changelog }}" >> release_body.md
           echo "[Attestation](https://github.com/${{ github.repository }}/attestations/${{ needs.build-wheel.outputs.attestation-id }})" >> release_body.md

{quasarr-2.4.11 → quasarr-2.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.4.11
+Version: 2.6.0
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Author-email: rix1337 <rix1337@users.noreply.github.com>
 License-File: LICENSE

{quasarr-2.4.11 → quasarr-2.6.0}/pre-commit.py

@@ -11,9 +11,16 @@ VERSION_FILE = Path("quasarr/providers/version.py")
 PYPROJECT_FILE = Path("pyproject.toml")
 
 
+def safe_print(msg):
+    try:
+        print(msg)
+    except Exception:
+        print(msg.encode("ascii", errors="replace").decode("ascii"))
+
+
 def run(cmd, check=True, capture=False, text=True):
     """Helper to run shell commands comfortably."""
-    print(f"⚙️  Exec: {' '.join(cmd)}")
+    safe_print(f"⚙️  Exec: {' '.join(cmd)}")
     return subprocess.run(cmd, check=check, capture_output=capture, text=text)
 
 
@@ -29,29 +36,31 @@ def git_status_has_changes():
 
 
 def task_format():
-    print("\n🔍 --- 1. FORMATTING & SYNTAX CHECK ---")
+    safe_print("\n🔍 --- 1. FORMATTING & SYNTAX CHECK ---")
 
     # Runs Ruff using the rules defined in pyproject.toml
     result = run(["uv", "run", "ruff", "check", "--fix", "."], check=False)
 
     if result.returncode != 0:
-        print("❌ Critical errors or syntax issues found. Fix them before staging.")
+        safe_print(
+            "❌ Critical errors or syntax issues found. Fix them before staging."
+        )
         return False
 
     # Standard formatting (indentation/spacing)
     run(["uv", "run", "ruff", "format", "."], check=False)
 
     if git_status_has_changes():
-        print("✅ Linting fixes applied and staged.")
+        safe_print("✅ Linting fixes applied and staged.")
         run(["git", "add", "."])
         return True
 
-    print("✨ Code style is already perfect.")
+    safe_print("✨ Code style is already perfect.")
     return False
 
 
 def task_upgrade_deps():
-    print("\n📦 --- 2. DEPENDENCIES ---")
+    safe_print("\n📦 --- 2. DEPENDENCIES ---")
     try:
         with open(PYPROJECT_FILE, "rb") as f:
             pyproj = tomllib.load(f)
@@ -65,7 +74,7 @@ def task_upgrade_deps():
         if deps:
             pkgs = [get_pkg_name(d) for d in deps if get_pkg_name(d)]
             if pkgs:
-                print(f"⬆️  Upgrading main: {pkgs}")
+                safe_print(f"⬆️  Upgrading main: {pkgs}")
                 run(["uv", "add", "--upgrade"] + pkgs, check=False)
 
         # Groups
@@ -74,27 +83,27 @@ def task_upgrade_deps():
             if g_deps:
                 pkgs = [get_pkg_name(d) for d in g_deps if get_pkg_name(d)]
                 if pkgs:
-                    print(f"🏗️  Upgrading group '{group}': {pkgs}")
+                    safe_print(f"🏗️  Upgrading group '{group}': {pkgs}")
                     run(
                         ["uv", "add", "--group", group, "--upgrade"] + pkgs, check=False
                     )
 
         # Lock file
-        print("🔒 Refreshing lockfile...")
+        safe_print("🔒 Refreshing lockfile...")
         run(["uv", "lock", "--upgrade"], check=False)
 
     except Exception as e:
-        print(f"⚠️  Dependency upgrade failed: {e}")
+        safe_print(f"⚠️  Dependency upgrade failed: {e}")
 
     if git_status_has_changes():
-        print("✅ Dependencies updated.")
+        safe_print("✅ Dependencies updated.")
         run(["git", "add", "."])
         return True
     return False
 
 
 def task_version_bump():
-    print("\n🏷️  --- 3. VERSION CHECK ---")
+    safe_print("\n🏷️  --- 3. VERSION CHECK ---")
     new_v = ""
 
     def get_ver(content):
@@ -118,7 +127,7 @@ def task_version_bump():
             return (0, 0, 0)
 
     try:
-        print("🌐 Fetching remote to compare versions...")
+        safe_print("🌐 Fetching remote to compare versions...")
         run(["git", "fetch", "origin", "main"], check=False)
         try:
             base = subprocess.check_output(
@@ -128,18 +137,22 @@ def task_version_bump():
             base = "origin/main"
 
         # Read Main Version
-        run(["git", "checkout", base, "--", str(VERSION_FILE)], capture=True)
-        main_v = get_ver(VERSION_FILE.read_text())
+        try:
+            main_v_content = subprocess.check_output(
+                ["git", "show", f"{base}:{VERSION_FILE.as_posix()}"], text=True
+            )
+            main_v = get_ver(main_v_content)
+        except Exception:
+            main_v = None
 
-        # Reset file and read Current Version
-        run(["git", "checkout", "HEAD", "--", str(VERSION_FILE)], capture=True)
+        # Read Current Version
         curr_v = get_ver(VERSION_FILE.read_text())
 
-        print(f"📊 Main: {main_v} | Current: {curr_v}")
+        safe_print(f"📊 Main: {main_v} | Current: {curr_v}")
 
         if main_v and curr_v and ver_tuple(curr_v) <= ver_tuple(main_v):
             new_v = bump(main_v)
-            print(f"🚀 Bumping version to: {new_v}")
+            safe_print(f"🚀 Bumping version to: {new_v}")
             content = VERSION_FILE.read_text().replace(f'"{curr_v}"', f'"{new_v}"')
             VERSION_FILE.write_text(content)
 
@@ -147,7 +160,7 @@ def task_version_bump():
             return True, new_v
 
     except Exception as e:
-        print(f"⚠️  Version check warning (non-fatal): {e}")
+        safe_print(f"⚠️  Version check warning (non-fatal): {e}")
 
     return False, new_v
 
@@ -166,7 +179,7 @@ def main():
 
     # --- CI Specific Logic ---
     if is_ci and (fixed_format or fixed_deps or fixed_version):
-        print("\n📤 --- 4. PUSH & REPORT ---")
+        safe_print("\n📤 --- 4. PUSH & REPORT ---")
 
         run(["git", "config", "--global", "user.name", "github-actions[bot]"])
         run(
@@ -195,7 +208,7 @@ def main():
         try:
             run(["git", "commit", "-m", msg])
             target_ref = get_env("TARGET_REF")
-            print(f"🔄 Rebase and pushing to {target_ref}...")
+            safe_print(f"🔄 Rebase and pushing to {target_ref}...")
             run(["git", "pull", "--rebase", "origin", target_ref], check=False)
             run(["git", "push", "origin", f"HEAD:{target_ref}"])
 
@@ -203,7 +216,7 @@ def main():
                 with open(os.environ["GITHUB_OUTPUT"], "a") as f:
                     f.write("changes_pushed=true\n")
         except subprocess.CalledProcessError as e:
-            print(f"❌ ::error::Failed to push fixes. ({e})")
+            safe_print(f"❌ ::error::Failed to push fixes. ({e})")
             sys.exit(1)
 
         repo = get_env("GITHUB_REPO")
@@ -223,7 +236,7 @@ def main():
                 pass
 
         if pr_num:
-            print(f"💬 Posting status update to PR #{pr_num}...")
+            safe_print(f"💬 Posting status update to PR #{pr_num}...")
             fixes_list = ""
             if fixed_format:
                 fixes_list += "- ✅ **Formatted Code**\n"
@@ -252,18 +265,18 @@ def main():
                     check=False,
                 )
 
-        print(f"⚡ Triggering workflow: {workflow_name}...")
+        safe_print(f"⚡ Triggering workflow: {workflow_name}...")
         ret = run(
             ["gh", "workflow", "run", workflow_name, "--ref", target_ref], check=False
         )
 
         if ret.returncode != 0:
-            print("⚠️  ::warning::Could not auto-trigger next run.")
+            safe_print("⚠️  ::warning::Could not auto-trigger next run.")
 
         sys.exit(0)
 
     else:
-        print("\n✨ Clean run. No changes needed.")
+        safe_print("\n✨ Clean run. No changes needed.")
         if "GITHUB_OUTPUT" in os.environ:
             with open(os.environ["GITHUB_OUTPUT"], "a") as f:
                 f.write("changes_pushed=false\n")

{quasarr-2.4.11 → quasarr-2.6.0}/quasarr/__init__.py

@@ -386,48 +386,43 @@ def jdownloader_connection(shared_state_dict, shared_state_lock):
     try:
         shared_state.set_state(shared_state_dict, shared_state_lock)
 
-        shared_state.set_device_from_config()
+        while True:
+            shared_state.set_device_from_config()
 
-        connection_established = (
-            shared_state.get_device() and shared_state.get_device().name
-        )
-        if not connection_established:
-            i = 0
-            while i < 10:
-                i += 1
+            device = shared_state.get_device()
+
+            try:
                 info(
-                    f'Connection {i} to JDownloader failed. Device name: "{shared_state.values["device"]}"'
+                    f'Connection to JDownloader successful. Device name: "{device.name}"'
                 )
-                time.sleep(60)
-                shared_state.set_device_from_config()
-                connection_established = (
-                    shared_state.get_device() and shared_state.get_device().name
-                )
-                if connection_established:
-                    break
+            except Exception as e:
+                info(f"Error connecting to JDownloader: {e}! Stopping Quasarr...")
+                sys.exit(1)
 
-        try:
-            info(
-                f'Connection to JDownloader successful. Device name: "{shared_state.get_device().name}"'
-            )
-        except Exception as e:
-            info(f"Error connecting to JDownloader: {e}! Stopping Quasarr!")
-            sys.exit(1)
+            try:
+                shared_state.set_device_settings()
+            except Exception as e:
+                print(f"Error checking settings: {e}")
 
-        try:
-            shared_state.set_device_settings()
-        except Exception as e:
-            print(f"Error checking settings: {e}")
+            try:
+                shared_state.update_jdownloader()
+            except Exception as e:
+                print(f"Error updating JDownloader: {e}")
 
-        try:
-            shared_state.update_jdownloader()
-        except Exception as e:
-            print(f"Error updating JDownloader: {e}")
+            try:
+                shared_state.start_downloads()
+            except Exception as e:
+                print(f"Error starting downloads: {e}")
 
-        try:
-            shared_state.start_downloads()
-        except Exception as e:
-            print(f"Error starting downloads: {e}")
+            while True:
+                time.sleep(300)
+                device_state = shared_state.check_device(
+                    shared_state.values.get("device")
+                )
+                if not device_state:
+                    info("Lost connection to JDownloader. Reconnecting...")
+                    shared_state.update("device", False)
+                    break
 
     except KeyboardInterrupt:
         pass

{quasarr-2.4.11 → quasarr-2.6.0}/quasarr/api/__init__.py

@@ -8,6 +8,7 @@ import quasarr.providers.html_images as images
 from quasarr.api.arr import setup_arr_routes
 from quasarr.api.captcha import setup_captcha_routes
 from quasarr.api.config import setup_config
+from quasarr.api.jdownloader import get_jdownloader_modal_script, get_jdownloader_status
 from quasarr.api.packages import setup_packages_routes
 from quasarr.api.sponsors_helper import setup_sponsors_helper_routes
 from quasarr.api.statistics import setup_statistics
@@ -49,12 +50,9 @@ def get_api(shared_state_dict, shared_state_lock):
         protected = shared_state.get_db("protected").retrieve_all_titles()
         api_key = Config("API").get("key")
 
-        # Get quick status summary
-        try:
-            device = shared_state.values.get("device")
-            jd_connected = device is not None and device is not False
-        except:
-            jd_connected = False
+        # Get JDownloader status and modal script
+        jd_status = get_jdownloader_status(shared_state)
+        jd_modal_script = get_jdownloader_modal_script()
 
         # Calculate hostname status
         hostnames_config = Config("Hostnames")
@@ -126,10 +124,14 @@ def get_api(shared_state_dict, shared_state_lock):
         # Status bars
         status_bars = f"""
             <div class="status-bar">
-                <span class="status-pill {"success" if jd_connected else "error"}">
-                    {"✅" if jd_connected else "❌"} JDownloader {"connected" if jd_connected else "disconnected"}
+                <span class="status-pill {jd_status['status_class']}" 
+                      onclick="openJDownloaderModal()" 
+                      title="Click to configure JDownloader">
+                    {jd_status['status_text']}
                 </span>
-                <span class="status-pill {hostname_status_class}">
+                <span class="status-pill {hostname_status_class}"
+                      onclick="location.href='/hostnames'"
+                      title="Click to configure Hostnames">
                     {hostname_status_emoji} {hostname_status_text}
                 </span>
             </div>
@@ -209,6 +211,11 @@ def get_api(shared_state_dict, shared_state_lock):
                 padding: 8px 16px;
                 border-radius: 0.5rem;
                 font-weight: 500;
+                transition: transform 0.1s ease;
+                cursor: pointer;
+            }}
+            .status-pill:hover {{
+                transform: scale(1.05);
             }}
             .status-pill.success {{
                 background: var(--status-success-bg, #e8f5e9);
@@ -367,15 +374,15 @@ def get_api(shared_state_dict, shared_state_lock):
             /* Dark mode */
             @media (prefers-color-scheme: dark) {{
                 :root {{
-                    --status-success-bg: #1b5e20;
-                    --status-success-color: #a5d6a7;
-                    --status-success-border: #2e7d32;
+                    --status-success-bg: #1c4532;
+                    --status-success-color: #68d391;
+                    --status-success-border: #276749;
                     --status-warning-bg: #3d3520;
                     --status-warning-color: #ffb74d;
                     --status-warning-border: #d69e2e;
-                    --status-error-bg: #b71c1c;
-                    --status-error-color: #ef9a9a;
-                    --status-error-border: #c62828;
+                    --status-error-bg: #3d2d2d;
+                    --status-error-color: #fc8181;
+                    --status-error-border: #c53030;
                     --alert-warning-bg: #3d3520;
                     --alert-warning-border: #d69e2e;
                     --card-bg: #2d3748;
@@ -478,6 +485,7 @@ def get_api(shared_state_dict, shared_state_lock):
                 );
             }}
         </script>
+        {jd_modal_script}
         """
         # Add logout link for form auth
         logout_html = '<a href="/logout">Logout</a>' if show_logout_link() else ""

{quasarr-2.4.11 → quasarr-2.6.0}/quasarr/api/arr/__init__.py

@@ -56,6 +56,16 @@ def parse_payload(payload_str):
 
 
 def setup_arr_routes(app):
+    def check_user_agent():
+        user_agent = request.headers.get("User-Agent") or ""
+        if not any(
+            tool in user_agent.lower() for tool in ["radarr", "sonarr", "lazylibrarian"]
+        ):
+            msg = f"Unsupported User-Agent: {user_agent}. Quasarr as a compatibility layer must be called by Radarr, Sonarr or LazyLibrarian directly."
+            info(msg)
+            abort(406, msg)
+        return user_agent
+
     @app.get("/download/")
     def fake_nzb_file():
         payload = request.query.payload
@@ -75,6 +85,7 @@ def setup_arr_routes(app):
     @app.post("/api")
     @require_api_key
     def download_fake_nzb_file():
+        request_from = check_user_agent()
         downloads = request.files.getall("name")
         nzo_ids = []  # naming structure for package IDs expected in newznab
 
@@ -97,7 +108,6 @@ def setup_arr_routes(app):
             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,
@@ -128,6 +138,8 @@ def setup_arr_routes(app):
     @app.get("/api/<mirror>")
     @require_api_key
     def quasarr_api(mirror=None):
+        request_from = check_user_agent()
+
         api_type = (
             "arr_download_client"
             if request.query.mode
@@ -198,7 +210,6 @@ def setup_arr_routes(app):
 
                     nzo_ids = []
                     info(f'Attempting download for "{parsed_payload["title"]}"')
-                    request_from = "lazylibrarian"
 
                     downloaded = download(
                         shared_state,
@@ -267,8 +278,6 @@ def setup_arr_routes(app):
                     )
 
                 mode = request.query.t
-                request_from = request.headers.get("User-Agent")
-
                 if mode == "caps":
                     info(f"Providing indexer capability information to {request_from}")
                     return """<?xml version="1.0" encoding="UTF-8"?>
@@ -352,10 +361,10 @@ def setup_arr_routes(app):
                                     mirror=mirror,
                                 )
                             else:
-                                info(
+                                # sonarr expects this but we will not support non-imdbid searches
+                                debug(
                                     f"Ignoring search request from {request_from} - only imdbid searches are supported"
                                 )
-                                releases = []  # sonarr expects this but we will not support non-imdbid searches
 
                     items = ""
                     for release in releases:

{quasarr-2.4.11 → quasarr-2.6.0}/quasarr/api/captcha/__init__.py

@@ -11,6 +11,7 @@ import requests
 from bottle import HTTPResponse, redirect, request, response
 
 import quasarr.providers.html_images as images
+from quasarr.api.jdownloader import get_jdownloader_disconnected_page
 from quasarr.downloads.linkcrypters.filecrypt import DLC, get_filecrypt_links
 from quasarr.downloads.packages import delete_package
 from quasarr.providers import obfuscated, shared_state
@@ -46,15 +47,7 @@ def setup_captcha_routes(app):
         except KeyError:
             device = None
         if not device:
-            return render_centered_html(f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-            <div class="status-bar">
-                <span class="status-pill error">
-                    ❌ JDownloader disconnected
-                </span>
-            </div>
-            <p>
-                {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-            </p>''')
+            return get_jdownloader_disconnected_page(shared_state)
 
         protected = shared_state.get_db("protected").retrieve_all_titles()
         if not protected: