quasarr 2.6.1__py3-none-any.whl → 2.7.1__py3-none-any.whl

quasarr/downloads/sources/wd.py

@@ -6,6 +6,7 @@ import re
 import uuid
 from urllib.parse import urljoin
 
+import requests
 from bs4 import BeautifulSoup
 
 from quasarr.providers.cloudflare import (
@@ -25,18 +26,45 @@ def resolve_wd_redirect(shared_state, url, session_id=None):
     """
     Follow redirects for a WD mirror URL and return the final destination.
     """
+    # Try FlareSolverr first if available and session_id is provided
+    if session_id and is_flaresolverr_available(shared_state):
+        try:
+            r = flaresolverr_get(shared_state, url, session_id=session_id)
+            if r.status_code == 200:
+                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"FlareSolverr error fetching redirected URL for {url}: {e}")
+            # Fallback to requests if FlareSolverr fails?
+            # For now, let's assume if FS is configured we should rely on it or fail.
+            # But the user asked to reconsider "without cloudflare".
+
+    # Fallback to regular requests if FlareSolverr not used or failed/not configured
     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
+        user_agent = shared_state.values["user_agent"]
+        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}. Status: {r.status_code}")
+            # If no history, maybe it wasn't a redirect or it blocked us?
+            # WD usually redirects. If we get 200 OK but same URL, it might be a block page or direct link?
+            # The original code assumed if no history -> blocked.
+            # But if it's a direct link, history is empty.
+            # Let's trust the original logic: "WD blocked attempt..."
+            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(
@@ -54,36 +82,68 @@ def get_wd_download_links(shared_state, url, mirror, title, password):
 
     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 normal request first
+    text = None
+    status_code = None
+    session_id = None
 
     try:
-        r = flaresolverr_get(shared_state, url, session_id=session_id)
+        headers = {"User-Agent": shared_state.values["user_agent"]}
+        r = requests.get(url, headers=headers, timeout=10)
+        # Don't raise for status yet, check for 403/challenge
         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")
+            raise requests.RequestException("Cloudflare protection detected")
+        r.raise_for_status()
+        text = r.text
+        status_code = r.status_code
+    except Exception as e:
+        # If blocked or failed, try FlareSolverr
+        if is_flaresolverr_available(shared_state):
+            debug(
+                f"Encountered Cloudflare on {hostname} download. Trying FlareSolverr..."
+            )
+            # 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"
+                    )
+                    if session_id:
+                        flaresolverr_destroy_session(shared_state, session_id)
+                    return {"links": [], "imdb_id": None}
+                text = r.text
+                status_code = r.status_code
+            except RuntimeError as fs_err:
+                info(f"WD access failed via FlareSolverr: {fs_err}")
+                if session_id:
+                    flaresolverr_destroy_session(shared_state, session_id)
+                return {"links": [], "imdb_id": None}
+        else:
+            info(
+                f"WD site has been updated or is protected. Grabbing download links for {title} not possible! ({e})"
+            )
+            mark_hostname_issue(hostname, "download", str(e))
             return {"links": [], "imdb_id": None}
 
-        if r.status_code >= 400:
+    try:
+        if status_code and status_code >= 400:
             mark_hostname_issue(
-                hostname, "download", f"Download error: {str(r.status_code)}"
+                hostname, "download", f"Download error: {str(status_code)}"
             )
 
-        soup = BeautifulSoup(r.text, "html.parser")
+        soup = BeautifulSoup(text, "html.parser")
 
         # extract IMDb id if present
         imdb_id = None
@@ -118,7 +178,7 @@ def get_wd_download_links(shared_state, url, mirror, title, password):
                 raw_href = a["href"]
                 full_link = urljoin(f"https://{wd}", raw_href)
 
-                # resolve any redirects using the same session
+                # resolve any redirects using the same session (or requests if no session)
                 resolved = resolve_wd_redirect(
                     shared_state, full_link, session_id=session_id
                 )
@@ -153,17 +213,13 @@ def get_wd_download_links(shared_state, url, mirror, title, password):
             "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
+        # Always destroy the session if we created one
         if session_id:
             debug(f"Destroying FlareSolverr session: {session_id}")
             flaresolverr_destroy_session(shared_state, session_id)

quasarr/downloads/sources/wx.py

@@ -39,7 +39,7 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
         # Extract slug from URL
         slug_match = re.search(r"/detail/([^/?]+)", url)
         if not slug_match:
-            info(f"{hostname.upper()}: Could not extract slug from URL: {url}")
+            info(f"Could not extract slug from URL: {url}")
             return {"links": []}
 
         api_url = f"https://api.{host}/start/d/{slug_match.group(1)}"
@@ -50,7 +50,7 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
             "Accept": "application/json",
         }
 
-        debug(f"{hostname.upper()}: Fetching API data from: {api_url}")
+        debug(f"Fetching API data from: {api_url}")
         api_r = session.get(api_url, headers=api_headers, timeout=30)
         api_r.raise_for_status()
 
@@ -58,7 +58,7 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
 
         # Navigate to releases in the API response
         if "item" not in data or "releases" not in data["item"]:
-            info(f"{hostname.upper()}: No releases found in API response")
+            info("No releases found in API response")
             return {"links": []}
 
         releases = data["item"]["releases"]
@@ -67,12 +67,10 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
         matching_releases = [r for r in releases if r.get("fulltitle") == title]
 
         if not matching_releases:
-            info(f"{hostname.upper()}: No release found matching title: {title}")
+            info(f"No release found matching title: {title}")
             return {"links": []}
 
-        debug(
-            f"{hostname.upper()}: Found {len(matching_releases)} mirror(s) for: {title}"
-        )
+        debug(f"Found {len(matching_releases)} mirror(s) for: {title}")
 
         # Evaluate each mirror and find the best one
         # Track: (online_count, is_hide, online_links)
@@ -105,14 +103,12 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
                 hide_total = len(hide_links)
                 hide_online = len(online_hide)
 
-                debug(
-                    f"{hostname.upper()}: M{idx + 1} hide.cx: {hide_online}/{hide_total} online"
-                )
+                debug(f"M{idx + 1} hide.cx: {hide_online}/{hide_total} online")
 
                 # If all hide.cx links are online, use this mirror immediately
                 if hide_online == hide_total and hide_online > 0:
                     debug(
-                        f"{hostname.upper()}: M{idx + 1} is complete (all {hide_online} hide.cx links online), using this mirror"
+                        f"M{idx + 1} is complete (all {hide_online} hide.cx links online), using this mirror"
                     )
                     return {"links": online_hide}
 
@@ -124,9 +120,7 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
                 other_total = len(other_links)
                 other_online = len(online_other)
 
-                debug(
-                    f"{hostname.upper()}: M{idx + 1} other crypters: {other_online}/{other_total} online"
-                )
+                debug(f"M{idx + 1} other crypters: {other_online}/{other_total} online")
 
             # Determine best option for this mirror (prefer hide.cx on ties)
             mirror_links = None
@@ -163,15 +157,15 @@ def get_wx_download_links(shared_state, url, mirror, title, password):
         if best_mirror and best_mirror[2]:
             crypter_type = "hide.cx" if best_mirror[1] else "other crypter"
             debug(
-                f"{hostname.upper()}: No complete mirror, using best partial with {best_mirror[0]} online {crypter_type} link(s)"
+                f"No complete mirror, using best partial with {best_mirror[0]} online {crypter_type} link(s)"
             )
             return {"links": best_mirror[2]}
 
-        info(f"{hostname.upper()}: No online links found for: {title}")
+        info(f"No online links found for: {title}")
         return {"links": []}
 
     except Exception as e:
-        info(f"{hostname.upper()}: Error extracting download links from {url}: {e}")
+        info(f"Error extracting download links from {url}: {e}")
         mark_hostname_issue(
             hostname, "download", str(e) if "e" in dir() else "Download error"
         )

quasarr/providers/auth.py

@@ -278,35 +278,31 @@ def add_auth_routes(app):
             return _handle_logout()
 
 
-def add_auth_hook(app, whitelist_prefixes=[], whitelist_suffixes=[]):
+def add_auth_hook(app, whitelist=None):
     """Add authentication hook to a Bottle app.
 
     Args:
         app: Bottle application
-        whitelist_prefixes: List of path prefixes to skip auth (e.g., ['/api/', '/sponsors_helper/'])
+        whitelist: List of path prefixes or suffixes to skip auth
     """
-    if whitelist_prefixes is None:
-        whitelist_prefixes = []
+    if whitelist is None:
+        whitelist = []
 
     @app.hook("before_request")
     def auth_hook():
         if not is_auth_enabled():
             return
 
-        path = request.path
+        # Strip query parameters for path matching
+        path = request.path.split("?")[0]
 
         # Always allow login/logout
         if path in ["/login", "/logout"]:
             return
 
-        # Check whitelist prefixes
-        for prefix in whitelist_prefixes:
-            if path.startswith(prefix):
-                return
-
-        # Check whitelist suffixes:
-        for suffix in whitelist_suffixes:
-            if path.endswith(suffix):
+        # Check whitelist
+        for item in whitelist:
+            if path.startswith(item) or path.endswith(item):
                 return
 
         # Check authentication

quasarr/providers/cloudflare.py

@@ -5,6 +5,7 @@
 import requests
 from bs4 import BeautifulSoup
 
+from quasarr.providers.log import debug
 from quasarr.providers.utils import is_flaresolverr_available
 
 
@@ -73,7 +74,7 @@ def update_session_via_flaresolverr(
             "error": f"FlareSolverr request failed: {e}",
         }
     except Exception as e:
-        raise RuntimeError(f"Could not reach FlareSolverr: {e}")
+        raise RuntimeError(f"Could not reach FlareSolverr: {e}") from e
 
     fs_json = resp.json()
     if fs_json.get("status") != "ok" or "solution" not in fs_json:
@@ -116,7 +117,7 @@ def ensure_session_cf_bypassed(info, shared_state, session, url, headers):
             )
             return None, None, None
 
-        info(
+        debug(
             "Encountered Cloudflare protection. Solving challenge with FlareSolverr..."
         )
         flaresolverr_result = update_session_via_flaresolverr(
@@ -168,7 +169,7 @@ class FlareSolverrResponse:
             raise requests.HTTPError(f"{self.status_code} Error at {self.url}")
 
 
-def flaresolverr_get(shared_state, url, timeout=60, session_id=None):
+def flaresolverr_get(shared_state, url, timeout=30, session_id=None):
     """
     Core function for performing a GET request via FlareSolverr only.
     Used internally by FlareSolverrSession.get()
@@ -198,7 +199,7 @@ def flaresolverr_get(shared_state, url, timeout=60, session_id=None):
         )
         resp.raise_for_status()
     except Exception as e:
-        raise RuntimeError(f"Error communicating with FlareSolverr: {e}")
+        raise RuntimeError(f"Error communicating with FlareSolverr: {e}") from e
 
     data = resp.json()
 

quasarr/providers/imdb_metadata.py

@@ -207,8 +207,6 @@ class IMDbCDN:
                 return results
 
         except Exception as e:
-            from quasarr.providers.log import debug
-
             debug(f"IMDb CDN search failed: {e}")
 
         return []
@@ -238,7 +236,7 @@ class IMDbFlareSolverr:
                 flaresolverr_url,
                 json=post_data,
                 headers={"Content-Type": "application/json"},
-                timeout=60,
+                timeout=30,
             )
             if response.status_code == 200:
                 json_response = response.json()