quasarr 2.6.0__tar.gz → 2.6.1__tar.gz

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

@@ -299,6 +299,12 @@ jobs:
         run: |
           TAG="v.$VERSION"
           RELEASE_BODY=$(gh release view "$TAG" --json body --jq .body)
+          
+          # Truncate to 4000 characters to avoid Discord limits
+          if [ ${#RELEASE_BODY} -gt 4000 ]; then
+            RELEASE_BODY="${RELEASE_BODY:0:4000}..."
+          fi
+
           if [ -n "$DISCORD_WEBHOOK" ]; then
             jq -n --arg title "🚀 New Release: $TAG" --arg desc "$RELEASE_BODY" --arg url "https://github.com/$REPO/releases/tag/$TAG" '{content: null, embeds: [{title: $title, description: $desc, url: $url, color: 5763719}]}' > discord_payload.json
             curl -H "Content-Type: application/json" -d @discord_payload.json "$DISCORD_WEBHOOK"

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.6.0
+Version: 2.6.1
 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.6.0 → quasarr-2.6.1}/quasarr/api/__init__.py

@@ -124,10 +124,10 @@ def get_api(shared_state_dict, shared_state_lock):
         # Status bars
         status_bars = f"""
             <div class="status-bar">
-                <span class="status-pill {jd_status['status_class']}" 
+                <span class="status-pill {jd_status["status_class"]}" 
                       onclick="openJDownloaderModal()" 
                       title="Click to configure JDownloader">
-                    {jd_status['status_text']}
+                    {jd_status["status_text"]}
                 </span>
                 <span class="status-pill {hostname_status_class}"
                       onclick="location.href='/hostnames'"

{quasarr-2.6.0 → quasarr-2.6.1}/quasarr/api/config/__init__.py

@@ -7,7 +7,7 @@ import signal
 import threading
 import time
 
-from bottle import request, response
+from bottle import response
 
 from quasarr.providers.html_templates import render_button, render_form
 from quasarr.providers.log import info

{quasarr-2.6.0 → quasarr-2.6.1}/quasarr/api/jdownloader/__init__.py

@@ -16,9 +16,14 @@ def get_jdownloader_status(shared_state):
 
     jd_config = Config("JDownloader")
     jd_device = jd_config.get("device") or ""
-    
+
     dev_name = jd_device if jd_device else "JDownloader"
-    dev_name_safe = dev_name.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace('"', "&quot;")
+    dev_name_safe = (
+        dev_name.replace("&", "&amp;")
+        .replace("<", "&lt;")
+        .replace(">", "&gt;")
+        .replace('"', "&quot;")
+    )
 
     if jd_connected:
         status_text = f"✅ {dev_name_safe} connected"
@@ -34,7 +39,7 @@ def get_jdownloader_status(shared_state):
         "connected": jd_connected,
         "device_name": jd_device,
         "status_text": status_text,
-        "status_class": status_class
+        "status_class": status_class,
     }
 
 
@@ -44,7 +49,7 @@ def get_jdownloader_modal_script():
     jd_user = jd_config.get("user") or ""
     jd_pass = jd_config.get("password") or ""
     jd_device = jd_config.get("device") or ""
-    
+
     jd_user_js = jd_user.replace("\\", "\\\\").replace("'", "\\'")
     jd_pass_js = jd_pass.replace("\\", "\\\\").replace("'", "\\'")
     jd_device_js = jd_device.replace("\\", "\\\\").replace("'", "\\'")
@@ -166,13 +171,13 @@ def get_jdownloader_modal_script():
 def get_jdownloader_status_pill(shared_state):
     """Return the HTML for the JDownloader status pill."""
     status = get_jdownloader_status(shared_state)
-    
+
     return f"""
-        <span class="status-pill {status['status_class']}" 
+        <span class="status-pill {status["status_class"]}" 
               onclick="openJDownloaderModal()" 
               style="cursor: pointer;"
               title="Click to configure JDownloader">
-            {status['status_text']}
+            {status["status_text"]}
         </span>
     """
 
@@ -181,12 +186,14 @@ def get_jdownloader_disconnected_page(shared_state, back_url="/"):
     """Return a full error page when JDownloader is disconnected."""
     import quasarr.providers.html_images as images
     from quasarr.providers.html_templates import render_centered_html
-    
+
     status_pill = get_jdownloader_status_pill(shared_state)
     modal_script = get_jdownloader_modal_script()
-    
-    back_btn = render_button("Back", "secondary", {"onclick": f"location.href='{back_url}'"})
-    
+
+    back_btn = render_button(
+        "Back", "secondary", {"onclick": f"location.href='{back_url}'"}
+    )
+
     content = f'''
         <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
         <div class="status-bar">
@@ -228,5 +235,5 @@ def get_jdownloader_disconnected_page(shared_state, back_url="/"):
         </style>
         {modal_script}
     '''
-    
+
     return render_centered_html(content)

quasarr-2.6.1/quasarr/downloads/sources/wd.py

@@ -0,0 +1,169 @@
+# -*- coding: utf-8 -*-
+# Quasarr
+# Project by https://github.com/rix1337
+
+import re
+import uuid
+from urllib.parse import urljoin
+
+from bs4 import BeautifulSoup
+
+from quasarr.providers.cloudflare import (
+    flaresolverr_create_session,
+    flaresolverr_destroy_session,
+    flaresolverr_get,
+    is_cloudflare_challenge,
+)
+from quasarr.providers.hostname_issues import mark_hostname_issue
+from quasarr.providers.log import debug, info
+from quasarr.providers.utils import is_flaresolverr_available
+
+hostname = "wd"
+
+
+def resolve_wd_redirect(shared_state, url, session_id=None):
+    """
+    Follow redirects for a WD mirror URL and return the final destination.
+    """
+    try:
+        # Use FlareSolverr to follow redirects as well, since the redirector might be protected
+        r = flaresolverr_get(shared_state, url, session_id=session_id)
+
+        # FlareSolverr follows redirects automatically and returns the final URL
+        if r.status_code == 200:
+            # Check if we landed on a 404 page (soft 404)
+            if r.url.endswith("/404.html"):
+                return None
+            return r.url
+        else:
+            info(f"WD blocked attempt to resolve {url}. Status: {r.status_code}")
+    except Exception as e:
+        info(f"Error fetching redirected URL for {url}: {e}")
+        mark_hostname_issue(
+            hostname, "download", str(e) if "e" in dir() else "Download error"
+        )
+    return None
+
+
+def get_wd_download_links(shared_state, url, mirror, title, password):
+    """
+    KEEP THE SIGNATURE EVEN IF SOME PARAMETERS ARE UNUSED!
+
+    WD source handler - resolves redirects and returns protected download links.
+    """
+
+    wd = shared_state.values["config"]("Hostnames").get("wd")
+
+    if not is_flaresolverr_available(shared_state):
+        info(
+            "WD is protected by Cloudflare but FlareSolverr is not configured. "
+            "Please configure FlareSolverr in the web UI to access this site."
+        )
+        mark_hostname_issue(hostname, "download", "FlareSolverr required but missing.")
+        return {"links": [], "imdb_id": None}
+
+    # Create a temporary FlareSolverr session for this download attempt
+    session_id = str(uuid.uuid4())
+    created_session = flaresolverr_create_session(shared_state, session_id)
+    if not created_session:
+        info("Could not create FlareSolverr session. Proceeding without session...")
+        session_id = None
+    else:
+        debug(f"Created FlareSolverr session: {session_id}")
+
+    try:
+        r = flaresolverr_get(shared_state, url, session_id=session_id)
+        if r.status_code == 403 or is_cloudflare_challenge(r.text):
+            info("Could not bypass Cloudflare protection with FlareSolverr!")
+            mark_hostname_issue(hostname, "download", "Cloudflare challenge failed")
+            return {"links": [], "imdb_id": None}
+
+        if r.status_code >= 400:
+            mark_hostname_issue(
+                hostname, "download", f"Download error: {str(r.status_code)}"
+            )
+
+        soup = BeautifulSoup(r.text, "html.parser")
+
+        # extract IMDb id if present
+        imdb_id = None
+        a_imdb = soup.find("a", href=re.compile(r"imdb\.com/title/tt\d+"))
+        if a_imdb:
+            m = re.search(r"(tt\d+)", a_imdb["href"])
+            if m:
+                imdb_id = m.group(1)
+                debug(f"Found IMDb id: {imdb_id}")
+
+        # find Downloads card
+        header = soup.find(
+            "div",
+            class_="card-header",
+            string=re.compile(r"^\s*Downloads\s*$", re.IGNORECASE),
+        )
+        if not header:
+            info(
+                f"WD Downloads section not found. Grabbing download links for {title} not possible!"
+            )
+            return {"links": [], "imdb_id": None}
+
+        card = header.find_parent("div", class_="card")
+        body = card.find("div", class_="card-body")
+        link_tags = body.find_all(
+            "a", href=True, class_=lambda c: c and "background-" in c
+        )
+
+        results = []
+        try:
+            for a in link_tags:
+                raw_href = a["href"]
+                full_link = urljoin(f"https://{wd}", raw_href)
+
+                # resolve any redirects using the same session
+                resolved = resolve_wd_redirect(
+                    shared_state, full_link, session_id=session_id
+                )
+
+                if resolved:
+                    if resolved.endswith("/404.html"):
+                        info(f"Link {resolved} is dead!")
+                        continue
+
+                    # determine hoster
+                    hoster = a.get_text(strip=True) or None
+                    if not hoster:
+                        for cls in a.get("class", []):
+                            if cls.startswith("background-"):
+                                hoster = cls.split("-", 1)[1]
+                                break
+
+                    if mirror and mirror.lower() not in hoster.lower():
+                        debug(
+                            f'Skipping link from "{hoster}" (not the desired mirror "{mirror}")!'
+                        )
+                        continue
+
+                    results.append([resolved, hoster])
+        except Exception as e:
+            info(
+                f"WD site has been updated. Parsing download links for {title} not possible! Error: {e}"
+            )
+
+        return {
+            "links": results,
+            "imdb_id": imdb_id,
+        }
+
+    except RuntimeError as e:
+        # Catch FlareSolverr not configured error
+        info(f"WD access failed: {e}")
+        return {"links": [], "imdb_id": None}
+    except Exception as e:
+        info(
+            f"WD site has been updated. Grabbing download links for {title} not possible! Error: {e}"
+        )
+        return {"links": [], "imdb_id": None}
+    finally:
+        # Always destroy the session
+        if session_id:
+            debug(f"Destroying FlareSolverr session: {session_id}")
+            flaresolverr_destroy_session(shared_state, session_id)

{quasarr-2.6.0 → quasarr-2.6.1}/quasarr/providers/cloudflare.py

@@ -168,7 +168,7 @@ class FlareSolverrResponse:
             raise requests.HTTPError(f"{self.status_code} Error at {self.url}")
 
 
-def flaresolverr_get(shared_state, url, timeout=60):
+def flaresolverr_get(shared_state, url, timeout=60, session_id=None):
     """
     Core function for performing a GET request via FlareSolverr only.
     Used internally by FlareSolverrSession.get()
@@ -186,6 +186,8 @@ def flaresolverr_get(shared_state, url, timeout=60):
         raise RuntimeError("FlareSolverr URL not configured in shared_state.")
 
     payload = {"cmd": "request.get", "url": url, "maxTimeout": timeout * 1000}
+    if session_id:
+        payload["session"] = session_id
 
     try:
         resp = requests.post(
@@ -219,3 +221,46 @@ def flaresolverr_get(shared_state, url, timeout=60):
     return FlareSolverrResponse(
         url=url, status_code=status_code, headers=fs_headers, text=html
     )
+
+
+def flaresolverr_create_session(shared_state, session_id=None):
+    if not is_flaresolverr_available(shared_state):
+        return None
+
+    flaresolverr_url = shared_state.values["config"]("FlareSolverr").get("url")
+    payload = {"cmd": "sessions.create"}
+    if session_id:
+        payload["session"] = session_id
+
+    try:
+        resp = requests.post(
+            flaresolverr_url,
+            json=payload,
+            headers={"Content-Type": "application/json"},
+            timeout=10,
+        )
+        resp.raise_for_status()
+        data = resp.json()
+        if data.get("status") == "ok":
+            return data.get("session")
+    except Exception:
+        pass
+    return None
+
+
+def flaresolverr_destroy_session(shared_state, session_id):
+    if not is_flaresolverr_available(shared_state):
+        return
+
+    flaresolverr_url = shared_state.values["config"]("FlareSolverr").get("url")
+    payload = {"cmd": "sessions.destroy", "session": session_id}
+
+    try:
+        requests.post(
+            flaresolverr_url,
+            json=payload,
+            headers={"Content-Type": "application/json"},
+            timeout=10,
+        )
+    except Exception:
+        pass

{quasarr-2.6.0 → quasarr-2.6.1}/quasarr/providers/version.py

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

{quasarr-2.6.0 → quasarr-2.6.1}/quasarr/search/sources/wd.py

@@ -9,12 +9,13 @@ from base64 import urlsafe_b64encode
 from datetime import datetime, timedelta
 from urllib.parse import quote, quote_plus
 
-import requests
 from bs4 import BeautifulSoup
 
+from quasarr.providers.cloudflare import flaresolverr_get, is_cloudflare_challenge
 from quasarr.providers.hostname_issues import clear_hostname_issue, mark_hostname_issue
 from quasarr.providers.imdb_metadata import get_localized_title, get_year
 from quasarr.providers.log import debug, info
+from quasarr.providers.utils import is_flaresolverr_available
 
 hostname = "wd"
 supported_mirrors = ["rapidgator", "ddownload", "katfile", "fikper", "turbobit"]
@@ -170,9 +171,21 @@ def wd_feed(shared_state, start_time, request_from, mirror=None):
         feed_type = "Serien"
 
     url = f"https://{wd}/{feed_type}"
-    headers = {"User-Agent": shared_state.values["user_agent"]}
+
+    if not is_flaresolverr_available(shared_state):
+        info(
+            f"FlareSolverr is not configured. Cannot access {hostname.upper()} feed due to Cloudflare protection."
+        )
+        mark_hostname_issue(hostname, "feed", "FlareSolverr missing")
+        return []
+
     try:
-        r = requests.get(url, headers=headers, timeout=10)
+        r = flaresolverr_get(shared_state, url)
+        if r.status_code == 403 or is_cloudflare_challenge(r.text):
+            info(f"Cloudflare challenge failed for {hostname} feed.")
+            mark_hostname_issue(hostname, "feed", "Cloudflare challenge failed")
+            return []
+
         r.raise_for_status()
         soup = BeautifulSoup(r.content, "html.parser")
         releases = _parse_rows(soup, shared_state, wd, password, mirror)
@@ -215,10 +228,21 @@ def wd_search(
 
     q = quote_plus(search_string)
     url = f"https://{wd}/search?q={q}"
-    headers = {"User-Agent": shared_state.values["user_agent"]}
+
+    if not is_flaresolverr_available(shared_state):
+        info(
+            f"FlareSolverr is not configured. Cannot access {hostname.upper()} search due to Cloudflare protection."
+        )
+        mark_hostname_issue(hostname, "search", "FlareSolverr missing")
+        return []
 
     try:
-        r = requests.get(url, headers=headers, timeout=10)
+        r = flaresolverr_get(shared_state, url)
+        if r.status_code == 403 or is_cloudflare_challenge(r.text):
+            info(f"Cloudflare challenge failed for {hostname} search.")
+            mark_hostname_issue(hostname, "search", "Cloudflare challenge failed")
+            return []
+
         r.raise_for_status()
         soup = BeautifulSoup(r.content, "html.parser")
         releases = _parse_rows(

{quasarr-2.6.0 → quasarr-2.6.1}/quasarr/storage/setup.py

@@ -1446,7 +1446,10 @@ def verify_jdownloader_credentials(shared_state):
         if device_names:
             return {"success": True, "devices": device_names}
         else:
-            return {"success": False, "message": "No devices found or invalid credentials"}
+            return {
+                "success": False,
+                "message": "No devices found or invalid credentials",
+            }
     except Exception as e:
         return {"success": False, "message": str(e)}
 
@@ -1470,19 +1473,25 @@ def save_jdownloader_settings(shared_state, is_setup=False):
             config.save("user", username)
             config.save("password", password)
             config.save("device", device)
-            
+
             if is_setup:
                 quasarr.providers.web_server.temp_server_success = True
                 return render_reconnect_success("Credentials set")
             else:
                 response.content_type = "application/json"
-                return {"success": True, "message": "JDownloader configured successfully"}
+                return {
+                    "success": True,
+                    "message": "JDownloader configured successfully",
+                }
         else:
             if is_setup:
                 return render_fail("Could not connect to selected device!")
             else:
                 response.content_type = "application/json"
-                return {"success": False, "message": "Could not connect to selected device"}
+                return {
+                    "success": False,
+                    "message": "Could not connect to selected device",
+                }
 
     if is_setup:
         return render_fail("Could not set credentials!")

quasarr-2.6.0/quasarr/downloads/sources/wd.py

@@ -1,155 +0,0 @@
-# -*- coding: utf-8 -*-
-# Quasarr
-# Project by https://github.com/rix1337
-
-import re
-from urllib.parse import urljoin
-
-import requests
-from bs4 import BeautifulSoup
-
-from quasarr.providers.cloudflare import flaresolverr_get, is_cloudflare_challenge
-from quasarr.providers.hostname_issues import mark_hostname_issue
-from quasarr.providers.log import debug, info
-from quasarr.providers.utils import is_flaresolverr_available
-
-hostname = "wd"
-
-
-def resolve_wd_redirect(url, user_agent):
-    """
-    Follow redirects for a WD mirror URL and return the final destination.
-    """
-    try:
-        r = requests.get(
-            url,
-            allow_redirects=True,
-            timeout=10,
-            headers={"User-Agent": user_agent},
-        )
-        r.raise_for_status()
-        if r.history:
-            for resp in r.history:
-                debug(f"Redirected from {resp.url} to {r.url}")
-            return r.url
-        else:
-            info(
-                f"WD blocked attempt to resolve {url}. Your IP may be banned. Try again later."
-            )
-    except Exception as e:
-        info(f"Error fetching redirected URL for {url}: {e}")
-        mark_hostname_issue(
-            hostname, "download", str(e) if "e" in dir() else "Download error"
-        )
-    return None
-
-
-def get_wd_download_links(shared_state, url, mirror, title, password):
-    """
-    KEEP THE SIGNATURE EVEN IF SOME PARAMETERS ARE UNUSED!
-
-    WD source handler - resolves redirects and returns protected download links.
-    """
-
-    wd = shared_state.values["config"]("Hostnames").get("wd")
-    user_agent = shared_state.values["user_agent"]
-
-    try:
-        r = requests.get(url)
-        if r.status_code >= 400 or is_cloudflare_challenge(r.text):
-            if is_flaresolverr_available(shared_state):
-                info(
-                    "WD is protected by Cloudflare. Using FlareSolverr to bypass protection."
-                )
-                r = flaresolverr_get(shared_state, url)
-            else:
-                info(
-                    "WD is protected by Cloudflare but FlareSolverr is not configured. "
-                    "Please configure FlareSolverr in the web UI to access this site."
-                )
-                mark_hostname_issue(
-                    hostname, "download", "FlareSolverr required but missing."
-                )
-                return {"links": [], "imdb_id": None}
-
-        if r.status_code >= 400:
-            mark_hostname_issue(
-                hostname, "download", f"Download error: {str(r.status_code)}"
-            )
-
-        soup = BeautifulSoup(r.text, "html.parser")
-
-        # extract IMDb id if present
-        imdb_id = None
-        a_imdb = soup.find("a", href=re.compile(r"imdb\.com/title/tt\d+"))
-        if a_imdb:
-            m = re.search(r"(tt\d+)", a_imdb["href"])
-            if m:
-                imdb_id = m.group(1)
-                debug(f"Found IMDb id: {imdb_id}")
-
-        # find Downloads card
-        header = soup.find(
-            "div",
-            class_="card-header",
-            string=re.compile(r"^\s*Downloads\s*$", re.IGNORECASE),
-        )
-        if not header:
-            info(
-                f"WD Downloads section not found. Grabbing download links for {title} not possible!"
-            )
-            return {"links": [], "imdb_id": None}
-
-        card = header.find_parent("div", class_="card")
-        body = card.find("div", class_="card-body")
-        link_tags = body.find_all(
-            "a", href=True, class_=lambda c: c and "background-" in c
-        )
-    except RuntimeError as e:
-        # Catch FlareSolverr not configured error
-        info(f"WD access failed: {e}")
-        return {"links": [], "imdb_id": None}
-    except Exception:
-        info(
-            f"WD site has been updated. Grabbing download links for {title} not possible!"
-        )
-        return {"links": [], "imdb_id": None}
-
-    results = []
-    try:
-        for a in link_tags:
-            raw_href = a["href"]
-            full_link = urljoin(f"https://{wd}", raw_href)
-
-            # resolve any redirects
-            resolved = resolve_wd_redirect(full_link, user_agent)
-
-            if resolved:
-                if resolved.endswith("/404.html"):
-                    info(f"Link {resolved} is dead!")
-                    continue
-
-                # determine hoster
-                hoster = a.get_text(strip=True) or None
-                if not hoster:
-                    for cls in a.get("class", []):
-                        if cls.startswith("background-"):
-                            hoster = cls.split("-", 1)[1]
-                            break
-
-                if mirror and mirror.lower() not in hoster.lower():
-                    debug(
-                        f'Skipping link from "{hoster}" (not the desired mirror "{mirror}")!'
-                    )
-                    continue
-
-                results.append([resolved, hoster])
-    except Exception:
-        info(
-            f"WD site has been updated. Parsing download links for {title} not possible!"
-        )
-
-    return {
-        "links": results,
-        "imdb_id": imdb_id,
-    }