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

quasarr/providers/utils.py

@@ -13,6 +13,8 @@ from urllib.parse import urlparse
 import requests
 from PIL import Image
 
+from quasarr.providers.log import crit, error
+
 # Fallback user agent when FlareSolverr is not available
 FALLBACK_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36"
 
@@ -95,7 +97,7 @@ def check_ip():
 def check_flaresolverr(shared_state, flaresolverr_url):
     # Ensure it ends with /v<digit+>
     if not re.search(r"/v\d+$", flaresolverr_url):
-        print(f"FlareSolverr URL does not end with /v#: {flaresolverr_url}")
+        error(f"FlareSolverr URL does not end with /v#: {flaresolverr_url}")
         return False
 
     # Try sending a simple test request
@@ -115,25 +117,32 @@ def check_flaresolverr(shared_state, flaresolverr_url):
             solution_ua = solution.get("userAgent", None)
             if solution_ua:
                 shared_state.update("user_agent", solution_ua)
-            return True
+            try:
+                flaresolverr_version = json_data.get("version")
+            except Exception as e:
+                error(f"Could not grab Flaresolverr version: {str(e)}")
+                return False
+            return flaresolverr_version
         else:
-            print(f"Unexpected FlareSolverr response: {json_data}")
+            error(f"Unexpected FlareSolverr response: {json_data}")
             return False
 
     except Exception as e:
-        print(f"Failed to connect to FlareSolverr: {e}")
+        error(f"Failed to connect to FlareSolverr: {e}")
         return False
 
 
 def validate_address(address, name):
     if not address.startswith("http"):
-        sys.exit(f"Error: {name} '{address}' is invalid. It must start with 'http'.")
+        crit(f"Error: {name} '{address}' is invalid. It must start with 'http'.")
+        sys.exit(1)
 
     colon_count = address.count(":")
     if colon_count < 1 or colon_count > 2:
-        sys.exit(
+        crit(
             f"Error: {name} '{address}' is invalid. It must contain 1 or 2 colons, but it has {colon_count}."
         )
+        sys.exit(1)
 
 
 def is_flaresolverr_available(shared_state):

quasarr/providers/version.py

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

quasarr/search/__init__.py

@@ -35,40 +35,42 @@ 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}"
 
-    # Pre-populate IMDb metadata cache to avoid API hammering by search threads
     if imdb_id:
         get_imdb_metadata(imdb_id)
 
     docs_search = "lazylibrarian" in request_from.lower()
 
-    al = shared_state.values["config"]("Hostnames").get("al")
-    by = shared_state.values["config"]("Hostnames").get("by")
-    dd = shared_state.values["config"]("Hostnames").get("dd")
-    dl = shared_state.values["config"]("Hostnames").get("dl")
-    dt = shared_state.values["config"]("Hostnames").get("dt")
-    dj = shared_state.values["config"]("Hostnames").get("dj")
-    dw = shared_state.values["config"]("Hostnames").get("dw")
-    fx = shared_state.values["config"]("Hostnames").get("fx")
-    he = shared_state.values["config"]("Hostnames").get("he")
-    hs = shared_state.values["config"]("Hostnames").get("hs")
-    mb = shared_state.values["config"]("Hostnames").get("mb")
-    nk = shared_state.values["config"]("Hostnames").get("nk")
-    nx = shared_state.values["config"]("Hostnames").get("nx")
-    sf = shared_state.values["config"]("Hostnames").get("sf")
-    sj = shared_state.values["config"]("Hostnames").get("sj")
-    sl = shared_state.values["config"]("Hostnames").get("sl")
-    wd = shared_state.values["config"]("Hostnames").get("wd")
-    wx = shared_state.values["config"]("Hostnames").get("wx")
+    # Config retrieval
+    config = shared_state.values["config"]("Hostnames")
+    al = config.get("al")
+    by = config.get("by")
+    dd = config.get("dd")
+    dl = config.get("dl")
+    dt = config.get("dt")
+    dj = config.get("dj")
+    dw = config.get("dw")
+    fx = config.get("fx")
+    he = config.get("he")
+    hs = config.get("hs")
+    mb = config.get("mb")
+    nk = config.get("nk")
+    nx = config.get("nx")
+    sf = config.get("sf")
+    sj = config.get("sj")
+    sl = config.get("sl")
+    wd = config.get("wd")
+    wx = config.get("wx")
 
     start_time = time.time()
-
     search_executor = SearchExecutor()
 
-    # Radarr/Sonarr use imdb_id for searches
+    # Mappings
     imdb_map = [
         (al, al_search),
         (by, by_search),
@@ -90,7 +92,6 @@ def get_search_results(
         (wx, wx_search),
     ]
 
-    # LazyLibrarian uses search_phrase for searches
     phrase_map = [
         (by, by_search),
         (dl, dl_search),
@@ -100,7 +101,6 @@ def get_search_results(
         (wd, wd_search),
     ]
 
-    # Feed searches omit imdb_id and search_phrase
     feed_map = [
         (al, al_feed),
         (by, by_feed),
@@ -122,7 +122,8 @@ def get_search_results(
         (wx, wx_feed),
     ]
 
-    if imdb_id:  # only Radarr/Sonarr are using imdb_id
+    # Add searches
+    if imdb_id:
         args, kwargs = (
             (shared_state, start_time, request_from, imdb_id),
             {"mirror": mirror, "season": season, "episode": episode},
@@ -131,9 +132,7 @@ def get_search_results(
             if flag:
                 search_executor.add(func, args, kwargs, True)
 
-    elif (
-        search_phrase and docs_search
-    ):  # only LazyLibrarian is allowed to use search_phrase
+    elif search_phrase and docs_search:
         args, kwargs = (
             (shared_state, start_time, request_from, search_phrase),
             {"mirror": mirror, "season": season, "episode": episode},
@@ -143,9 +142,7 @@ def get_search_results(
                 search_executor.add(func, args, kwargs)
 
     elif search_phrase:
-        debug(
-            f"Search phrase '{search_phrase}' is not supported for {request_from}. Only LazyLibrarian can use search phrases."
-        )
+        debug(f"Search phrase '{search_phrase}' is not supported for {request_from}.")
 
     else:
         args, kwargs = ((shared_state, start_time, request_from), {"mirror": mirror})
@@ -153,23 +150,43 @@ def get_search_results(
             if flag:
                 search_executor.add(func, args, kwargs)
 
+    # Clean description for Console UI
     if imdb_id:
-        stype = f'IMDb-ID "{imdb_id}"'
+        stype = f"IMDb-ID <b>{imdb_id}</b>"
     elif search_phrase:
-        stype = f'Search-Phrase "{search_phrase}"'
+        stype = f"Search-Phrase <b>{search_phrase}</b>"
     else:
-        stype = "feed search"
+        stype = "<b>feed</b> search"
+
+    debug(f"Starting <g>{len(search_executor.searches)}</g> searches for {stype}...")
+
+    # Unpack the new return values (all_cached, min_ttl)
+    results, status_bar, all_cached, min_ttl = search_executor.run_all()
 
-    info(
-        f"Starting {len(search_executor.searches)} searches for {stype}... This may take some time."
-    )
-    results = search_executor.run_all()
     elapsed_time = time.time() - start_time
+
+    # Calculate pagination for logging and return
+    total_count = len(results)
+
+    # Slicing
+    sliced_results = results[offset : offset + limit]
+
+    # 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 {len(results)} releases to {request_from} for {stype}. Time taken: {elapsed_time:.2f} seconds"
+        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:
@@ -177,47 +194,68 @@ class SearchExecutor:
         self.searches = []
 
     def add(self, func, args, kwargs, use_cache=False):
-        # create cache key
         key_args = list(args)
-        key_args[1] = None  # ignore start_time in cache key
+        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))
 
     def run_all(self):
         results = []
-        futures = []
-        cache_keys = []
-        cache_used = False
+        future_to_meta = {}
 
-        with ThreadPoolExecutor() as executor:
-            for key, func, use_cache in self.searches:
-                if use_cache:
-                    cached_result = search_cache.get(key)
-                    if cached_result is not None:
-                        debug(f"Using cached result for {key}")
-                        cache_used = True
-                        results.extend(cached_result)
-                        continue
+        # Track cache state
+        all_cached = len(self.searches) > 0
+        min_ttl = float("inf")
+        bar_str = ""  # Initialize to prevent UnboundLocalError on full cache
 
-                futures.append(executor.submit(func))
-                cache_keys.append(key if use_cache else None)
-
-        for index, future in enumerate(as_completed(futures)):
-            try:
-                result = future.result()
-                results.extend(result)
-
-                if cache_keys[index]:  # only cache if flag is set
-                    search_cache.set(cache_keys[index], result)
-            except Exception as e:
-                info(f"An error occurred: {e}")
+        with ThreadPoolExecutor() as executor:
+            current_index = 0
+            pending_futures = []
 
-        if cache_used:
-            info("Presenting cached results instead of searching online.")
+            for key, func, use_cache in self.searches:
+                cached_result = None
+                exp = 0
 
-        return results
+                if use_cache:
+                    # 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}")
+                    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)
+                    pending_futures.append(future)
+                    current_index += 1
+
+            if pending_futures:
+                icons = ["▪️"] * len(pending_futures)
+
+                for future in as_completed(pending_futures):
+                    index, cache_key = future_to_meta[future]
+                    try:
+                        res = future.result()
+                        status = "✅" if res and len(res) > 0 else "⚪"
+                        icons[index] = status
+                        results.extend(res)
+                        if cache_key:
+                            search_cache.set(cache_key, res)
+                    except Exception as e:
+                        icons[index] = "❌"
+                        info(f"Search error: {e}")
+
+                bar_str = f" [{''.join(icons)}]"
+
+        return results, bar_str, all_cached, min_ttl
 
 
 class SearchCache:
@@ -228,22 +266,15 @@ class SearchCache:
     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]
-
+        keys_to_delete = [k for k, (_, exp) in self.cache.items() if now >= exp]
+        for k in keys_to_delete:
+            del self.cache[k]
         self.last_cleaned = now
 
     def get(self, key):
-        value, expiry = self.cache.get(key, (None, 0))
-        if time.time() < expiry:
-            return value
-
-        return None
+        val, exp = self.cache.get(key, (None, 0))
+        # 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/al.py

@@ -16,7 +16,7 @@ from quasarr.downloads.sources.al import (
 )
 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.log import debug, error, info, trace
 from quasarr.providers.sessions.al import fetch_via_requests_session, invalidate_session
 
 hostname = "al"
@@ -37,9 +37,9 @@ def convert_to_rss_date(date_str: str) -> str:
     try:
         parsed = datetime.strptime(date_str, "%d.%m.%Y - %H:%M")
         return parsed.strftime("%a, %d %b %Y %H:%M:%S +0000")
-    except ValueError:
+    except ValueError as e:
         # If parsing fails, return the original string or handle as needed
-        raise ValueError(f"Could not parse date: {date_str}")
+        raise ValueError(f"Could not parse date: {date_str}") from e
 
 
 def parse_relative_date(raw: str) -> datetime | None:
@@ -122,7 +122,7 @@ def al_feed(shared_state, start_time, request_from, mirror=None):
     host = shared_state.values["config"]("Hostnames").get(hostname)
 
     if not "arr" in request_from.lower():
-        debug(f"{hostname}: Skipping {request_from} search (unsupported media type)!")
+        debug(f"<d>Skipping {request_from} search (unsupported media type)!</d>")
         return releases
 
     if "Radarr" in request_from:
@@ -131,7 +131,7 @@ def al_feed(shared_state, start_time, request_from, mirror=None):
         wanted_type = "series"
 
     if mirror and mirror not in supported_mirrors:
-        debug(f'Mirror "{mirror}" not supported by {hostname}.')
+        debug(f'Mirror "{mirror}" not supported.')
         return releases
 
     try:
@@ -140,7 +140,7 @@ def al_feed(shared_state, start_time, request_from, mirror=None):
         )
         r.raise_for_status()
     except Exception as e:
-        info(f"{hostname}: could not fetch feed: {e}")
+        error(f"Could not fetch feed: {e}")
         mark_hostname_issue(
             hostname, "feed", str(e) if "e" in dir() else "Error occurred"
         )
@@ -201,7 +201,7 @@ def al_feed(shared_state, start_time, request_from, mirror=None):
                     try:
                         date_converted = convert_to_rss_date(raw_date_str)
                     except Exception as e:
-                        debug(f"{hostname}: could not parse date '{raw_date_str}': {e}")
+                        debug(f"Could not parse date '{raw_date_str}': {e}")
 
             # Each of these signifies an individual release block
             mt_blocks = tr.find_all("div", class_="mt10")
@@ -239,13 +239,13 @@ def al_feed(shared_state, start_time, request_from, mirror=None):
                     )
 
         except Exception as e:
-            info(f"{hostname}: error parsing feed item: {e}")
+            info(f"Error parsing feed item: {e}")
             mark_hostname_issue(
                 hostname, "feed", str(e) if "e" in dir() else "Error occurred"
             )
 
     elapsed = time.time() - start_time
-    debug(f"Time taken: {elapsed:.2f}s ({hostname})")
+    debug(f"Time taken: {elapsed:.2f}s")
 
     if releases:
         clear_hostname_issue(hostname)
@@ -272,7 +272,7 @@ def al_search(
     host = shared_state.values["config"]("Hostnames").get(hostname)
 
     if not "arr" in request_from.lower():
-        debug(f"{hostname}: Skipping {request_from} search (unsupported media type)!")
+        debug(f"<d>Skipping {request_from} search (unsupported media type)!</d>")
         return releases
 
     if "Radarr" in request_from:
@@ -281,14 +281,14 @@ def al_search(
         valid_type = "series"
 
     if mirror and mirror not in supported_mirrors:
-        debug(f'{hostname}: Mirror "{mirror}" not supported.')
+        debug(f'Mirror "{mirror}" not supported.')
         return releases
 
     imdb_id = shared_state.is_imdb_id(search_string)
     if imdb_id:
         title = get_localized_title(shared_state, imdb_id, "de")
         if not title:
-            info(f"{hostname}: no title for IMDb {imdb_id}")
+            info(f"No title for IMDb {imdb_id}")
             return releases
         search_string = title
 
@@ -307,7 +307,7 @@ def al_search(
         )
         r.raise_for_status()
     except Exception as e:
-        info(f"{hostname}: search load error: {e}")
+        info(f"Search load error: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
@@ -322,7 +322,7 @@ def al_search(
             last_redirect.url, redirect_location
         )  # in case of relative URL
         debug(
-            f"{hostname}: {search_string} redirected to {absolute_redirect_url} instead of search results page"
+            f"{search_string} redirected to {absolute_redirect_url} instead of search results page"
         )
 
         try:
@@ -350,13 +350,9 @@ def al_search(
             sanitized_search_string = shared_state.sanitize_string(search_string)
             sanitized_title = shared_state.sanitize_string(name)
             if not sanitized_search_string in sanitized_title:
-                debug(
-                    f"{hostname}: Search string '{search_string}' doesn't match '{name}'"
-                )
+                debug(f"Search string '{search_string}' doesn't match '{name}'")
                 continue
-            debug(
-                f"{hostname}: Matched search string '{search_string}' with result '{name}'"
-            )
+            trace(f"Matched search string '{search_string}' with result '{name}'")
 
             type_label = None
             for lbl in body.select("div.label-group a[href]"):
@@ -388,7 +384,7 @@ def al_search(
             use_cache = ts and ts > datetime.now() - timedelta(seconds=threshold)
 
             if use_cache and entry.get("html"):
-                debug(f"{hostname}: Using cached content for '{url}'")
+                debug(f"Using cached content for '{url}'")
                 data_html = entry["html"]
             else:
                 entry = {"timestamp": datetime.now()}
@@ -494,13 +490,13 @@ def al_search(
                 )
 
         except Exception as e:
-            info(f"{hostname}: error parsing search item: {e}")
+            info(f"Error parsing search item: {e}")
             mark_hostname_issue(
                 hostname, "search", str(e) if "e" in dir() else "Error occurred"
             )
 
     elapsed = time.time() - start_time
-    debug(f"Time taken: {elapsed:.2f}s ({hostname})")
+    debug(f"Time taken: {elapsed:.2f}s")
 
     if releases:
         clear_hostname_issue(hostname)

quasarr/search/sources/by.py

@@ -14,7 +14,7 @@ from bs4 import BeautifulSoup
 
 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.log import debug, error, info
 
 hostname = "by"
 supported_mirrors = ["rapidgator", "ddownload", "nitroflare"]
@@ -168,7 +168,7 @@ def _parse_posts(
                 }
             )
         except Exception as e:
-            debug(f"Error parsing {hostname.upper()}: {e}")
+            debug(f"Error parsing: {e}")
             continue
 
     return releases
@@ -201,12 +201,12 @@ def by_feed(shared_state, start_time, request_from, mirror=None):
             mirror_filter=mirror,
         )
     except Exception as e:
-        info(f"Error loading {hostname.upper()} feed: {e}")
+        error(f"Error loading feed: {e}")
         mark_hostname_issue(
             hostname, "feed", str(e) if "e" in dir() else "Error occurred"
         )
         releases = []
-    debug(f"Time taken: {time.time() - start_time:.2f}s ({hostname})")
+    debug(f"Time taken: {time.time() - start_time:.2f}s")
 
     if releases:
         clear_hostname_issue(hostname)
@@ -257,12 +257,12 @@ def by_search(
             episode=episode,
         )
     except Exception as e:
-        info(f"Error loading {hostname.upper()} search: {e}")
+        error(f"Error loading search: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
         releases = []
-    debug(f"Time taken: {time.time() - start_time:.2f}s ({hostname})")
+    debug(f"Time taken: {time.time() - start_time:.2f}s")
 
     if releases:
         clear_hostname_issue(hostname)

quasarr/search/sources/dd.py

@@ -9,7 +9,7 @@ from datetime import datetime, timezone
 
 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.log import debug, error, info, warn
 from quasarr.providers.sessions.dd import (
     create_and_persist_session,
     retrieve_and_validate_session,
@@ -48,9 +48,7 @@ def dd_search(
     password = dd
 
     if not "arr" in request_from.lower():
-        debug(
-            f'Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!'
-        )
+        debug(f"<d>Skipping {request_from} search (unsupported media type)!</d>")
         return releases
 
     try:
@@ -65,7 +63,7 @@ def dd_search(
 
     if mirror and mirror not in supported_mirrors:
         debug(
-            f'Mirror "{mirror}" not supported by "{hostname.upper()}". Supported mirrors: {supported_mirrors}.'
+            f'Mirror "{mirror}" not supported. Supported mirrors: {supported_mirrors}.'
             " Skipping search!"
         )
         return releases
@@ -123,7 +121,7 @@ def dd_search(
             try:
                 if release.get("fake"):
                     debug(
-                        f"{hostname}: Release {release.get('release')} marked as fake. Invalidating {hostname.upper()} session..."
+                        f"Release {release.get('release')} marked as fake. Invalidating session..."
                     )
                     create_and_persist_session(shared_state)
                     return []
@@ -138,7 +136,7 @@ def dd_search(
                     release_imdb = release.get("imdbid", None)
                     if release_imdb and imdb_id and imdb_id != release_imdb:
                         debug(
-                            f"{hostname}: Release {title} IMDb-ID mismatch ({imdb_id} != {release.get('imdbid', None)})"
+                            f"Release {title} IMDb-ID mismatch ({imdb_id} != {release.get('imdbid', None)})"
                         )
                         continue
 
@@ -169,20 +167,20 @@ def dd_search(
                         }
                     )
             except Exception as e:
-                info(f"Error parsing {hostname.upper()} feed: {e}")
+                warn(f"Error parsing feed: {e}")
                 mark_hostname_issue(
                     hostname, "search", str(e) if "e" in dir() else "Error occurred"
                 )
                 continue
 
     except Exception as e:
-        info(f"Error loading {hostname.upper()} {search_type}: {e}")
+        error(f"Error loading feed: {e}")
         mark_hostname_issue(
             hostname, search_type, str(e) if "e" in dir() else "Error occurred"
         )
 
     elapsed_time = time.time() - start_time
-    debug(f"Time taken: {elapsed_time:.2f}s ({hostname})")
+    debug(f"Time taken: {elapsed_time:.2f}s")
 
     if releases:
         clear_hostname_issue(hostname)