quasarr 1.26.4__tar.gz → 1.26.6__tar.gz

{quasarr-1.26.4 → quasarr-1.26.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.26.4
+Version: 1.26.6
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Home-page: https://github.com/rix1337/Quasarr
 Author: rix1337

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr/__init__.py

@@ -10,8 +10,9 @@ import socket
 import sys
 import tempfile
 import time
-from urllib.parse import urlparse
+from urllib.parse import urlparse, urljoin, parse_qs
 
+import dukpy
 import requests
 
 from quasarr.api import get_api
@@ -117,16 +118,21 @@ def run():
         print("\n===== Hostnames =====")
         try:
             if arguments.hostnames:
-                hostnames_link = make_raw_pastebin_link(arguments.hostnames)
-
+                hostnames_link = arguments.hostnames
                 if is_valid_url(hostnames_link):
+                    if "pastebin.com" in hostnames_link:
+                        hostnames_link = make_raw_pastebin_link(hostnames_link)
+
                     print(f"Extracting hostnames from {hostnames_link}...")
                     allowed_keys = supported_hostnames
                     max_keys = len(allowed_keys)
                     shorthand_list = ', '.join(
                         [f'"{key}"' for key in allowed_keys[:-1]]) + ' and ' + f'"{allowed_keys[-1]}"'
                     print(f'There are up to {max_keys} hostnames currently supported: {shorthand_list}')
-                    data = requests.get(hostnames_link).text
+                    if "/ini.html" in hostnames_link:
+                        data = build_ini_from_ini_html(hostnames_link)
+                    else:
+                        data = requests.get(hostnames_link).text
                     results = extract_kv_pairs(data, allowed_keys)
 
                     extracted_hostnames = 0
@@ -413,6 +419,35 @@ def make_raw_pastebin_link(url):
     return url  # Not a Pastebin link, return unchanged
 
 
+def build_ini_from_ini_html(url: str) -> str:
+    def get(u: str) -> str:
+        r = requests.get(u, timeout=10)
+        r.raise_for_status()
+        return r.text
+
+    parsed = urlparse(url)
+    params = parse_qs(parsed.query)
+
+    data_js = get(urljoin(f"{parsed.scheme}://{parsed.netloc}", "data.js"))
+
+    hostnames = dukpy.evaljs("""
+        var window = {};
+        %s
+        window.HOSTNAMES;
+    """ % data_js)
+
+    excluded = set()
+    if "exclude" in params:
+        excluded = set(params["exclude"][0].split(","))
+
+    lines = []
+    for h in hostnames:
+        if h["key"] not in excluded:
+            lines.append(f"{h['key']} = {h['name']}")
+
+    return "\n".join(lines) + "\n"
+
+
 def is_valid_url(url):
     if "https://pastebin.com/raw/eX4Mpl3" in url:
         print("Example URL detected. Please provide a valid URL found on pastebin or another public site!")

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr/api/arr/__init__.py

@@ -353,7 +353,8 @@ def setup_arr_routes(app):
                             <enclosure url="{release.get("link", "")}" length="{release.get("size", 0)}" type="application/x-nzb" />
                         </item>'''
 
-                    if not items:
+                    is_feed_request = not getattr(request.query, 'imdbid', '')
+                    if is_feed_request and not items:
                         items = f'''
                         <item>
                             <title>No results found</title>

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr/providers/version.py

@@ -8,7 +8,7 @@ import requests
 
 
 def get_version():
-    return "1.26.4"
+    return "1.26.6"
 
 
 def get_latest_version():

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr/search/sources/he.py

@@ -90,6 +90,12 @@ def he_search(shared_state, start_time, request_from, search_string="", mirror=N
     else:
         imdb_id = None
 
+    if season:
+        source_search += f" S{int(season):02d}"
+
+    if episode:
+        source_search += f"E{int(episode):02d}"
+
     url = f'https://{host}/tag/{tag}/'
 
     headers = {"User-Agent": shared_state.values["user_agent"]}

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr/search/sources/nk.py

@@ -81,6 +81,12 @@ def nk_search(shared_state, start_time, request_from, search_string="", mirror=N
     else:
         imdb_id = None
 
+    if season:
+        source_search += f" S{int(season):02d}"
+
+    if episode:
+        source_search += f"E{int(episode):02d}"
+
     url = f'https://{host}/search'
     headers = {"User-Agent": shared_state.values["user_agent"]}
     data = {"search": source_search}

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr/search/sources/wx.py

@@ -52,7 +52,7 @@ def wx_feed(shared_state, start_time, request_from, mirror=None):
             items = soup.find_all('item')
 
         if not items:
-            debug(f"{hostname.upper()}: No entries found in RSS feed")
+            info(f"{hostname.upper()}: No entries found in RSS feed")
             return releases
 
         debug(f"{hostname.upper()}: Found {len(items)} entries in RSS feed")
@@ -141,15 +141,15 @@ def wx_search(shared_state, start_time, request_from, search_string, mirror=None
 
     imdb_id = shared_state.is_imdb_id(search_string)
     if imdb_id:
-        info(f"{hostname.upper()}: Received IMDb ID: {imdb_id}")
+        debug(f"{hostname.upper()}: Received IMDb ID: {imdb_id}")
         title = get_localized_title(shared_state, imdb_id, 'de')
         if not title:
-            info(f"{hostname.upper()}: no title for IMDb {imdb_id}")
+            debug(f"{hostname.upper()}: no title for IMDb {imdb_id}")
             return releases
-        info(f"{hostname.upper()}: Translated IMDb {imdb_id} to German title: '{title}'")
+        debug(f"{hostname.upper()}: Translated IMDb {imdb_id} to German title: '{title}'")
         search_string = html.unescape(title)
     else:
-        info(f"{hostname.upper()}: Using search string directly: '{search_string}'")
+        debug(f"{hostname.upper()}: Using search string directly: '{search_string}'")
 
     api_url = f'https://api.{host}/start/search'
 
@@ -179,13 +179,13 @@ def wx_search(shared_state, start_time, request_from, search_string, mirror=None
     elif "radarr" in request_from.lower():
         params['types'] = 'movie'
 
-    info(f"{hostname.upper()}: Searching: '{search_string}'")
+    debug(f"{hostname.upper()}: Searching: '{search_string}'")
 
     try:
         response = requests.get(api_url, headers=headers, params=params, timeout=10)
 
         if response.status_code != 200:
-            info(f"{hostname.upper()}: Search API returned status {response.status_code}")
+            debug(f"{hostname.upper()}: Search API returned status {response.status_code}")
             return releases
 
         data = response.json()
@@ -199,7 +199,7 @@ def wx_search(shared_state, start_time, request_from, search_string, mirror=None
         else:
             items = data if isinstance(data, list) else []
 
-        info(f"{hostname.upper()}: Found {len(items)} items in search results")
+        debug(f"{hostname.upper()}: Found {len(items)} items in search results")
 
         for item in items:
             try:
@@ -208,7 +208,7 @@ def wx_search(shared_state, start_time, request_from, search_string, mirror=None
                     debug(f"{hostname.upper()}: Item has no UID, skipping")
                     continue
 
-                info(f"{hostname.upper()}: Fetching details for UID: {uid}")
+                debug(f"{hostname.upper()}: Fetching details for UID: {uid}")
 
                 detail_url = f'https://api.{host}/start/d/{uid}'
                 detail_response = requests.get(detail_url, headers=headers, timeout=10)
@@ -263,7 +263,7 @@ def wx_search(shared_state, start_time, request_from, search_string, mirror=None
                         })
 
                 if 'releases' in detail_item and isinstance(detail_item['releases'], list):
-                    info(f"{hostname.upper()}: Found {len(detail_item['releases'])} releases for {uid}")
+                    debug(f"{hostname.upper()}: Found {len(detail_item['releases'])} releases for {uid}")
 
                     for release in detail_item['releases']:
                         try:
@@ -323,7 +323,7 @@ def wx_search(shared_state, start_time, request_from, search_string, mirror=None
                 debug(f"{hostname.upper()}: {traceback.format_exc()}")
                 continue
 
-        info(f"{hostname.upper()}: Returning {len(releases)} total releases")
+        debug(f"{hostname.upper()}: Returning {len(releases)} total releases")
 
     except Exception as e:
         info(f"Error in {hostname.upper()} search: {e}")

{quasarr-1.26.4 → quasarr-1.26.6}/quasarr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.26.4
+Version: 1.26.6
 Summary: Quasarr connects JDownloader with Radarr, Sonarr and LazyLibrarian. It also decrypts links protected by CAPTCHAs.
 Home-page: https://github.com/rix1337/Quasarr
 Author: rix1337