quasarr 2.4.11__py3-none-any.whl → 2.6.0__py3-none-any.whl

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/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/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/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:

quasarr/api/config/__init__.py

@@ -3,28 +3,27 @@
 # Project by https://github.com/rix1337
 
 import os
-import re
 import signal
 import threading
 import time
-from urllib.parse import urlparse
 
-import requests
 from bottle import request, response
 
-from quasarr.providers.html_templates import render_button, render_fail, render_form
+from quasarr.providers.html_templates import render_button, render_form
 from quasarr.providers.log import info
-from quasarr.providers.shared_state import extract_valid_hostname
-from quasarr.providers.utils import (
-    check_flaresolverr,
-    extract_allowed_keys,
-    extract_kv_pairs,
-)
 from quasarr.storage.config import Config
 from quasarr.storage.setup import (
+    check_credentials,
+    clear_skip_login,
+    delete_skip_flaresolverr_preference,
+    get_flaresolverr_status_data,
+    get_skip_login,
     hostname_form_html,
-    render_reconnect_success,
+    import_hostnames_from_url,
+    save_flaresolverr_url,
     save_hostnames,
+    save_jdownloader_settings,
+    verify_jdownloader_credentials,
 )
 from quasarr.storage.sqlite_database import DataBase
 
@@ -50,7 +49,6 @@ def setup_config(app, shared_state):
             hostname_form_html(
                 shared_state,
                 message,
-                show_restart_button=True,
                 show_skip_management=True,
             )
             + back_button,
@@ -60,97 +58,21 @@ def setup_config(app, shared_state):
     def hostnames_api():
         return save_hostnames(shared_state, timeout=1, first_run=False)
 
-    @app.post("/api/hostnames/import-url")
-    def import_hostnames_from_url():
-        """Fetch URL and parse hostnames, return JSON for JS to populate fields."""
-        response.content_type = "application/json"
-        try:
-            data = request.json
-            url = data.get("url", "").strip()
-
-            if not url:
-                return {"success": False, "error": "No URL provided"}
-
-            # Validate URL
-            parsed = urlparse(url)
-            if parsed.scheme not in ("http", "https") or not parsed.netloc:
-                return {"success": False, "error": "Invalid URL format"}
-
-            # Fetch content
-            try:
-                resp = requests.get(url, timeout=15)
-                resp.raise_for_status()
-                content = resp.text
-            except requests.RequestException as e:
-                info(f"Failed to fetch hostnames URL: {e}")
-                return {
-                    "success": False,
-                    "error": "Failed to fetch URL. Check the console log for details.",
-                }
-
-            # Parse hostnames
-            allowed_keys = extract_allowed_keys(Config._DEFAULT_CONFIG, "Hostnames")
-            results = extract_kv_pairs(content, allowed_keys)
-
-            if not results:
-                return {
-                    "success": False,
-                    "error": "No hostnames found in the provided URL",
-                }
+    @app.post("/api/hostnames/check-credentials/<shorthand>")
+    def check_credentials_api(shorthand):
+        return check_credentials(shared_state, shorthand)
 
-            # Validate each hostname
-            valid_hostnames = {}
-            invalid_hostnames = {}
-            for shorthand, hostname in results.items():
-                domain_check = extract_valid_hostname(hostname, shorthand)
-                domain = domain_check.get("domain")
-                if domain:
-                    valid_hostnames[shorthand] = domain
-                else:
-                    invalid_hostnames[shorthand] = domain_check.get(
-                        "message", "Invalid"
-                    )
-
-            if not valid_hostnames:
-                return {
-                    "success": False,
-                    "error": "No valid hostnames found in the provided URL",
-                }
-
-            return {
-                "success": True,
-                "hostnames": valid_hostnames,
-                "errors": invalid_hostnames,
-            }
-
-        except Exception as e:
-            return {"success": False, "error": f"Error: {str(e)}"}
+    @app.post("/api/hostnames/import-url")
+    def import_hostnames_route():
+        return import_hostnames_from_url()
 
     @app.get("/api/skip-login")
-    def get_skip_login():
-        """Return list of hostnames with skipped login."""
-        response.content_type = "application/json"
-        skip_db = DataBase("skip_login")
-        login_required_sites = ["al", "dd", "dl", "nx"]
-        skipped = []
-        for site in login_required_sites:
-            if skip_db.retrieve(site):
-                skipped.append(site)
-        return {"skipped": skipped}
+    def get_skip_login_route():
+        return get_skip_login()
 
     @app.delete("/api/skip-login/<shorthand>")
-    def clear_skip_login(shorthand):
-        """Clear skip login preference for a hostname."""
-        response.content_type = "application/json"
-        shorthand = shorthand.lower()
-        login_required_sites = ["al", "dd", "dl", "nx"]
-        if shorthand not in login_required_sites:
-            return {"success": False, "error": f"Invalid shorthand: {shorthand}"}
-
-        skip_db = DataBase("skip_login")
-        skip_db.delete(shorthand)
-        info(f'Skip login preference cleared for "{shorthand.upper()}"')
-        return {"success": True}
+    def clear_skip_login_route(shorthand):
+        return clear_skip_login(shorthand)
 
     @app.get("/flaresolverr")
     def flaresolverr_ui():
@@ -183,12 +105,6 @@ def setup_config(app, shared_state):
             {form_content}
             {render_button("Save", "primary", {"type": "submit", "id": "submitBtn"})}
         </form>
-        <p style="font-size:0.875rem; color:var(--secondary, #6c757d); margin-top:1rem;">
-            A restart is recommended after configuring FlareSolverr.
-        </p>
-        <div class="section-divider" style="margin-top:1.5rem; padding-top:1rem; border-top:1px solid var(--divider-color, #dee2e6);">
-            {render_button("Restart Quasarr", "secondary", {"type": "button", "onclick": "confirmRestart()"})}
-        </div>
         <p>{render_button("Back", "secondary", {"onclick": "location.href='/';"})}</p>
         <script>
         var formSubmitted = false;
@@ -278,78 +194,17 @@ def setup_config(app, shared_state):
     @app.post("/api/flaresolverr")
     def set_flaresolverr_url():
         """Save FlareSolverr URL from web UI."""
-        url = request.forms.get("url", "").strip()
-        config = Config("FlareSolverr")
-
-        if not url:
-            return render_fail("Please provide a FlareSolverr URL.")
-
-        if not url.startswith("http://") and not url.startswith("https://"):
-            url = "http://" + url
-
-        # Validate URL format
-        if not re.search(r"/v\d+$", url):
-            return render_fail(
-                "FlareSolverr URL must end with /v1 (or similar version path)."
-            )
-
-        try:
-            headers = {"Content-Type": "application/json"}
-            data = {
-                "cmd": "request.get",
-                "url": "http://www.google.com/",
-                "maxTimeout": 30000,
-            }
-            resp = requests.post(url, headers=headers, json=data, timeout=30)
-            if resp.status_code == 200:
-                json_data = resp.json()
-                if json_data.get("status") == "ok":
-                    config.save("url", url)
-                    # Clear skip preference since we now have a working URL
-                    DataBase("skip_flaresolverr").delete("skipped")
-                    # Update user agent from FlareSolverr response
-                    solution = json_data.get("solution", {})
-                    solution_ua = solution.get("userAgent")
-                    if solution_ua:
-                        shared_state.update("user_agent", solution_ua)
-                    info(f'FlareSolverr URL configured: "{url}"')
-                    return render_reconnect_success(
-                        "FlareSolverr URL saved successfully! A restart is recommended."
-                    )
-                else:
-                    return render_fail(
-                        f"FlareSolverr returned unexpected status: {json_data.get('status')}"
-                    )
-        except requests.RequestException:
-            return render_fail("Could not reach FlareSolverr!")
-
-        return render_fail(
-            "Could not reach FlareSolverr at that URL (expected HTTP 200)."
-        )
+        return save_flaresolverr_url(shared_state)
 
     @app.get("/api/flaresolverr/status")
     def get_flaresolverr_status():
         """Return FlareSolverr configuration status."""
-        response.content_type = "application/json"
-        skip_db = DataBase("skip_flaresolverr")
-        is_skipped = bool(skip_db.retrieve("skipped"))
-        current_url = Config("FlareSolverr").get("url") or ""
-
-        # Test connection if URL is set
-        is_working = False
-        if current_url and not is_skipped:
-            is_working = check_flaresolverr(shared_state, current_url)
-
-        return {"skipped": is_skipped, "url": current_url, "working": is_working}
+        return get_flaresolverr_status_data(shared_state)
 
     @app.delete("/api/skip-flaresolverr")
     def clear_skip_flaresolverr():
         """Clear skip FlareSolverr preference."""
-        response.content_type = "application/json"
-        skip_db = DataBase("skip_flaresolverr")
-        skip_db.delete("skipped")
-        info("Skip FlareSolverr preference cleared")
-        return {"success": True}
+        return delete_skip_flaresolverr_preference()
 
     @app.post("/api/restart")
     def restart_quasarr():
@@ -364,3 +219,11 @@ def setup_config(app, shared_state):
 
         threading.Thread(target=delayed_exit, daemon=True).start()
         return {"success": True, "message": "Restarting..."}
+
+    @app.post("/api/jdownloader/verify")
+    def verify_jdownloader_api():
+        return verify_jdownloader_credentials(shared_state)
+
+    @app.post("/api/jdownloader/save")
+    def save_jdownloader_api():
+        return save_jdownloader_settings(shared_state, is_setup=False)