quasarr 2.7.1__tar.gz → 2.7.3__tar.gz

{quasarr-2.7.1 → quasarr-2.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.7.1
+Version: 2.7.3
 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.1 → quasarr-2.7.3}/docker/Dockerfile

@@ -33,7 +33,7 @@ ENV INTERNAL_ADDRESS=""
 ENV EXTERNAL_ADDRESS=""
 ENV DISCORD=""
 ENV HOSTNAMES=""
-ENV LOG_MAX_WIDTH="130"
+ENV LOG_MAX_WIDTH="120"
 
 # Restart loop: exit 0 = restart, exit non-zero = stop container
 ENTRYPOINT ["sh", "-c", "while true; do quasarr --port=8080 --internal_address=$INTERNAL_ADDRESS --external_address=$EXTERNAL_ADDRESS --discord=$DISCORD --hostnames=$HOSTNAMES; ret=$?; if [ $ret -ne 0 ]; then echo \"Quasarr exited with error $ret, stopping...\"; exit $ret; fi; echo \"Quasarr restarting...\"; sleep 2; done"]

{quasarr-2.7.1 → quasarr-2.7.3}/quasarr/api/arr/__init__.py

@@ -15,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
 
@@ -420,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>
@@ -432,5 +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}

{quasarr-2.7.1 → quasarr-2.7.3}/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-2.7.1 → quasarr-2.7.3}/quasarr/providers/version.py

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

{quasarr-2.7.1 → quasarr-2.7.3}/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
@@ -72,83 +74,88 @@ 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),
     ]
 
+    use_pagination = True
+
     # Add searches
     if imdb_id:
         args, kwargs = (
             (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, use_cache=True, source_name=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)
+        use_pagination = False
+        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:
@@ -165,15 +172,36 @@ def get_search_results(
 
     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 use_pagination:
+        sliced_results = results[offset : offset + limit]
+    else:
+        sliced_results = results
+
+    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)
+    log_end = min(offset + limit, total_count) if use_pagination else total_count
 
     # Logic to switch between "Time taken" and "from cache"
     if all_cached:
@@ -193,12 +221,19 @@ 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):
         results = []
@@ -213,7 +248,7 @@ class SearchExecutor:
             current_index = 0
             pending_futures = []
 
-            for key, func, use_cache in self.searches:
+            for key, func, use_cache, source_name in self.searches:
                 cached_result = None
                 exp = 0
 
@@ -233,27 +268,34 @@ class SearchExecutor:
                     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
 
             if pending_futures:
-                icons = ["▪️"] * len(pending_futures)
+                results_badges = [""] * len(pending_futures)
 
                 for future in as_completed(pending_futures):
-                    index, cache_key = future_to_meta[future]
+                    index, cache_key, source_name = future_to_meta[future]
                     try:
                         res = future.result()
-                        status = "✅" if res and len(res) > 0 else "⚪"
-                        icons[index] = status
+                        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>"
+
+                        results_badges[index] = badge
                         results.extend(res)
                         if cache_key:
                             search_cache.set(cache_key, res)
                     except Exception as e:
-                        icons[index] = "❌"
+                        results_badges[index] = (
+                            f"<bg red><white>{source_name}</white></bg red>"
+                        )
                         info(f"Search error: {e}")
 
-                bar_str = f" [{''.join(icons)}]"
+                bar_str = f" [{' '.join(results_badges)}]"
 
         return results, bar_str, all_cached, min_ttl
 

{quasarr-2.7.1 → quasarr-2.7.3}/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-2.7.1 → quasarr-2.7.3}/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-2.7.1 → quasarr-2.7.3}/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-2.7.1 → quasarr-2.7.3}/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")