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

quasarr/providers/myjd_api.py

@@ -190,18 +190,7 @@ class Linkgrabber:
 
     def add_links(
         self,
-        params=[
-            {
-                "autostart": True,
-                "links": None,
-                "packageName": None,
-                "extractPassword": None,
-                "priority": "DEFAULT",
-                "downloadPassword": None,
-                "destinationFolder": None,
-                "overwritePackagizerRules": False,
-            }
-        ],
+        params=None,
     ):
         """
         Add links to the linkcollector
@@ -216,10 +205,23 @@ class Linkgrabber:
         "destinationFolder" : null
         }
         """
+        if params is None:
+            params = [
+                {
+                    "autostart": True,
+                    "links": None,
+                    "packageName": None,
+                    "extractPassword": None,
+                    "priority": "DEFAULT",
+                    "downloadPassword": None,
+                    "destinationFolder": None,
+                    "overwritePackagizerRules": False,
+                }
+            ]
         resp = self.device.action(self.url + "/addLinks", params)
         return resp
 
-    def cleanup(self, action, mode, selection_type, link_ids=[], package_ids=[]):
+    def cleanup(self, action, mode, selection_type, link_ids=None, package_ids=None):
         """
         Clean packages and/or links of the linkgrabber list.
         Requires at least a package_ids or link_ids list, or both.
@@ -235,6 +237,10 @@ class Linkgrabber:
         :param selection_type: Type of selection to use. Types: SELECTED, UNSELECTED, ALL, NONE
         :type: str:
         """
+        if link_ids is None:
+            link_ids = []
+        if package_ids is None:
+            package_ids = []
         params = [link_ids, package_ids]
         params += [action, mode, selection_type]
         resp = self.device.action(self.url + "/cleanup", params)
@@ -259,24 +265,7 @@ class Linkgrabber:
 
     def query_links(
         self,
-        params=[
-            {
-                "bytesTotal": True,
-                "comment": True,
-                "status": True,
-                "enabled": True,
-                "maxResults": -1,
-                "startAt": 0,
-                "hosts": True,
-                "url": True,
-                "availability": True,
-                "variantIcon": True,
-                "variantName": True,
-                "variantID": True,
-                "variants": True,
-                "priority": True,
-            }
-        ],
+        params=None,
     ):
         """
 
@@ -288,34 +277,55 @@ class Linkgrabber:
         :type: Dictionary
         :rtype: List of dictionaries of this style, with more or less detail based on your options.
         """
+        if params is None:
+            params = [
+                {
+                    "bytesTotal": True,
+                    "comment": True,
+                    "status": True,
+                    "enabled": True,
+                    "maxResults": -1,
+                    "startAt": 0,
+                    "hosts": True,
+                    "url": True,
+                    "availability": True,
+                    "variantIcon": True,
+                    "variantName": True,
+                    "variantID": True,
+                    "variants": True,
+                    "priority": True,
+                }
+            ]
         resp = self.device.action(self.url + "/queryLinks", params)
         return resp
 
     def query_packages(
         self,
-        params=[
-            {
-                "bytesLoaded": True,
-                "bytesTotal": True,
-                "comment": True,
-                "enabled": True,
-                "eta": True,
-                "priority": False,
-                "finished": True,
-                "running": True,
-                "speed": True,
-                "status": True,
-                "childCount": True,
-                "hosts": True,
-                "saveTo": True,
-                "maxResults": -1,
-                "startAt": 0,
-            }
-        ],
+        params=None,
     ):
         """
         Get the links in the linkgrabber list
         """
+        if params is None:
+            params = [
+                {
+                    "bytesLoaded": True,
+                    "bytesTotal": True,
+                    "comment": True,
+                    "enabled": True,
+                    "eta": True,
+                    "priority": False,
+                    "finished": True,
+                    "running": True,
+                    "speed": True,
+                    "status": True,
+                    "childCount": True,
+                    "hosts": True,
+                    "saveTo": True,
+                    "maxResults": -1,
+                    "startAt": 0,
+                }
+            ]
         resp = self.device.action("/linkgrabberv2/queryPackages", params)
         return resp
 
@@ -329,7 +339,7 @@ class Downloads:
         self.device = device
         self.url = "/downloadsV2"
 
-    def cleanup(self, action, mode, selection_type, link_ids=[], package_ids=[]):
+    def cleanup(self, action, mode, selection_type, link_ids=None, package_ids=None):
         """
         Clean packages and/or links of the linkgrabber list.
         Requires at least a package_ids or link_ids list, or both.
@@ -345,6 +355,10 @@ class Downloads:
         :param selection_type: Type of selection to use. Types: SELECTED, UNSELECTED, ALL, NONE
         :type: str:
         """
+        if link_ids is None:
+            link_ids = []
+        if package_ids is None:
+            package_ids = []
         params = [link_ids, package_ids]
         params += [action, mode, selection_type]
         resp = self.device.action(self.url + "/cleanup", params)
@@ -352,59 +366,63 @@ class Downloads:
 
     def query_links(
         self,
-        params=[
-            {
-                "bytesTotal": True,
-                "comment": True,
-                "status": True,
-                "enabled": True,
-                "maxResults": -1,
-                "startAt": 0,
-                "packageUUIDs": [],
-                "host": True,
-                "url": True,
-                "bytesloaded": True,
-                "speed": True,
-                "eta": True,
-                "finished": True,
-                "priority": True,
-                "running": True,
-                "skipped": True,
-                "extractionStatus": True,
-            }
-        ],
+        params=None,
     ):
         """
         Get the links in the download list
         """
+        if params is None:
+            params = [
+                {
+                    "bytesTotal": True,
+                    "comment": True,
+                    "status": True,
+                    "enabled": True,
+                    "maxResults": -1,
+                    "startAt": 0,
+                    "packageUUIDs": [],
+                    "host": True,
+                    "url": True,
+                    "bytesloaded": True,
+                    "speed": True,
+                    "eta": True,
+                    "finished": True,
+                    "priority": True,
+                    "running": True,
+                    "skipped": True,
+                    "extractionStatus": True,
+                }
+            ]
         resp = self.device.action(self.url + "/queryLinks", params)
         return resp
 
     def query_packages(
         self,
-        params=[
-            {
-                "bytesLoaded": True,
-                "bytesTotal": True,
-                "comment": True,
-                "enabled": True,
-                "eta": True,
-                "priority": False,
-                "finished": True,
-                "running": True,
-                "speed": True,
-                "status": True,
-                "childCount": True,
-                "hosts": True,
-                "saveTo": True,
-                "maxResults": -1,
-                "startAt": 0,
-            }
-        ],
+        params=None,
     ):
         """
         Get the packages in the downloads list
         """
+        if params is None:
+            params = [
+                {
+                    "bytesLoaded": True,
+                    "bytesTotal": True,
+                    "comment": True,
+                    "enabled": True,
+                    "eta": True,
+                    "priority": False,
+                    "finished": True,
+                    "running": True,
+                    "speed": True,
+                    "status": True,
+                    "childCount": True,
+                    "hosts": True,
+                    "saveTo": True,
+                    "maxResults": -1,
+                    "startAt": 0,
+                }
+            ]
         resp = self.device.action(self.url + "/queryPackages", params)
         return resp
 
@@ -418,7 +436,7 @@ class Extraction:
         self.device = device
         self.url = "/extraction"
 
-    def get_archive_info(self, link_ids=[], package_ids=[]):
+    def get_archive_info(self, link_ids=None, package_ids=None):
         """
         Get ArchiveStatus for links and/or packages.
 
@@ -427,6 +445,10 @@ class Extraction:
         :param link_ids: link UUID's.
         :type: list of strings
         """
+        if link_ids is None:
+            link_ids = []
+        if package_ids is None:
+            package_ids = []
         params = [link_ids, package_ids]
         resp = self.device.action(self.url + "/getArchiveInfo", params)
         return resp
@@ -697,7 +719,7 @@ class Myjdapi:
         try:
             decrypted_data = unpad(decryptor.decrypt(self.__base64_decode(data)))
         except:
-            raise MYJDException("Failed to decode response: {}", data)
+            raise MYJDException("Failed to decode response: {}", data) from None
 
         return decrypted_data
 
@@ -977,7 +999,7 @@ class Myjdapi:
                 except:
                     raise MYJDException(
                         "Failed to decode response: {}", encrypted_response.text
-                    )
+                    ) from None
             msg = (
                 "\n\tSOURCE: "
                 + error_msg["src"]

quasarr/providers/sessions/al.py

@@ -38,8 +38,7 @@ def create_and_persist_session(shared_state):
     # AL requires FlareSolverr - check availability first
     if not is_flaresolverr_available(shared_state):
         info(
-            f'"{hostname.upper()}" requires FlareSolverr which is not configured. '
-            f"Please configure FlareSolverr in the web UI to use this site."
+            "FlareSolverr is not configured, configure FlareSolverr in the web UI to use this site."
         )
         mark_hostname_issue(
             hostname, "session", "FlareSolverr required but not configured"
@@ -58,7 +57,7 @@ def create_and_persist_session(shared_state):
 
     # Prime cookies via FlareSolverr
     try:
-        info(f'Priming "{hostname}" session via FlareSolverr...')
+        debug("Priming session via FlareSolverr...")
         fs_headers = {"Content-Type": "application/json"}
         fs_payload = {
             "cmd": "request.get",
@@ -72,19 +71,19 @@ def create_and_persist_session(shared_state):
             )
             fs_resp.raise_for_status()
         except Timeout:
-            info(f"{hostname}: FlareSolverr request timed out")
+            info("FlareSolverr request timed out")
             mark_hostname_issue(hostname, "session", "FlareSolverr request timed out")
             return None
         except RequestException as e:
             # This covers HTTP errors and connection issues *other than* timeout
-            info(f"{hostname}: FlareSolverr server error: {e}")
+            info(f"FlareSolverr server error: {e}")
             mark_hostname_issue(hostname, "session", str(e))
             return None
 
         fs_json = fs_resp.json()
         # Check if FlareSolverr actually solved the challenge
         if fs_json.get("status") != "ok" or "solution" not in fs_json:
-            info(f"{hostname}: FlareSolverr did not return a valid solution")
+            info("FlareSolverr did not return a valid solution")
             mark_hostname_issue(
                 hostname, "session", "FlareSolverr did not return a valid solution"
             )
@@ -106,7 +105,7 @@ def create_and_persist_session(shared_state):
             sess.cookies.set(name, value, domain=domain, path=path)
 
     except Exception as e:
-        debug(f'Could not prime "{hostname}" session via FlareSolverr: {e}')
+        debug(f"Could not prime session via FlareSolverr: {e}")
         mark_hostname_issue(hostname, "session", str(e))
         return None
 
@@ -124,12 +123,12 @@ def create_and_persist_session(shared_state):
         )
 
         if r.status_code != 200 or "invalid" in r.text.lower():
-            info(f'Login failed: "{hostname}" - {r.status_code} - {r.text}')
+            info(f"Login failed: {r.status_code} - {r.text}")
             mark_hostname_issue(hostname, "session", "Login failed")
             return None
-        info(f'Login successful: "{hostname}"')
+        info("Login successful")
     else:
-        info(f'Missing credentials for: "{hostname}" - skipping login')
+        info("Missing credentials - skipping login")
         mark_hostname_issue(hostname, "session", "Missing credentials")
         return None
 
@@ -144,7 +143,7 @@ def retrieve_and_validate_session(shared_state):
 
     # AL requires FlareSolverr - check availability
     if not is_flaresolverr_available(shared_state):
-        info(f'"{hostname.upper()}" requires FlareSolverr which is not configured')
+        info("Requires FlareSolverr which is not configured")
         mark_hostname_issue(hostname, "session", "FlareSolverr required")
         return None
 
@@ -162,16 +161,15 @@ def retrieve_and_validate_session(shared_state):
         # Check if session is older than 24 hours
         age = time.time() - created_at
         if age > SESSION_MAX_AGE_SECONDS:
-            debug(f"{hostname}: session expired (age: {age / 3600:.1f} hours)")
+            debug(f"Session expired (age: {age / 3600:.1f} hours)")
             invalidate_session(shared_state)
             return create_and_persist_session(shared_state)
         else:
-            debug(f"{hostname}: session valid (age: {age / 3600:.1f} hours)")
-
+            debug(f"Session valid (age: {age / 3600:.1f} hours)")
     except (json.JSONDecodeError, TypeError):
         # Legacy format: plain base64 token without timestamp
         # Treat as expired and recreate
-        debug(f"{hostname}: legacy session format detected, recreating")
+        debug("Legacy session format detected, recreating")
         invalidate_session(shared_state)
         return create_and_persist_session(shared_state)
 
@@ -181,7 +179,7 @@ def retrieve_and_validate_session(shared_state):
         if not isinstance(sess, requests.Session):
             raise ValueError("Not a Session")
     except Exception as e:
-        debug(f"{hostname}: session load failed: {e}")
+        debug(f"Session load failed: {e}")
         return create_and_persist_session(shared_state)
 
     return sess
@@ -190,7 +188,7 @@ def retrieve_and_validate_session(shared_state):
 def invalidate_session(shared_state):
     db = shared_state.values["database"]("sessions")
     db.delete(hostname)
-    debug(f'Session for "{hostname}" marked as invalid!')
+    debug("Session marked as invalid!")
 
 
 def _persist_session_to_db(shared_state, sess):
@@ -259,8 +257,8 @@ def fetch_via_flaresolverr(
     # Check if FlareSolverr is available
     if not is_flaresolverr_available(shared_state):
         info(
-            f'"{hostname.upper()}" requires FlareSolverr which is not configured. '
-            f"Please configure FlareSolverr in the web UI."
+            "Requires FlareSolverr which is not configured. "
+            "Please configure FlareSolverr in the web UI."
         )
         return {
             "status_code": None,
@@ -275,7 +273,7 @@ def fetch_via_flaresolverr(
 
     sess = retrieve_and_validate_session(shared_state)
     if not sess:
-        debug(f"Skipping {hostname}: site not usable (login skipped or no credentials)")
+        debug("Site not usable (login skipped or no credentials).")
         return {
             "status_code": None,
             "headers": {},
@@ -317,7 +315,7 @@ def fetch_via_flaresolverr(
             "error": f"FlareSolverr request failed: {e}",
         }
     except Exception as e:
-        raise RuntimeError(f"Could not reach FlareSolverr: {e}")
+        raise RuntimeError(f"Could not reach FlareSolverr: {e}") from e
 
     if resp.status_code >= 400:
         mark_hostname_issue(hostname, "session", f"Request failed: {resp.status_code}")
@@ -381,7 +379,7 @@ def fetch_via_requests_session(
     sess = retrieve_and_validate_session(shared_state)
     if not sess:
         raise SkippedSiteError(
-            f"{hostname}: site not usable (login skipped or no credentials)"
+            f"Site '{hostname}' not usable (login skipped or no credentials)"
         )
 
     if year:

quasarr/providers/sessions/dd.py

@@ -78,7 +78,7 @@ def create_and_persist_session(shared_state):
 
 def retrieve_and_validate_session(shared_state):
     if not is_site_usable(shared_state, hostname):
-        debug(f"Skipping {hostname}: site not usable (login skipped or no credentials)")
+        debug("Site not usable (login skipped or no credentials)")
         return None
 
     session_string = shared_state.values["database"]("sessions").retrieve("dd")

quasarr/providers/sessions/dl.py

@@ -40,7 +40,7 @@ def create_and_persist_session(shared_state):
     password = credentials_cfg.get("password")
 
     if not user or not password:
-        info(f'Missing credentials for: "{hostname}" - user and password are required')
+        info("Missing credentials - user and password are required")
         mark_hostname_issue(hostname, "session", "Missing credentials")
         return None
 
@@ -62,7 +62,7 @@ def create_and_persist_session(shared_state):
         csrf_input = soup.find("input", {"name": "_xfToken"})
 
         if not csrf_input or not csrf_input.get("value"):
-            info(f'Could not find CSRF token on login page for: "{hostname}"')
+            info("Could not find CSRF token on login page")
             mark_hostname_issue(hostname, "session", "Could not find CSRF token")
             return None
 
@@ -87,15 +87,13 @@ def create_and_persist_session(shared_state):
         verify_r.raise_for_status()
 
         if 'data-logged-in="true"' not in verify_r.text:
-            info(
-                f'Login verification failed for: "{hostname}" - invalid credentials or login failed'
-            )
+            info("Login verification failed - invalid credentials or login failed")
             mark_hostname_issue(hostname, "session", "Login verification failed")
             return None
 
-        info(f'Session successfully created for: "{hostname}" using user/password')
+        info("Session successfully created using user/password")
     except Exception as e:
-        info(f'Failed to create session for: "{hostname}" - {e}')
+        info(f"Failed to create session - {e}")
         mark_hostname_issue(hostname, "session", str(e))
         return None
 
@@ -132,7 +130,7 @@ def retrieve_and_validate_session(shared_state):
         if not isinstance(sess, requests.Session):
             raise ValueError("Not a Session")
     except Exception as e:
-        debug(f"{hostname}: session load failed: {e}")
+        debug(f"Session load failed: {e}")
         return create_and_persist_session(shared_state)
 
     return sess
@@ -147,7 +145,7 @@ def invalidate_session(shared_state):
     """
     db = shared_state.values["database"]("sessions")
     db.delete(hostname)
-    debug(f'Session for "{hostname}" marked as invalid!')
+    debug("Session marked as invalid!")
 
 
 def _persist_session_to_db(shared_state, sess):
@@ -188,7 +186,7 @@ def fetch_via_requests_session(
     sess = retrieve_and_validate_session(shared_state)
     if not sess:
         raise SkippedSiteError(
-            f"{hostname}: site not usable (login skipped or no credentials)"
+            f"Site '{hostname}' not usable (login skipped or no credentials)"
         )
 
     # Execute request

quasarr/providers/sessions/nx.py

@@ -78,7 +78,7 @@ def create_and_persist_session(shared_state):
 
 def retrieve_and_validate_session(shared_state):
     if not is_site_usable(shared_state, hostname):
-        debug(f"Skipping {hostname}: site not usable (login skipped or no credentials)")
+        debug("Site not usable (login skipped or no credentials)")
         return None
 
     session_string = shared_state.values["database"]("sessions").retrieve("nx")

quasarr/providers/shared_state.py

@@ -12,7 +12,7 @@ from datetime import date, datetime, timedelta
 from urllib import parse
 
 import quasarr
-from quasarr.providers.log import debug, info
+from quasarr.providers.log import debug, error, info, trace, warn
 from quasarr.providers.myjd_api import (
     Jddevice,
     Myjdapi,
@@ -140,7 +140,7 @@ def connect_to_jd(jd, user, password, device_name):
         connection_info = device.check_direct_connection()
         if connection_info["status"]:
             info(
-                f'Direct connection to JDownloader established: "{connection_info["ip"]}"'
+                f"Direct connection to JDownloader established: <g>{connection_info['ip']}</g>"
             )
         else:
             info("Could not establish direct connection to JDownloader.")
@@ -232,25 +232,25 @@ def get_device():
             # First 10 failures: 3 seconds
             sleep_time = 3
             if attempts == 10:
-                info(
+                warn(
                     f"WARNING: {attempts} consecutive JDownloader connection errors. Switching to 1-minute intervals."
                 )
         elif attempts <= 15:
             # Next 5 failures (11-15): 1 minute
             sleep_time = 60
             if attempts % 10 == 0:
-                info(
+                warn(
                     f"WARNING: {attempts} consecutive JDownloader connection errors. Please check your credentials!"
                 )
             if attempts == 15:
-                info(
+                warn(
                     f"WARNING: Still failing after {attempts} attempts. Switching to 5-minute intervals."
                 )
         else:
             # After 15 failures: 5 minutes
             sleep_time = 300
             if attempts % 10 == 0:
-                info(
+                warn(
                     f"WARNING: {attempts} consecutive JDownloader connection errors. Please check your credentials!"
                 )
 
@@ -271,7 +271,7 @@ def get_devices(user, password):
         devices = jd.list_devices()
         return devices
     except (TokenExpiredException, RequestTimeoutException, MYJDException) as e:
-        info("Error connecting to JDownloader: " + str(e))
+        error("Error connecting to JDownloader: " + str(e))
         return []
 
 
@@ -611,7 +611,7 @@ def sanitize_string(s):
 
     # Remove German and English articles
     articles = r"\b(?:der|die|das|ein|eine|einer|eines|einem|einen|the|a|an|and)\b"
-    s = re.sub(articles, "", s, re.IGNORECASE)
+    s = re.sub(articles, "", s, count=0, flags=re.IGNORECASE)
 
     # Replace obsolete titles
     s = s.replace("navy cis", "ncis")
@@ -631,7 +631,7 @@ def search_string_in_sanitized_title(search_string, title):
     )
     # Use word boundaries to ensure full word/phrase match
     if re.search(rf"\b{search_regex}\b", sanitized_title):
-        debug(f"Matched search string: {search_regex} with title: {sanitized_title}")
+        trace(f"Matched search string: {search_regex} with title: {sanitized_title}")
         return True
     else:
         debug(
@@ -718,11 +718,13 @@ def is_valid_release(
         is_tv_search = "sonarr" in rf
         is_docs_search = "lazylibrarian" in rf
 
-        # if search string is NOT an imdb id check search_string_in_sanitized_title - if not match, its not valid
+        # if search string is NOT an imdb id check search_string_in_sanitized_title - if not match, it is not valid
         if not is_docs_search and not is_imdb_id(search_string):
             if not search_string_in_sanitized_title(search_string, title):
                 debug(
-                    f"Skipping {title!r} as it doesn't match sanitized search string: {search_string!r}"
+                    "Skipping {title!r} as it doesn't match sanitized search string: {search_string!r}",
+                    title=title,
+                    search_string=search_string,
                 )
                 return False
 
@@ -730,7 +732,9 @@ def is_valid_release(
         if is_movie_search:
             if not MOVIE_REGEX.match(title):
                 debug(
-                    f"Skipping {title!r} as title doesn't match movie regex: {MOVIE_REGEX.pattern}"
+                    "Skipping {title!r} as title doesn't match movie regex: {pattern!r}",
+                    title=title,
+                    pattern=MOVIE_REGEX.pattern,
                 )
                 return False
             return True
@@ -740,14 +744,19 @@ def is_valid_release(
             # must have some S/E tag present
             if not SEASON_EP_REGEX.search(title):
                 debug(
-                    f"Skipping {title!r} as title doesn't match TV show regex: {SEASON_EP_REGEX.pattern}"
+                    "Skipping {title!r} as title doesn't match TV show regex: {pattern!r}",
+                    title=title,
+                    pattern=SEASON_EP_REGEX.pattern,
                 )
                 return False
             # if caller specified a season or episode, double‑check the match
             if season is not None or episode is not None:
                 if not match_in_title(title, season, episode):
                     debug(
-                        f"Skipping {title!r} as it doesn't match season {season} and episode {episode}"
+                        "Skipping {title!r} as it doesn't match season {season} and episode {episode}",
+                        title=title,
+                        season=season,
+                        episode=episode,
                     )
                     return False
             return True
@@ -757,7 +766,9 @@ def is_valid_release(
             # must NOT have any S/E tag present
             if SEASON_EP_REGEX.search(title):
                 debug(
-                    f"Skipping {title!r} as title matches TV show regex: {SEASON_EP_REGEX.pattern}"
+                    "Skipping {title!r} as title matches TV show regex: {pattern!r}",
+                    title=title,
+                    pattern=SEASON_EP_REGEX.pattern,
                 )
                 return False
             return True