quasarr 2.7.0__py3-none-any.whl → 2.7.2__py3-none-any.whl

quasarr/api/arr/__init__.py

@@ -2,7 +2,6 @@
 # Quasarr
 # Project by https://github.com/rix1337
 
-import time
 import traceback
 import xml.sax.saxutils as sax_utils
 from base64 import urlsafe_b64decode
@@ -16,7 +15,7 @@ from quasarr.downloads import download
 from quasarr.downloads.packages import delete_package, get_packages
 from quasarr.providers import shared_state
 from quasarr.providers.auth import require_api_key
-from quasarr.providers.log import debug, info
+from quasarr.providers.log import debug, error, info, warn
 from quasarr.providers.version import get_version
 from quasarr.search import get_search_results
 
@@ -304,38 +303,29 @@ def setup_arr_routes(app):
                                 </caps>"""
                 elif mode in ["movie", "tvsearch", "book", "search"]:
                     releases = []
-                    cache_key = None
 
                     try:
-                        offset = int(getattr(request.query, "offset", 0))
+                        offset = int(getattr(request.query, "offset", 0) or 0)
                     except (AttributeError, ValueError) as e:
                         debug(f"Error parsing offset parameter: {e}")
                         offset = 0
 
                     try:
-                        limit = int(getattr(request.query, "limit", 100))
+                        limit = int(getattr(request.query, "limit", 9999) or 9999)
                     except (AttributeError, ValueError) as e:
                         debug(f"Error parsing limit parameter: {e}")
-                        limit = 100
+                        limit = 1000
 
                     if mode == "movie":
                         # supported params: imdbid
                         imdb_id = getattr(request.query, "imdbid", "")
-
-                        if imdb_id != "":
-                            cache_key = f"{request_from}::{imdb_id}::${mirror}"
-
-                            if result := results_cache.get(cache_key, offset, limit):
-                                debug(
-                                    f"Returning offset {offset}, limit {limit} for {cache_key}"
-                                )
-                                return result
-
                         releases = get_search_results(
                             shared_state,
                             request_from,
                             imdb_id=imdb_id,
                             mirror=mirror,
+                            offset=offset,
+                            limit=limit,
                         )
 
                     elif mode == "tvsearch":
@@ -343,16 +333,6 @@ def setup_arr_routes(app):
                         imdb_id = getattr(request.query, "imdbid", "")
                         season = getattr(request.query, "season", None)
                         episode = getattr(request.query, "ep", None)
-
-                        if imdb_id != "":
-                            cache_key = f"{request_from}::{imdb_id}::${mirror}::{season}::{episode}"
-
-                            if result := results_cache.get(cache_key, offset, limit):
-                                debug(
-                                    f"Returning offset {offset}, limit {limit} for {cache_key}"
-                                )
-                                return result
-
                         releases = get_search_results(
                             shared_state,
                             request_from,
@@ -360,7 +340,10 @@ def setup_arr_routes(app):
                             mirror=mirror,
                             season=season,
                             episode=episode,
+                            offset=offset,
+                            limit=limit,
                         )
+
                     elif mode == "book":
                         author = getattr(request.query, "author", "")
                         title = getattr(request.query, "title", "")
@@ -370,6 +353,8 @@ def setup_arr_routes(app):
                             request_from,
                             search_phrase=search_phrase,
                             mirror=mirror,
+                            offset=offset,
+                            limit=limit,
                         )
 
                     elif mode == "search":
@@ -380,6 +365,8 @@ def setup_arr_routes(app):
                                 request_from,
                                 search_phrase=search_phrase,
                                 mirror=mirror,
+                                offset=offset,
+                                limit=limit,
                             )
                         else:
                             # sonarr expects this but we will not support non-imdbid searches
@@ -387,9 +374,8 @@ def setup_arr_routes(app):
                                 f"Ignoring search request from {request_from} - only imdbid searches are supported"
                             )
 
+                    # XML Generation (releases are already sliced)
                     items = ""
-                    items_amount = 0
-                    items_processed = 0
                     for release in releases:
                         release = release.get("details", {})
 
@@ -412,43 +398,6 @@ def setup_arr_routes(app):
                             <pubDate>{pub_date}</pubDate>
                             <enclosure url="{release.get("link", "")}" length="{release.get("size", 0)}" type="application/x-nzb" />
                         </item>'''
-                        items_amount += 1
-
-                        if cache_key and items_amount == limit:
-                            items_processed += items_amount
-                            debug(
-                                f"Processed {items_processed}/{len(releases)} releases"
-                            )
-                            results_cache.set(
-                                cache_key,
-                                f"""<?xml version="1.0" encoding="UTF-8"?>
-                                <rss>
-                                    <channel>
-                                        {items}
-                                    </channel>
-                                </rss>""",
-                                items_processed - items_amount,
-                                limit,
-                            )
-                            items = ""
-                            items_amount = 0
-
-                    if cache_key and items_amount > 0:
-                        items_processed += items_amount
-                        debug(f"Processed {items_processed}/{len(releases)} releases")
-                        results_cache.set(
-                            cache_key,
-                            f"""<?xml version="1.0" encoding="UTF-8"?>
-                                <rss>
-                                    <channel>
-                                        {items}
-                                    </channel>
-                                </rss>""",
-                            items_processed - items_amount,
-                            limit,
-                        )
-                        items = ""
-                        items_amount = 0
 
                     requires_placeholder_item = not getattr(
                         request.query, "imdbid", ""
@@ -464,13 +413,6 @@ def setup_arr_routes(app):
                             <enclosure url="https://github.com/rix1337/Quasarr" length="0" type="application/x-nzb" />
                         </item>"""
 
-                    if cache_key:
-                        if result := results_cache.get(cache_key, offset, limit):
-                            debug(
-                                f"Returning offset {offset}, limit {limit} for {cache_key}"
-                            )
-                            return result
-
                     return f"""<?xml version="1.0" encoding="UTF-8"?>
                                 <rss>
                                     <channel>
@@ -478,9 +420,8 @@ def setup_arr_routes(app):
                                     </channel>
                                 </rss>"""
             except Exception as e:
-                info(f"Error loading search results: {e}")
-                info(traceback.format_exc())
-            info(f"[ERROR] Unknown indexer request: {dict(request.query)}")
+                error(f"Error loading search results: {e} " + traceback.format_exc())
+            warn(f"Unknown indexer request: {dict(request.query)}")
             return """<?xml version="1.0" encoding="UTF-8"?>
                         <rss>
                             <channel>
@@ -490,41 +431,5 @@ def setup_arr_routes(app):
                             </channel>
                         </rss>"""
 
-        info(f"[ERROR] Unknown general request: {dict(request.query)}")
+        warn(f"[ERROR] Unknown general request: {dict(request.query)}")
         return {"error": True}
-
-
-class ResultsCache:
-    def __init__(self):
-        self.last_cleaned = time.time()
-        self.cache = {}
-
-    def clean(self, now):
-        if now - self.last_cleaned < 60:
-            return
-
-        keys_to_delete = [
-            key for key, (_, expiry) in self.cache.items() if now >= expiry
-        ]
-
-        for key in keys_to_delete:
-            del self.cache[key]
-
-        self.last_cleaned = now
-
-    def get(self, key, offset, limit):
-        key = key + f"::{offset}::{limit}"
-        value, expiry = self.cache.get(key, (None, 0))
-        if time.time() < expiry:
-            return value
-
-        return None
-
-    def set(self, key, value, offset, limit, ttl=300):
-        now = time.time()
-        key = key + f"::{offset}::{limit}"
-        self.cache[key] = (value, now + ttl)
-        self.clean(now)
-
-
-results_cache = ResultsCache()

quasarr/downloads/linkcrypters/al.py

@@ -254,7 +254,7 @@ def solve_captcha(
         method="POST",
         target_url=captcha_base,
         post_data={"cID": 0, "pC": identified_captcha_image, "rT": 2},
-        timeout=60,
+        timeout=30,
     )
 
     return {"response": result["text"], "captcha_id": identified_captcha_image}

quasarr/providers/cloudflare.py

@@ -169,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()

quasarr/providers/imdb_metadata.py

@@ -236,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()

quasarr/providers/shared_state.py

@@ -118,7 +118,7 @@ def extract_valid_hostname(url, shorthand):
         message = f"Error: {e}. Please provide a valid URL."
         domain = None
 
-    print(message)
+    debug(message)
     return {"domain": domain, "message": message}
 
 

quasarr/providers/version.py

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

quasarr/search/__init__.py

@@ -4,9 +4,11 @@
 
 import time
 from concurrent.futures import ThreadPoolExecutor, as_completed
+from datetime import timezone
+from email.utils import parsedate_to_datetime
 
 from quasarr.providers.imdb_metadata import get_imdb_metadata
-from quasarr.providers.log import debug, info
+from quasarr.providers.log import debug, info, trace
 from quasarr.search.sources.al import al_feed, al_search
 from quasarr.search.sources.by import by_feed, by_search
 from quasarr.search.sources.dd import dd_feed, dd_search
@@ -35,6 +37,8 @@ def get_search_results(
     mirror=None,
     season="",
     episode="",
+    offset=0,
+    limit=1000,
 ):
     if imdb_id and not imdb_id.startswith("tt"):
         imdb_id = f"tt{imdb_id}"
@@ -70,54 +74,54 @@ def get_search_results(
 
     # Mappings
     imdb_map = [
-        (al, al_search),
-        (by, by_search),
-        (dd, dd_search),
-        (dl, dl_search),
-        (dt, dt_search),
-        (dj, dj_search),
-        (dw, dw_search),
-        (fx, fx_search),
-        (he, he_search),
-        (hs, hs_search),
-        (mb, mb_search),
-        (nk, nk_search),
-        (nx, nx_search),
-        (sf, sf_search),
-        (sj, sj_search),
-        (sl, sl_search),
-        (wd, wd_search),
-        (wx, wx_search),
+        ("al", al, al_search),
+        ("by", by, by_search),
+        ("dd", dd, dd_search),
+        ("dl", dl, dl_search),
+        ("dt", dt, dt_search),
+        ("dj", dj, dj_search),
+        ("dw", dw, dw_search),
+        ("fx", fx, fx_search),
+        ("he", he, he_search),
+        ("hs", hs, hs_search),
+        ("mb", mb, mb_search),
+        ("nk", nk, nk_search),
+        ("nx", nx, nx_search),
+        ("sf", sf, sf_search),
+        ("sj", sj, sj_search),
+        ("sl", sl, sl_search),
+        ("wd", wd, wd_search),
+        ("wx", wx, wx_search),
     ]
 
     phrase_map = [
-        (by, by_search),
-        (dl, dl_search),
-        (dt, dt_search),
-        (nx, nx_search),
-        (sl, sl_search),
-        (wd, wd_search),
+        ("by", by, by_search),
+        ("dl", dl, dl_search),
+        ("dt", dt, dt_search),
+        ("nx", nx, nx_search),
+        ("sl", sl, sl_search),
+        ("wd", wd, wd_search),
     ]
 
     feed_map = [
-        (al, al_feed),
-        (by, by_feed),
-        (dd, dd_feed),
-        (dj, dj_feed),
-        (dl, dl_feed),
-        (dt, dt_feed),
-        (dw, dw_feed),
-        (fx, fx_feed),
-        (he, he_feed),
-        (hs, hs_feed),
-        (mb, mb_feed),
-        (nk, nk_feed),
-        (nx, nx_feed),
-        (sf, sf_feed),
-        (sj, sj_feed),
-        (sl, sl_feed),
-        (wd, wd_feed),
-        (wx, wx_feed),
+        ("al", al, al_feed),
+        ("by", by, by_feed),
+        ("dd", dd, dd_feed),
+        ("dj", dj, dj_feed),
+        ("dl", dl, dl_feed),
+        ("dt", dt, dt_feed),
+        ("dw", dw, dw_feed),
+        ("fx", fx, fx_feed),
+        ("he", he, he_feed),
+        ("hs", hs, hs_feed),
+        ("mb", mb, mb_feed),
+        ("nk", nk, nk_feed),
+        ("nx", nx, nx_feed),
+        ("sf", sf, sf_feed),
+        ("sj", sj, sj_feed),
+        ("sl", sl, sl_feed),
+        ("wd", wd, wd_feed),
+        ("wx", wx, wx_feed),
     ]
 
     # Add searches
@@ -126,119 +130,166 @@ def get_search_results(
             (shared_state, start_time, request_from, imdb_id),
             {"mirror": mirror, "season": season, "episode": episode},
         )
-        for flag, func in imdb_map:
-            if flag:
-                search_executor.add(func, args, kwargs, True)
+        for name, url, func in imdb_map:
+            if url:
+                search_executor.add(func, args, kwargs, True, name.upper())
 
     elif search_phrase and docs_search:
         args, kwargs = (
             (shared_state, start_time, request_from, search_phrase),
             {"mirror": mirror, "season": season, "episode": episode},
         )
-        for flag, func in phrase_map:
-            if flag:
-                search_executor.add(func, args, kwargs)
+        for name, url, func in phrase_map:
+            if url:
+                search_executor.add(func, args, kwargs, source_name=name.upper())
 
     elif search_phrase:
         debug(f"Search phrase '{search_phrase}' is not supported for {request_from}.")
 
     else:
         args, kwargs = ((shared_state, start_time, request_from), {"mirror": mirror})
-        for flag, func in feed_map:
-            if flag:
-                search_executor.add(func, args, kwargs)
+        for name, url, func in feed_map:
+            if url:
+                search_executor.add(func, args, kwargs, source_name=name.upper())
 
     # Clean description for Console UI
     if imdb_id:
-        desc_text = f"Searching for IMDb-ID {imdb_id}"
         stype = f"IMDb-ID <b>{imdb_id}</b>"
     elif search_phrase:
-        desc_text = f"Searching for '{search_phrase}'"
         stype = f"Search-Phrase <b>{search_phrase}</b>"
     else:
-        desc_text = "Running Feed Search"
         stype = "<b>feed</b> search"
 
     debug(f"Starting <g>{len(search_executor.searches)}</g> searches for {stype}...")
 
-    results = search_executor.run_all(desc_text)
+    # Unpack the new return values (all_cached, min_ttl)
+    results, status_bar, all_cached, min_ttl = search_executor.run_all()
 
     elapsed_time = time.time() - start_time
+
+    # Sort results by date (newest first)
+    def get_date(item):
+        try:
+            dt = parsedate_to_datetime(item.get("details", {}).get("date", ""))
+            if dt.tzinfo is None:
+                dt = dt.replace(tzinfo=timezone.utc)
+            return dt
+        except Exception:
+            return parsedate_to_datetime("Thu, 01 Jan 1970 00:00:00 +0000")
+
+    results.sort(key=get_date, reverse=True)
+
+    # Calculate pagination for logging and return
+    total_count = len(results)
+
+    # Slicing
+    sliced_results = results[offset : offset + limit]
+
+    if sliced_results:
+        trace(f"First {len(sliced_results)} results sorted by date:")
+        for i, res in enumerate(sliced_results):
+            details = res.get("details", {})
+            trace(f"{i + 1}. {details.get('date')} | {details.get('title')}")
+
+    # Formatting for log (1-based index for humans)
+    log_start = min(offset + 1, total_count) if total_count > 0 else 0
+    log_end = min(offset + limit, total_count)
+
+    # Logic to switch between "Time taken" and "from cache"
+    if all_cached:
+        time_info = f"from cache ({int(min_ttl)}s left)"
+    else:
+        time_info = f"Time taken: {elapsed_time:.2f} seconds"
+
     info(
-        f"Providing <g>{len(results)} releases</g> to <d>{request_from}</d> for {stype}. <blue>Time taken: {elapsed_time:.2f} seconds</blue>"
+        f"Providing releases <g>{log_start}-{log_end}</g> of <g>{total_count}</g> to <d>{request_from}</d> "
+        f"for {stype}{status_bar} <blue>{time_info}</blue>"
     )
 
-    return results
+    return sliced_results
 
 
 class SearchExecutor:
     def __init__(self):
         self.searches = []
 
-    def add(self, func, args, kwargs, use_cache=False):
+    def add(self, func, args, kwargs, use_cache=False, source_name=None):
         key_args = list(args)
         key_args[1] = None
         key_args = tuple(key_args)
         key = hash((func.__name__, key_args, frozenset(kwargs.items())))
-        self.searches.append((key, lambda: func(*args, **kwargs), use_cache))
+        self.searches.append(
+            (
+                key,
+                lambda: func(*args, **kwargs),
+                use_cache,
+                source_name or func.__name__,
+            )
+        )
 
-    def run_all(self, description):
+    def run_all(self):
         results = []
         future_to_meta = {}
 
+        # Track cache state
+        all_cached = len(self.searches) > 0
+        min_ttl = float("inf")
+        bar_str = ""  # Initialize to prevent UnboundLocalError on full cache
+
         with ThreadPoolExecutor() as executor:
             current_index = 0
             pending_futures = []
-            cache_used = False
 
-            for key, func, use_cache in self.searches:
+            for key, func, use_cache, source_name in self.searches:
                 cached_result = None
+                exp = 0
+
                 if use_cache:
-                    cached_result = search_cache.get(key)
+                    # Get both result and expiry
+                    cached_result, exp = search_cache.get(key)
 
                 if cached_result is not None:
                     debug(f"Using cached result for {key}")
-                    cache_used = True
                     results.extend(cached_result)
+
+                    # Calculate TTL for this cached item
+                    ttl = exp - time.time()
+                    if ttl < min_ttl:
+                        min_ttl = ttl
                 else:
+                    all_cached = False
                     future = executor.submit(func)
                     cache_key = key if use_cache else None
-                    future_to_meta[future] = (current_index, cache_key)
+                    future_to_meta[future] = (current_index, cache_key, source_name)
                     pending_futures.append(future)
                     current_index += 1
 
-            # Prepare list to track status of each provider
-            # Icons will be filled in as threads complete
-            total_active = len(pending_futures)
-            icons = ["▪️"] * total_active
-
-            for future in as_completed(pending_futures):
-                index, cache_key = future_to_meta[future]
-                try:
-                    res = future.result()
-                    if res and len(res) > 0:
-                        status = "✅"
-                    else:
-                        status = "⚪"
-
-                    icons[index] = status
+            if pending_futures:
+                results_badges = [""] * len(pending_futures)
 
-                    results.extend(res)
-                    if cache_key:
-                        search_cache.set(cache_key, res)
-                except Exception as e:
-                    icons[index] = "❌"
-                    info(f"Search error: {e}")
+                for future in as_completed(pending_futures):
+                    index, cache_key, source_name = future_to_meta[future]
+                    try:
+                        res = future.result()
+                        if res and len(res) > 0:
+                            badge = f"<bg green><black>{source_name}</black></bg green>"
+                        else:
+                            debug(f"❌ No results returned by {source_name}")
+                            badge = f"<bg black><white>{source_name}</white></bg black>"
 
-            # Log the final status summary if any searches were performed
-            if total_active > 0:
-                bar_str = "".join(icons)
-                info(f"{description} [{bar_str}]")
+                        results_badges[index] = badge
+                        results.extend(res)
+                        if cache_key:
+                            search_cache.set(cache_key, res)
+                    except Exception as e:
+                        results_badges[index] = (
+                            f"<bg red><white>{source_name}</white></bg red>"
+                        )
+                        info(f"Search error: {e}")
 
-            if cache_used:
-                info("Presenting cached results for some items.")
+                bar_str = f" [{' '.join(results_badges)}]"
 
-        return results
+        return results, bar_str, all_cached, min_ttl
 
 
 class SearchCache:
@@ -256,7 +307,8 @@ class SearchCache:
 
     def get(self, key):
         val, exp = self.cache.get(key, (None, 0))
-        return val if time.time() < exp else None
+        # Return tuple (value, expiry) if valid, else (None, 0)
+        return (val, exp) if time.time() < exp else (None, 0)
 
     def set(self, key, value, ttl=300):
         now = time.time()

quasarr/search/sources/dj.py

@@ -37,70 +37,73 @@ def dj_feed(shared_state, start_time, request_from, mirror=None):
     sj_host = shared_state.values["config"]("Hostnames").get(hostname)
     password = sj_host
 
-    url = f"https://{sj_host}/api/releases/latest/0"
     headers = {"User-Agent": shared_state.values["user_agent"]}
 
-    try:
-        r = requests.get(url, headers=headers, timeout=30)
-        r.raise_for_status()
-        data = json.loads(r.content)
-    except Exception as e:
-        error(f"Feed load error: {e}")
-        mark_hostname_issue(
-            hostname, "feed", str(e) if "e" in dir() else "Error occurred"
-        )
-        return releases
+    for days in range(4):
+        url = f"https://{sj_host}/api/releases/latest/{days}"
 
-    for release in data:
         try:
-            title = release.get("name").rstrip(".")
-            if not title:
-                continue
+            r = requests.get(url, headers=headers, timeout=30)
+            r.raise_for_status()
+            data = json.loads(r.content)
+        except Exception as e:
+            error(f"Feed load error: {e}")
+            mark_hostname_issue(
+                hostname, "feed", str(e) if "e" in dir() else "Error occurred"
+            )
+            return releases
 
-            published = convert_to_rss_date(release.get("createdAt"))
-            if not published:
-                continue
+        for release in data:
+            try:
+                title = release.get("name").rstrip(".")
+                if not title:
+                    continue
 
-            media = release.get("_media", {})
-            slug = media.get("slug")
-            if not slug:
-                continue
+                published = convert_to_rss_date(release.get("createdAt"))
+                if not published:
+                    continue
 
-            series_url = f"https://{sj_host}/serie/{slug}"
+                media = release.get("_media", {})
+                slug = media.get("slug")
+                if not slug:
+                    continue
 
-            mb = 0
-            size = 0
-            imdb_id = None
+                series_url = f"https://{sj_host}/serie/{slug}"
 
-            payload = urlsafe_b64encode(
-                f"{title}|{series_url}|{mirror}|{mb}|{password}|{imdb_id}|{hostname}".encode(
-                    "utf-8"
-                )
-            ).decode("utf-8")
+                mb = 0
+                size = 0
+                imdb_id = None
 
-            link = (
-                f"{shared_state.values['internal_address']}/download/?payload={payload}"
-            )
+                payload = urlsafe_b64encode(
+                    f"{title}|{series_url}|{mirror}|{mb}|{password}|{imdb_id}|{hostname}".encode(
+                        "utf-8"
+                    )
+                ).decode("utf-8")
+
+                link = f"{shared_state.values['internal_address']}/download/?payload={payload}"
+
+                releases.append(
+                    {
+                        "details": {
+                            "title": title,
+                            "hostname": hostname,
+                            "imdb_id": imdb_id,
+                            "link": link,
+                            "mirror": mirror,
+                            "size": size,
+                            "date": published,
+                            "source": series_url,
+                        },
+                        "type": "protected",
+                    }
+                )
 
-            releases.append(
-                {
-                    "details": {
-                        "title": title,
-                        "hostname": hostname,
-                        "imdb_id": imdb_id,
-                        "link": link,
-                        "mirror": mirror,
-                        "size": size,
-                        "date": published,
-                        "source": series_url,
-                    },
-                    "type": "protected",
-                }
-            )
+            except Exception as e:
+                warn(f"Feed parse error: {e}")
+                continue
 
-        except Exception as e:
-            warn(f"Feed parse error: {e}")
-            continue
+        if releases:
+            break
 
     debug(f"Time taken: {time.time() - start_time:.2f}s")
 

quasarr/search/sources/mb.py

@@ -12,7 +12,7 @@ import requests
 from bs4 import BeautifulSoup
 
 from quasarr.providers.hostname_issues import clear_hostname_issue, mark_hostname_issue
-from quasarr.providers.log import debug, warn
+from quasarr.providers.log import debug, error, warn
 
 hostname = "mb"
 supported_mirrors = ["rapidgator", "ddownload"]
@@ -104,21 +104,9 @@ def _parse_posts(
                 if " " in title:
                     continue
 
-                # can't check for mirrors in search context
-                if mirror_filter and mirror_filter not in supported_mirrors:
-                    continue
-            else:
-                mirror_candidates = []
-                for strong in post.find_all(
-                    "strong", string=re.compile(r"^Download", re.I)
-                ):
-                    link_tag = strong.find_next_sibling("a")
-                    if link_tag and link_tag.get_text(strip=True):
-                        host = link_tag.get_text(strip=True).split(".")[0].lower()
-                        mirror_candidates.append(host)
-                valid = [m for m in mirror_candidates if m in supported_mirrors]
-                if not valid or (mirror_filter and mirror_filter not in valid):
-                    continue
+            # can't check for mirrors in soup, so we use the hardcoded list
+            if mirror_filter and mirror_filter not in supported_mirrors:
+                continue
 
             # extract IMDb ID
             imdb_id = None
@@ -128,9 +116,18 @@ def _parse_posts(
                     imdb_id = m.group(1)
                     break
 
+            if not imdb_id:
+                m = IMDB_REGEX.search(post.get_text())
+                if m:
+                    imdb_id = m.group(1)
+
             # size extraction
             mb = size_bytes = 0
-            size_match = re.search(r"Größe:\s*([\d\.]+)\s*([GMK]B)", post.get_text())
+            size_match = re.search(
+                r"(?:Größe|Size).*?:\s*([\d\.]+)\s*([GMK]B)",
+                post.get_text(),
+                re.IGNORECASE,
+            )
             if size_match:
                 sz = {"size": size_match.group(1), "sizeunit": size_match.group(2)}
                 mb = shared_state.convert_to_mb(sz)
@@ -159,7 +156,7 @@ def _parse_posts(
                 }
             )
         except Exception as e:
-            debug(f"Error parsing {hostname.upper()} post: {e}")
+            error(f"Error parsing {hostname.upper()} post: {e}")
             continue
     return releases
 

quasarr/search/sources/sf.py

@@ -316,7 +316,7 @@ def sf_search(
             # fetch API HTML
             epoch = str(datetime.now().timestamp()).replace(".", "")[:-3]
             api_url = f"https://{sf}/api/v1/{season_id}/season/ALL?lang=ALL&_={epoch}"
-            debug(f"Requesting SF API URL: {api_url}")
+            trace(f"Requesting SF API URL: {api_url}")
             try:
                 r = requests.get(api_url, headers=headers, timeout=10)
                 r.raise_for_status()

quasarr/search/sources/sj.py

@@ -39,70 +39,73 @@ def sj_feed(shared_state, start_time, request_from, mirror=None):
     sj_host = shared_state.values["config"]("Hostnames").get(hostname)
     password = sj_host
 
-    url = f"https://{sj_host}/api/releases/latest/0"
     headers = {"User-Agent": shared_state.values["user_agent"]}
 
-    try:
-        r = requests.get(url, headers=headers, timeout=30)
-        r.raise_for_status()
-        data = json.loads(r.content)
-    except Exception as e:
-        info(f"{hostname.upper()}: feed load error: {e}")
-        mark_hostname_issue(
-            hostname, "feed", str(e) if "e" in dir() else "Error occurred"
-        )
-        return releases
+    for days in range(4):
+        url = f"https://{sj_host}/api/releases/latest/{days}"
 
-    for release in data:
         try:
-            title = release.get("name").rstrip(".")
-            if not title:
-                continue
+            r = requests.get(url, headers=headers, timeout=30)
+            r.raise_for_status()
+            data = json.loads(r.content)
+        except Exception as e:
+            info(f"{hostname.upper()}: feed load error: {e}")
+            mark_hostname_issue(
+                hostname, "feed", str(e) if "e" in dir() else "Error occurred"
+            )
+            return releases
 
-            published = convert_to_rss_date(release.get("createdAt"))
-            if not published:
-                continue
+        for release in data:
+            try:
+                title = release.get("name").rstrip(".")
+                if not title:
+                    continue
 
-            media = release.get("_media", {})
-            slug = media.get("slug")
-            if not slug:
-                continue
+                published = convert_to_rss_date(release.get("createdAt"))
+                if not published:
+                    continue
 
-            series_url = f"https://{sj_host}/serie/{slug}"
+                media = release.get("_media", {})
+                slug = media.get("slug")
+                if not slug:
+                    continue
 
-            mb = 0
-            size = 0
-            imdb_id = None
+                series_url = f"https://{sj_host}/serie/{slug}"
 
-            payload = urlsafe_b64encode(
-                f"{title}|{series_url}|{mirror}|{mb}|{password}|{imdb_id}|{hostname}".encode(
-                    "utf-8"
-                )
-            ).decode("utf-8")
+                mb = 0
+                size = 0
+                imdb_id = None
 
-            link = (
-                f"{shared_state.values['internal_address']}/download/?payload={payload}"
-            )
+                payload = urlsafe_b64encode(
+                    f"{title}|{series_url}|{mirror}|{mb}|{password}|{imdb_id}|{hostname}".encode(
+                        "utf-8"
+                    )
+                ).decode("utf-8")
+
+                link = f"{shared_state.values['internal_address']}/download/?payload={payload}"
+
+                releases.append(
+                    {
+                        "details": {
+                            "title": title,
+                            "hostname": hostname,
+                            "imdb_id": imdb_id,
+                            "link": link,
+                            "mirror": mirror,
+                            "size": size,
+                            "date": published,
+                            "source": series_url,
+                        },
+                        "type": "protected",
+                    }
+                )
 
-            releases.append(
-                {
-                    "details": {
-                        "title": title,
-                        "hostname": hostname,
-                        "imdb_id": imdb_id,
-                        "link": link,
-                        "mirror": mirror,
-                        "size": size,
-                        "date": published,
-                        "source": series_url,
-                    },
-                    "type": "protected",
-                }
-            )
+            except Exception as e:
+                debug(f"{hostname.upper()}: feed parse error: {e}")
+                continue
 
-        except Exception as e:
-            debug(f"{hostname.upper()}: feed parse error: {e}")
-            continue
+        if releases:
+            break
 
     debug(f"Time taken: {time.time() - start_time:.2f}s")
 

{quasarr-2.7.0.dist-info → quasarr-2.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.7.0
+Version: 2.7.2
 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.7.0.dist-info → quasarr-2.7.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 quasarr/__init__.py,sha256=nh1MU1Evh0G1Pm657qtMMWWX4NSHm6PpETqGFtK2QLE,17197
 quasarr/api/__init__.py,sha256=2CXR0JEjC3zooTB8Bk-z_aZgVM2cPE9ijfO5yJAE9CE,20142
-quasarr/api/arr/__init__.py,sha256=1NcjcfNOjzTQCUDedTGJluK0xU-6krh0T8QSGu7eoeU,22283
+quasarr/api/arr/__init__.py,sha256=LVHD26vBG_n2y1voceCJFMOf7M_s3UscNQRcxP9M6wk,18831
 quasarr/api/captcha/__init__.py,sha256=9wBmdYKn0DImiFatHe4y2icV57d4710vfXFncvPKki8,78030
 quasarr/api/config/__init__.py,sha256=FJZHALhL6NExonhCk53vOYnM1ICkmbTRue5UMCy5Yzg,8813
 quasarr/api/jdownloader/__init__.py,sha256=SixcV-sgMAunjAT5LawASb1qSuOOokorQo2F7cQ3jZ4,9427
@@ -9,7 +9,7 @@ quasarr/api/sponsors_helper/__init__.py,sha256=QAFXK_JTtAnstRAlieCbbCsoTwIcBu7ZX
 quasarr/api/statistics/__init__.py,sha256=rJz6S4jSnpFDWtjU7O-2jECUEqlueOHOEfRUjSb3cMY,7943
 quasarr/downloads/__init__.py,sha256=571QRloySskkg-JRi7JjyrKyfZIRnd9WgotbOOZ9k0s,17364
 quasarr/downloads/linkcrypters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quasarr/downloads/linkcrypters/al.py,sha256=sNdEl1gogVn2xerd5fSOkAOgEF2sslQr81g34Jhu5So,8996
+quasarr/downloads/linkcrypters/al.py,sha256=_a5kbSLtwOf6y6gN_8_ZpJxvzWJa3lLQTqcTvk_Cjgo,8996
 quasarr/downloads/linkcrypters/filecrypt.py,sha256=yMkDM_GVOd3Bl9lgPkL1BDDuYOpMgxnVwlqRtskZ0Xo,17729
 quasarr/downloads/linkcrypters/hide.py,sha256=t9p_Hb5taJDuRAPaWZw7T1GTcLVgd8keD9LlZJ1-Gsg,6266
 quasarr/downloads/packages/__init__.py,sha256=MdKug4D-ex6sJBJuM0mi3_IjXX7AjV5ryUonOs2aupc,34887
@@ -33,43 +33,43 @@ quasarr/downloads/sources/wd.py,sha256=Xh5cvsGGBfM7iYWmBktmRHaWX6vZBRerBy-L8ycJW
 quasarr/downloads/sources/wx.py,sha256=b3_--zovX4BrknzGEmdh_QQw72dtyPfIrI_me_KyVjo,6772
 quasarr/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/auth.py,sha256=qDdXr28SJ078Q8AVZ_50Z1FwVhfuinOtRl6JHF4RgnM,10412
-quasarr/providers/cloudflare.py,sha256=oLtwQ_UElLIWJ-c-qH2c9NUjsZtlmzYpXlAWhQcE1FM,9076
+quasarr/providers/cloudflare.py,sha256=gwcznTQXZ0Xc0G5kLy42Ix90_MicAdN55BSLjrw9LyE,9076
 quasarr/providers/hostname_issues.py,sha256=SpnZAxOLejSXJGFnYkCrRzR8D0IQsTMtylM-O0h21Z0,1462
 quasarr/providers/html_images.py,sha256=xmxfNwqAqQimVaOq7IelkxlBdcRpPZZLGli_MJDOacI,19755
 quasarr/providers/html_templates.py,sha256=e5b66N47y5Uq7Ikwcm6kOWiyXZ7Bz4gqg2DcajIBGgE,16360
-quasarr/providers/imdb_metadata.py,sha256=JP9YQ7jU1H2-dify6q-qE7gpbJ9ospY4evNLQaa4FDY,21946
+quasarr/providers/imdb_metadata.py,sha256=IOsmk3-e8b-CUJmbfn-dwFZbP33VOAjt095ji8tyM7A,21946
 quasarr/providers/jd_cache.py,sha256=RZsjw9X8wouVH__T2EG7w18CLUrxKh73BHnk_rpHdgE,13534
 quasarr/providers/log.py,sha256=E5g5Angdn9iflW_Z0PNbAmhVK_ZC6IwLnOaJ_mVarqM,7018
 quasarr/providers/myjd_api.py,sha256=hCWVU5IAl7QQV_icMF0B91y7CLLM_j2xfyByTP7an0g,35206
 quasarr/providers/notifications.py,sha256=fL0HQdk7jBLXToM_URQiJq6y2UAHs0RzMFMCFdb3SHQ,4894
 quasarr/providers/obfuscated.py,sha256=IAN0-5m6UblLjaFdPhRy75ryqDMF0nlbkClq5-n1bQQ,2275634
-quasarr/providers/shared_state.py,sha256=alUxC0KJQEGsERcHUSn-nSY53PcUjmgHk5R04kj_hOs,33247
+quasarr/providers/shared_state.py,sha256=SoxoXREaeC-Rbxh5S6P2zF6yfjp01tjfQTOFFiKutEI,33247
 quasarr/providers/statistics.py,sha256=1X_Aa7TE3W7ovwkemVMsgIx55Jw3eYMiyUxuCUDgO5s,8666
 quasarr/providers/utils.py,sha256=FR0tGwao1ytYtWbmUocaHwt29pHKqskKMH2YE2bgSFI,12481
-quasarr/providers/version.py,sha256=vYbQKxf4PPBZ1AradCg9Rn9q7TQrQLaNkfDHTi2Cs_k,4424
+quasarr/providers/version.py,sha256=8ZasSv75vxS89_3atRUTM_C82mBISgjkiiKPzP-rQsQ,4424
 quasarr/providers/web_server.py,sha256=tHkMxhV6eaHC8cWsEpbUqD_U29IFE24VsU6tjk-xCEM,1765
 quasarr/providers/sessions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/sessions/al.py,sha256=AOWl1v-wcwxUeo1bRizd7zAzbUludsFbgCGICHCVZFQ,13270
 quasarr/providers/sessions/dd.py,sha256=K503Ny-3zWolzpGVane4ag5Gu1yzPv49eni0I8Hw4v8,3353
 quasarr/providers/sessions/dl.py,sha256=PnyuX_h4gQIk81w0NKYCFxpg-Il0gi72BQxbdLED1ds,5820
 quasarr/providers/sessions/nx.py,sha256=BkEMEVAiJQBlsGQYw4ZTSyys8Ua-WToAmqL0Il41OAg,3491
-quasarr/search/__init__.py,sha256=ggQG8NreFQ4IU6SAigh3YXCScUcQbcQjf3-nyfICOoQ,8162
+quasarr/search/__init__.py,sha256=1EDjnppuzpxKEdedU4QP1goqF35xYKD8O0JsHvIW12c,10466
 quasarr/search/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/search/sources/al.py,sha256=2RsaIfA4o3uMZuJZwPh1tETdLkNeAQ6-ymFVBL706Po,18206
 quasarr/search/sources/by.py,sha256=cgy39DN0LIMqO9Yfs6mx7Uio9unuEk4Our562BKQWz0,8971
 quasarr/search/sources/dd.py,sha256=J5SBHgItYPS3UL_Fu8a9wP1j9Rs_t9-ZbLcZaRIjU-I,6144
-quasarr/search/sources/dj.py,sha256=6mNuyhnG1MEf4fAVYjGGSbY_E_s9ENmiGRX6Eb16Qqw,7665
+quasarr/search/sources/dj.py,sha256=tkgwkEFWOcpXkD3N5SJdpG945uYT8tO9Y1y1bv7JYig,7909
 quasarr/search/sources/dl.py,sha256=QeKO7nKtMDzXLoWtus1Jl0uADcpKphfoLBNTlO85tYU,13888
 quasarr/search/sources/dt.py,sha256=yAr3MKCLq-KOLaIv7npNprKOxHCaOEJ4eOqQErguohU,10480
 quasarr/search/sources/dw.py,sha256=dbD5XErlPv3lJ2J7iyVKuFAuWmzidNNaOdT9mH_0b3k,9149
 quasarr/search/sources/fx.py,sha256=gJKEdMGNbnQNaj_pibUrajVB3Wei4hUqp8hmHski9Ow,10797
 quasarr/search/sources/he.py,sha256=m9zVU5NmctKQbc2aP7A-Yw-y94yX5HnjanVFOCnmdW0,7789
 quasarr/search/sources/hs.py,sha256=pq-MwK7FGokszTMiojAq3miw-yAqZhRDO7xGwRQdUMg,17815
-quasarr/search/sources/mb.py,sha256=f45R9Yh8kFtCudxhqNLFUwlQngMUfnZCowK65hhE3oM,8198
+quasarr/search/sources/mb.py,sha256=Y4pn3Hsxeoi4NUcEqaMjTVwHJvBbAj5aFPsgVTb3PXs,7805
 quasarr/search/sources/nk.py,sha256=r7t4mU4CP4IU7sr07f9NGa9pdAJnkKA7SeGZoUAdsLI,7497
 quasarr/search/sources/nx.py,sha256=px29xMPSzNs60fM7mk59JgMZJaTHp-vbLAkYNy74uVU,8396
-quasarr/search/sources/sf.py,sha256=l0kZ0crgf-ZOBvZCT7wk_7coS3Siw0KRycXeconHxA0,17434
-quasarr/search/sources/sj.py,sha256=t3dp_SypujEfz0u8hjS5Xcflzf637EYrkUASAKUzhk0,7882
+quasarr/search/sources/sf.py,sha256=ksVbjlf81PfwdlVmAKUU4LtpWegUjl27G582QI0UAxE,17434
+quasarr/search/sources/sj.py,sha256=IHM-mdXLZOen1MGtary_GEE7eVQjq79v-bjoK4bG9Yo,8126
 quasarr/search/sources/sl.py,sha256=9IqxOMJxL-SI5xwDVYO6PPPuatHOAXyh0_0bvRSaIfc,11511
 quasarr/search/sources/wd.py,sha256=lJmeEZ9A3pDGX-BRTomZa7HyaRt1-zUwbPC_2oUNHdI,10389
 quasarr/search/sources/wx.py,sha256=VLWY_BuVnk__MPdfufmQ2zkq4pGU1eD1-lLhWXQQPP4,14663
@@ -77,8 +77,8 @@ quasarr/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/storage/config.py,sha256=sjpfVq_Bxkj9gVwCXB_MAreB9ezf-YEJQKxQmQhUv9s,6540
 quasarr/storage/setup.py,sha256=zb83kvQfxMFHxC7EvWWaVTy0MtG7iEjMRyfY4hdcbOk,61520
 quasarr/storage/sqlite_database.py,sha256=tmHUotMWIwtyH-g244WvcGhMQMMjGokncv7JpFSi8NM,3639
-quasarr-2.7.0.dist-info/METADATA,sha256=NtSLKAF7rVh-4Y_5M1ibnP8fgG7EOS8jdy1h_qZsjdA,14822
-quasarr-2.7.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-quasarr-2.7.0.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
-quasarr-2.7.0.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
-quasarr-2.7.0.dist-info/RECORD,,
+quasarr-2.7.2.dist-info/METADATA,sha256=UtPWm-7fFS8MM231NCSjmSVEhJ4Vc-52gJSVojrEmvE,14822
+quasarr-2.7.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+quasarr-2.7.2.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
+quasarr-2.7.2.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
+quasarr-2.7.2.dist-info/RECORD,,