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

quasarr/search/sources/dj.py

@@ -13,7 +13,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
-from quasarr.providers.log import debug, info
+from quasarr.providers.log import debug, error, trace, warn
 
 hostname = "dj"
 
@@ -31,9 +31,7 @@ def dj_feed(shared_state, start_time, request_from, mirror=None):
     releases = []
 
     if "sonarr" not 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
 
     sj_host = shared_state.values["config"]("Hostnames").get(hostname)
@@ -47,7 +45,7 @@ def dj_feed(shared_state, start_time, request_from, mirror=None):
         r.raise_for_status()
         data = json.loads(r.content)
     except Exception as e:
-        info(f"{hostname.upper()}: feed load error: {e}")
+        error(f"Feed load error: {e}")
         mark_hostname_issue(
             hostname, "feed", str(e) if "e" in dir() else "Error occurred"
         )
@@ -101,10 +99,10 @@ def dj_feed(shared_state, start_time, request_from, mirror=None):
             )
 
         except Exception as e:
-            debug(f"{hostname.upper()}: feed parse error: {e}")
+            warn(f"Feed parse error: {e}")
             continue
 
-    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)
@@ -123,9 +121,7 @@ def dj_search(
     releases = []
 
     if "sonarr" not 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
 
     sj_host = shared_state.values["config"]("Hostnames").get(hostname)
@@ -133,11 +129,12 @@ def dj_search(
 
     imdb_id = shared_state.is_imdb_id(search_string)
     if not imdb_id:
+        error(f"No IMDb ID found in search string '{search_string}'")
         return releases
 
     localized_title = get_localized_title(shared_state, imdb_id, "de")
     if not localized_title:
-        info(f"{hostname.upper()}: no localized title for IMDb {imdb_id}")
+        error(f"No localized title for IMDb {imdb_id}")
         return releases
 
     headers = {"User-Agent": shared_state.values["user_agent"]}
@@ -149,7 +146,7 @@ def dj_search(
         soup = BeautifulSoup(r.content, "html.parser")
         results = soup.find_all("a", href=re.compile(r"^/serie/"))
     except Exception as e:
-        info(f"{hostname.upper()}: search load error: {e}")
+        error(f"Search load error: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
@@ -167,12 +164,12 @@ def dj_search(
             if not re.search(
                 rf"\b{re.escape(sanitized_search_string)}\b", sanitized_title
             ):
-                debug(
+                trace(
                     f"Search string '{localized_title}' doesn't match '{result_title}'"
                 )
                 continue
 
-            debug(
+            trace(
                 f"Matched search string '{localized_title}' with result '{result_title}'"
             )
 
@@ -181,7 +178,7 @@ def dj_search(
             r = requests.get(series_url, headers=headers, timeout=10)
             media_id_match = re.search(r'data-mediaid="([^"]+)"', r.text)
             if not media_id_match:
-                debug(f"{hostname.upper()}: no media id for {result_title}")
+                warn(f"No media id for {result_title}")
                 continue
 
             media_id = media_id_match.group(1)
@@ -204,7 +201,7 @@ def dj_search(
 
                     published = convert_to_rss_date(item.get("createdAt"))
                     if not published:
-                        debug(f"{hostname.upper()}: no published date for {title}")
+                        debug(f"No published date for {title}")
                         published = one_hour_ago
 
                     mb = 0
@@ -235,10 +232,10 @@ def dj_search(
                     )
 
         except Exception as e:
-            debug(f"{hostname.upper()}: search parse error: {e}")
+            warn(f"Search parse error: {e}")
             continue
 
-    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/dl.py

@@ -12,7 +12,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, info, trace, warn
 from quasarr.providers.sessions.dl import (
     fetch_via_requests_session,
     invalidate_session,
@@ -70,13 +70,13 @@ def dl_feed(shared_state, start_time, request_from, mirror=None):
         forum = "hd.14"
 
     if not host:
-        debug(f"{hostname}: hostname not configured")
+        debug("hostname not configured")
         return releases
 
     try:
         sess = retrieve_and_validate_session(shared_state)
         if not sess:
-            info(f"Could not retrieve valid session for {host}")
+            warn(f"Could not retrieve valid session for {host}")
             return releases
 
         forum_url = f"https://www.{host}/forums/{forum}/?order=post_date&direction=desc"
@@ -89,7 +89,7 @@ def dl_feed(shared_state, start_time, request_from, mirror=None):
         items = soup.select("div.structItem.structItem--thread")
 
         if not items:
-            debug(f"{hostname}: No entries found in Forum")
+            debug("No entries found in Forum")
             return releases
 
         for item in items:
@@ -148,18 +148,18 @@ def dl_feed(shared_state, start_time, request_from, mirror=None):
                 )
 
             except Exception as e:
-                debug(f"{hostname}: error parsing Forum item: {e}")
+                debug(f"error parsing Forum item: {e}")
                 continue
 
     except Exception as e:
-        info(f"{hostname}: Forum feed error: {e}")
+        warn(f"Forum feed error: {e}")
         mark_hostname_issue(
             hostname, "feed", str(e) if "e" in dir() else "Error occurred"
         )
         invalidate_session(shared_state)
 
     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)
@@ -222,9 +222,7 @@ def _search_single_page(
         )
 
         if search_response.status_code != 200:
-            debug(
-                f"{hostname}: [Page {page_num}] returned status {search_response.status_code}"
-            )
+            debug(f"[Page {page_num}] returned status {search_response.status_code}")
             return page_releases, None
 
         # Extract search ID from first page
@@ -233,18 +231,16 @@ def _search_single_page(
             match = re.search(r"/search/(\d+)/", search_response.url)
             if match:
                 extracted_search_id = match.group(1)
-                debug(
-                    f"{hostname}: [Page 1] Extracted search ID: {extracted_search_id}"
-                )
+                trace(f"[Page 1] Extracted search ID: {extracted_search_id}")
 
         soup = BeautifulSoup(search_response.text, "html.parser")
         result_items = soup.select("li.block-row")
 
         if not result_items:
-            debug(f"{hostname}: [Page {page_num}] found 0 results")
+            trace(f"[Page {page_num}] found 0 results")
             return page_releases, extracted_search_id
 
-        debug(f"{hostname}: [Page {page_num}] found {len(result_items)} results")
+        trace(f"[Page {page_num}] found {len(result_items)} results")
 
         for item in result_items:
             try:
@@ -319,12 +315,12 @@ def _search_single_page(
                 )
 
             except Exception as e:
-                debug(f"{hostname}: [Page {page_num}] error parsing item: {e}")
+                debug(f"[Page {page_num}] error parsing item: {e}")
 
         return page_releases, extracted_search_id
 
     except Exception as e:
-        info(f"{hostname}: [Page {page_num}] error: {e}")
+        warn(f"[Page {page_num}] error: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
@@ -351,7 +347,7 @@ def dl_search(
     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
         if not season:
@@ -361,14 +357,14 @@ def dl_search(
     search_string = unescape(search_string)
     max_search_duration = 7
 
-    debug(
-        f"{hostname}: Starting sequential paginated search for '{search_string}' (Season: {season}, Episode: {episode}) - max {max_search_duration}s"
+    trace(
+        f"Starting sequential paginated search for '{search_string}' (Season: {season}, Episode: {episode}) - max {max_search_duration}s"
     )
 
     try:
         sess = retrieve_and_validate_session(shared_state)
         if not sess:
-            info(f"Could not retrieve valid session for {host}")
+            warn(f"Could not retrieve valid session for {host}")
             return releases
 
         search_id = None
@@ -395,9 +391,7 @@ def dl_search(
 
             page_release_titles = tuple(pr["details"]["title"] for pr in page_releases)
             if page_release_titles in release_titles_per_page:
-                debug(
-                    f"{hostname}: [Page {page_num}] duplicate page detected, stopping"
-                )
+                trace(f"[Page {page_num}] duplicate page detected, stopping")
                 break
             release_titles_per_page.add(page_release_titles)
 
@@ -405,37 +399,31 @@ def dl_search(
             if page_num == 1:
                 search_id = extracted_search_id
                 if not search_id:
-                    info(
-                        f"{hostname}: Could not extract search ID, stopping pagination"
-                    )
+                    trace("Could not extract search ID, stopping pagination")
                     break
 
             # Add releases from this page
             releases.extend(page_releases)
-            debug(
-                f"{hostname}: [Page {page_num}] completed with {len(page_releases)} valid releases"
+            trace(
+                f"[Page {page_num}] completed with {len(page_releases)} valid releases"
             )
 
             # Stop if this page returned 0 results
             if len(page_releases) == 0:
-                debug(
-                    f"{hostname}: [Page {page_num}] returned 0 results, stopping pagination"
-                )
+                trace(f"[Page {page_num}] returned 0 results, stopping pagination")
                 break
 
     except Exception as e:
-        info(f"{hostname}: search error: {e}")
+        info(f"search error: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
         invalidate_session(shared_state)
 
-    debug(
-        f"{hostname}: FINAL - Found {len(releases)} valid releases - providing to {request_from}"
-    )
+    trace(f"FINAL - Found {len(releases)} valid releases - providing to {request_from}")
 
     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/dt.py

@@ -15,7 +15,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
-from quasarr.providers.log import debug, info
+from quasarr.providers.log import debug, error, info, warn
 
 hostname = "dt"
 supported_mirrors = ["rapidgator", "nitroflare", "ddownload"]
@@ -69,8 +69,8 @@ def dt_feed(shared_state, start_time, request_from, mirror=None):
         feed_type = "media/tv-show/"
 
     if mirror and mirror not in supported_mirrors:
-        debug(
-            f'Mirror "{mirror}" not supported by "{hostname.upper()}". Supported: {supported_mirrors}. Skipping!'
+        error(
+            f'Mirror "{mirror}" not supported. Supported: {supported_mirrors}. Skipping!'
         )
         return releases
 
@@ -86,9 +86,7 @@ def dt_feed(shared_state, start_time, request_from, mirror=None):
             try:
                 link_tag = article.select_one("h4.font-weight-bold a")
                 if not link_tag:
-                    debug(
-                        f"Link tag not found in article: {article} at {hostname.upper()}"
-                    )
+                    warn(f"Link tag not found in article: {article}")
                     continue
 
                 source = link_tag["href"]
@@ -114,7 +112,7 @@ def dt_feed(shared_state, start_time, request_from, mirror=None):
                     r"(\d+(?:\.\d+)?\s*(?:GB|MB|KB|TB))", body_text, re.IGNORECASE
                 )
                 if not size_match:
-                    debug(f"Size not found in article: {article} at {hostname.upper()}")
+                    warn(f"Size not found in article: {article}")
                     continue
                 size_info = size_match.group(1).strip()
                 size_item = extract_size(size_info)
@@ -131,7 +129,7 @@ def dt_feed(shared_state, start_time, request_from, mirror=None):
                 link = f"{shared_state.values['internal_address']}/download/?payload={payload}"
 
             except Exception as e:
-                info(f"Error parsing {hostname.upper()} feed: {e}")
+                warn(f"Error parsing feed: {e}")
                 mark_hostname_issue(
                     hostname, "feed", str(e) if "e" in dir() else "Error occurred"
                 )
@@ -154,13 +152,13 @@ def dt_feed(shared_state, start_time, request_from, mirror=None):
             )
 
     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"
         )
 
     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)
@@ -188,8 +186,8 @@ def dt_search(
         cat_id = "64"
 
     if mirror and mirror not in supported_mirrors:
-        debug(
-            f'Mirror "{mirror}" not supported by "{hostname.upper()}". Skipping search!'
+        error(
+            f'Mirror "{mirror}" not supported. Supported: {supported_mirrors}. Skipping search!'
         )
         return releases
 
@@ -278,7 +276,7 @@ def dt_search(
                 link = f"{shared_state.values['internal_address']}/download/?payload={payload}"
 
             except Exception as e:
-                info(f"Error parsing {hostname.upper()} search item: {e}")
+                warn(f"Error parsing search item: {e}")
                 mark_hostname_issue(
                     hostname, "search", str(e) if "e" in dir() else "Error occurred"
                 )
@@ -301,13 +299,13 @@ def dt_search(
             )
 
     except Exception as e:
-        info(f"Error loading {hostname.upper()} search page: {e}")
+        error(f"Error loading search page: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
 
     elapsed = time.time() - start_time
-    debug(f"Search time: {elapsed:.2f}s ({hostname})")
+    debug(f"Search time: {elapsed:.2f}s")
 
     if releases:
         clear_hostname_issue(hostname)

quasarr/search/sources/dw.py

@@ -11,7 +11,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, info
+from quasarr.providers.log import debug, info, trace, warn
 
 hostname = "dw"
 supported_mirrors = ["1fichier", "rapidgator", "ddownload", "katfile"]
@@ -47,7 +47,7 @@ def convert_to_rss_date(date_str):
         "December",
     ]
 
-    for german, english in zip(german_months, english_months):
+    for german, english in zip(german_months, english_months, strict=False):
         if german in date_str:
             date_str = date_str.replace(german, english)
             break
@@ -84,7 +84,7 @@ def dw_feed(shared_state, start_time, request_from, mirror=None):
 
     if not "arr" in request_from.lower():
         debug(
-            f'Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!'
+            f'<d>Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!</d>'
         )
         return releases
 
@@ -159,13 +159,13 @@ def dw_feed(shared_state, start_time, request_from, mirror=None):
             )
 
     except Exception as e:
-        info(f"Error loading {hostname.upper()} feed: {e}")
+        warn(f"Error loading {hostname.upper()} feed: {e}")
         mark_hostname_issue(
             hostname, "feed", 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)
@@ -187,7 +187,7 @@ def dw_search(
 
     if not "arr" in request_from.lower():
         debug(
-            f'Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!'
+            f'<d>Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!</d>'
         )
         return releases
 
@@ -214,7 +214,7 @@ def dw_search(
         results = search.find_all("h4")
 
     except Exception as e:
-        info(f"Error loading {hostname.upper()} search feed: {e}")
+        warn(f"Error loading {hostname.upper()} search feed: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
@@ -232,11 +232,19 @@ def dw_search(
                 ):
                     continue
 
-                if not imdb_id:
-                    try:
-                        imdb_id = re.search(r"tt\d+", str(result)).group()
-                    except:
-                        imdb_id = None
+                try:
+                    release_imdb_id = re.search(r"tt\d+", str(result)).group()
+                except:
+                    release_imdb_id = None
+
+                if imdb_id and release_imdb_id and release_imdb_id != imdb_id:
+                    trace(
+                        f"{hostname.upper()}: Skipping result '{title}' due to IMDb ID mismatch."
+                    )
+                    continue
+
+                if release_imdb_id is None:
+                    release_imdb_id = imdb_id
 
                 source = result.a["href"]
                 size_info = result.find("span").text.strip()
@@ -248,13 +256,13 @@ def dw_search(
                 ).text.strip()
                 published = convert_to_rss_date(date)
                 payload = urlsafe_b64encode(
-                    f"{title}|{source}|{mirror}|{mb}|{password}|{imdb_id}|{hostname}".encode(
+                    f"{title}|{source}|{mirror}|{mb}|{password}|{release_imdb_id}|{hostname}".encode(
                         "utf-8"
                     )
                 ).decode("utf-8")
                 link = f"{shared_state.values['internal_address']}/download/?payload={payload}"
             except Exception as e:
-                info(f"Error parsing {hostname.upper()} search: {e}")
+                warn(f"Error parsing {hostname.upper()} search: {e}")
                 mark_hostname_issue(
                     hostname, "search", str(e) if "e" in dir() else "Error occurred"
                 )
@@ -265,7 +273,7 @@ def dw_search(
                     "details": {
                         "title": title,
                         "hostname": hostname.lower(),
-                        "imdb_id": imdb_id,
+                        "imdb_id": release_imdb_id,
                         "link": link,
                         "mirror": mirror,
                         "size": size,
@@ -277,7 +285,7 @@ def dw_search(
             )
 
     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)

quasarr/search/sources/fx.py

@@ -10,7 +10,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, info
+from quasarr.providers.log import debug, info, trace, warn
 
 hostname = "fx"
 supported_mirrors = ["rapidgator"]
@@ -33,7 +33,7 @@ def fx_feed(shared_state, start_time, request_from, mirror=None):
 
     if not "arr" in request_from.lower():
         debug(
-            f'Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!'
+            f'<d>Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!</d>'
         )
         return releases
 
@@ -56,7 +56,7 @@ def fx_feed(shared_state, start_time, request_from, mirror=None):
         feed = BeautifulSoup(r.content, "html.parser")
         items = feed.find_all("article")
     except Exception as e:
-        info(f"Error loading {hostname.upper()} feed: {e}")
+        warn(f"Error loading {hostname.upper()} feed: {e}")
         mark_hostname_issue(
             hostname, "feed", str(e) if "e" in dir() else "Error occurred"
         )
@@ -135,7 +135,7 @@ def fx_feed(shared_state, start_time, request_from, mirror=None):
                 )
 
     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)
@@ -157,7 +157,7 @@ def fx_search(
 
     if not "arr" in request_from.lower():
         debug(
-            f'Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!'
+            f'<d>Skipping {request_from} search on "{hostname.upper()}" (unsupported media type)!</d>'
         )
         return releases
 
@@ -168,6 +168,11 @@ def fx_search(
         )
         return releases
 
+    if search_string != "":
+        imdb_id = shared_state.is_imdb_id(search_string)
+    else:
+        imdb_id = None
+
     url = f"https://{fx}/?s={search_string}"
     headers = {
         "User-Agent": shared_state.values["user_agent"],
@@ -180,7 +185,7 @@ def fx_search(
         results = search.find("h2", class_="entry-title")
 
     except Exception as e:
-        info(f"Error loading {hostname.upper()} feed: {e}")
+        warn(f"Error loading {hostname.upper()} feed: {e}")
         mark_hostname_issue(
             hostname, "search", str(e) if "e" in dir() else "Error occurred"
         )
@@ -195,7 +200,7 @@ def fx_search(
                 feed = BeautifulSoup(result_r.content, "html.parser")
                 items = feed.find_all("article")
             except Exception as e:
-                info(f"Error loading {hostname.upper()} feed: {e}")
+                warn(f"Error loading {hostname.upper()} feed: {e}")
                 mark_hostname_issue(
                     hostname, "search", str(e) if "e" in dir() else "Error occurred"
                 )
@@ -220,9 +225,18 @@ def fx_search(
 
                         try:
                             imdb_link = article.find("a", href=re.compile(r"imdb\.com"))
-                            imdb_id = re.search(r"tt\d+", str(imdb_link)).group()
+                            release_imdb_id = re.search(
+                                r"tt\d+", str(imdb_link)
+                            ).group()
                         except:
-                            imdb_id = None
+                            release_imdb_id = None
+
+                        if imdb_id and release_imdb_id and release_imdb_id != imdb_id:
+                            trace(f"Skipping result '{title}' due to IMDb ID mismatch.")
+                            continue
+
+                        if release_imdb_id is None:
+                            release_imdb_id = imdb_id
 
                         try:
                             size_info = (
@@ -269,13 +283,13 @@ def fx_search(
                         )
 
                 except Exception as e:
-                    info(f"Error parsing {hostname.upper()} search: {e}")
+                    info(f"Error parsing search: {e}")
                     mark_hostname_issue(
                         hostname, "search", 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)