quasarr 2.4.11__tar.gz → 2.5.0__tar.gz

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

@@ -57,6 +57,7 @@ jobs:
     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,8 +69,10 @@ 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 ]
@@ -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,7 +187,7 @@ 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 }}
@@ -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.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.4.11
+Version: 2.5.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.5.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.5.0}/quasarr/api/__init__.py

@@ -367,15 +367,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;

{quasarr-2.4.11 → quasarr-2.5.0}/quasarr/api/config/__init__.py

@@ -3,27 +3,24 @@
 # 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 bottle import 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,
 )
 from quasarr.storage.sqlite_database import DataBase
@@ -50,7 +47,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 +56,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 +103,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 +192,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():

{quasarr-2.4.11 → quasarr-2.5.0}/quasarr/providers/version.py

@@ -5,7 +5,7 @@
 import re
 import sys
 
-__version__ = "2.4.11"
+__version__ = "2.5.0"
 
 
 def get_version():