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

quasarr/api/arr/__init__.py

@@ -2,7 +2,6 @@
 # Quasarr
 # Project by https://github.com/rix1337
 
-import time
 import traceback
 import xml.sax.saxutils as sax_utils
 from base64 import urlsafe_b64decode
@@ -304,38 +303,29 @@ def setup_arr_routes(app):
                                 </caps>"""
                 elif mode in ["movie", "tvsearch", "book", "search"]:
                     releases = []
-                    cache_key = None
 
                     try:
-                        offset = int(getattr(request.query, "offset", 0))
+                        offset = int(getattr(request.query, "offset", 0) or 0)
                     except (AttributeError, ValueError) as e:
                         debug(f"Error parsing offset parameter: {e}")
                         offset = 0
 
                     try:
-                        limit = int(getattr(request.query, "limit", 100))
+                        limit = int(getattr(request.query, "limit", 9999) or 9999)
                     except (AttributeError, ValueError) as e:
                         debug(f"Error parsing limit parameter: {e}")
-                        limit = 100
+                        limit = 1000
 
                     if mode == "movie":
                         # supported params: imdbid
                         imdb_id = getattr(request.query, "imdbid", "")
-
-                        if imdb_id != "":
-                            cache_key = f"{request_from}::{imdb_id}::${mirror}"
-
-                            if result := results_cache.get(cache_key, offset, limit):
-                                debug(
-                                    f"Returning offset {offset}, limit {limit} for {cache_key}"
-                                )
-                                return result
-
                         releases = get_search_results(
                             shared_state,
                             request_from,
                             imdb_id=imdb_id,
                             mirror=mirror,
+                            offset=offset,
+                            limit=limit,
                         )
 
                     elif mode == "tvsearch":
@@ -343,16 +333,6 @@ def setup_arr_routes(app):
                         imdb_id = getattr(request.query, "imdbid", "")
                         season = getattr(request.query, "season", None)
                         episode = getattr(request.query, "ep", None)
-
-                        if imdb_id != "":
-                            cache_key = f"{request_from}::{imdb_id}::${mirror}::{season}::{episode}"
-
-                            if result := results_cache.get(cache_key, offset, limit):
-                                debug(
-                                    f"Returning offset {offset}, limit {limit} for {cache_key}"
-                                )
-                                return result
-
                         releases = get_search_results(
                             shared_state,
                             request_from,
@@ -360,7 +340,10 @@ def setup_arr_routes(app):
                             mirror=mirror,
                             season=season,
                             episode=episode,
+                            offset=offset,
+                            limit=limit,
                         )
+
                     elif mode == "book":
                         author = getattr(request.query, "author", "")
                         title = getattr(request.query, "title", "")
@@ -370,6 +353,8 @@ def setup_arr_routes(app):
                             request_from,
                             search_phrase=search_phrase,
                             mirror=mirror,
+                            offset=offset,
+                            limit=limit,
                         )
 
                     elif mode == "search":
@@ -380,6 +365,8 @@ def setup_arr_routes(app):
                                 request_from,
                                 search_phrase=search_phrase,
                                 mirror=mirror,
+                                offset=offset,
+                                limit=limit,
                             )
                         else:
                             # sonarr expects this but we will not support non-imdbid searches
@@ -387,9 +374,8 @@ def setup_arr_routes(app):
                                 f"Ignoring search request from {request_from} - only imdbid searches are supported"
                             )
 
+                    # XML Generation (releases are already sliced)
                     items = ""
-                    items_amount = 0
-                    items_processed = 0
                     for release in releases:
                         release = release.get("details", {})
 
@@ -412,43 +398,6 @@ def setup_arr_routes(app):
                             <pubDate>{pub_date}</pubDate>
                             <enclosure url="{release.get("link", "")}" length="{release.get("size", 0)}" type="application/x-nzb" />
                         </item>'''
-                        items_amount += 1
-
-                        if cache_key and items_amount == limit:
-                            items_processed += items_amount
-                            debug(
-                                f"Processed {items_processed}/{len(releases)} releases"
-                            )
-                            results_cache.set(
-                                cache_key,
-                                f"""<?xml version="1.0" encoding="UTF-8"?>
-                                <rss>
-                                    <channel>
-                                        {items}
-                                    </channel>
-                                </rss>""",
-                                items_processed - items_amount,
-                                limit,
-                            )
-                            items = ""
-                            items_amount = 0
-
-                    if cache_key and items_amount > 0:
-                        items_processed += items_amount
-                        debug(f"Processed {items_processed}/{len(releases)} releases")
-                        results_cache.set(
-                            cache_key,
-                            f"""<?xml version="1.0" encoding="UTF-8"?>
-                                <rss>
-                                    <channel>
-                                        {items}
-                                    </channel>
-                                </rss>""",
-                            items_processed - items_amount,
-                            limit,
-                        )
-                        items = ""
-                        items_amount = 0
 
                     requires_placeholder_item = not getattr(
                         request.query, "imdbid", ""
@@ -464,13 +413,6 @@ def setup_arr_routes(app):
                             <enclosure url="https://github.com/rix1337/Quasarr" length="0" type="application/x-nzb" />
                         </item>"""
 
-                    if cache_key:
-                        if result := results_cache.get(cache_key, offset, limit):
-                            debug(
-                                f"Returning offset {offset}, limit {limit} for {cache_key}"
-                            )
-                            return result
-
                     return f"""<?xml version="1.0" encoding="UTF-8"?>
                                 <rss>
                                     <channel>
@@ -492,39 +434,3 @@ def setup_arr_routes(app):
 
         info(f"[ERROR] Unknown general request: {dict(request.query)}")
         return {"error": True}
-
-
-class ResultsCache:
-    def __init__(self):
-        self.last_cleaned = time.time()
-        self.cache = {}
-
-    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]
-
-        self.last_cleaned = now
-
-    def get(self, key, offset, limit):
-        key = key + f"::{offset}::{limit}"
-        value, expiry = self.cache.get(key, (None, 0))
-        if time.time() < expiry:
-            return value
-
-        return None
-
-    def set(self, key, value, offset, limit, ttl=300):
-        now = time.time()
-        key = key + f"::{offset}::{limit}"
-        self.cache[key] = (value, now + ttl)
-        self.clean(now)
-
-
-results_cache = ResultsCache()

quasarr/downloads/linkcrypters/al.py

@@ -254,7 +254,7 @@ def solve_captcha(
         method="POST",
         target_url=captcha_base,
         post_data={"cID": 0, "pC": identified_captcha_image, "rT": 2},
-        timeout=60,
+        timeout=30,
     )
 
     return {"response": result["text"], "captcha_id": identified_captcha_image}

quasarr/providers/cloudflare.py

@@ -169,7 +169,7 @@ class FlareSolverrResponse:
             raise requests.HTTPError(f"{self.status_code} Error at {self.url}")
 
 
-def flaresolverr_get(shared_state, url, timeout=60, session_id=None):
+def flaresolverr_get(shared_state, url, timeout=30, session_id=None):
     """
     Core function for performing a GET request via FlareSolverr only.
     Used internally by FlareSolverrSession.get()

quasarr/providers/imdb_metadata.py

@@ -236,7 +236,7 @@ class IMDbFlareSolverr:
                 flaresolverr_url,
                 json=post_data,
                 headers={"Content-Type": "application/json"},
-                timeout=60,
+                timeout=30,
             )
             if response.status_code == 200:
                 json_response = response.json()

quasarr/providers/version.py

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

quasarr/search/__init__.py

@@ -35,6 +35,8 @@ 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}"
@@ -150,25 +152,41 @@ def get_search_results(
 
     # Clean description for Console UI
     if imdb_id:
-        desc_text = f"Searching for IMDb-ID {imdb_id}"
         stype = f"IMDb-ID <b>{imdb_id}</b>"
     elif search_phrase:
-        desc_text = f"Searching for '{search_phrase}'"
         stype = f"Search-Phrase <b>{search_phrase}</b>"
     else:
-        desc_text = "Running Feed Search"
         stype = "<b>feed</b> search"
 
     debug(f"Starting <g>{len(search_executor.searches)}</g> searches for {stype}...")
 
-    results = search_executor.run_all(desc_text)
+    # Unpack the new return values (all_cached, min_ttl)
+    results, status_bar, all_cached, min_ttl = 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 <g>{len(results)} releases</g> to <d>{request_from}</d> for {stype}. <blue>Time taken: {elapsed_time:.2f} seconds</blue>"
+        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:
@@ -182,63 +200,62 @@ class SearchExecutor:
         key = hash((func.__name__, key_args, frozenset(kwargs.items())))
         self.searches.append((key, lambda: func(*args, **kwargs), use_cache))
 
-    def run_all(self, description):
+    def run_all(self):
         results = []
         future_to_meta = {}
 
+        # Track cache state
+        all_cached = len(self.searches) > 0
+        min_ttl = float("inf")
+        bar_str = ""  # Initialize to prevent UnboundLocalError on full cache
+
         with ThreadPoolExecutor() as executor:
             current_index = 0
             pending_futures = []
-            cache_used = False
 
             for key, func, use_cache in self.searches:
                 cached_result = None
+                exp = 0
+
                 if use_cache:
-                    cached_result = search_cache.get(key)
+                    # 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}")
-                    cache_used = True
                     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
 
-            # Prepare list to track status of each provider
-            # Icons will be filled in as threads complete
-            total_active = len(pending_futures)
-            icons = ["▪️"] * total_active
-
-            for future in as_completed(pending_futures):
-                index, cache_key = future_to_meta[future]
-                try:
-                    res = future.result()
-                    if res and len(res) > 0:
-                        status = "✅"
-                    else:
-                        status = "⚪"
-
-                    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}")
+            if pending_futures:
+                icons = ["▪️"] * len(pending_futures)
 
-            # Log the final status summary if any searches were performed
-            if total_active > 0:
-                bar_str = "".join(icons)
-                info(f"{description} [{bar_str}]")
+                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}")
 
-            if cache_used:
-                info("Presenting cached results for some items.")
+                bar_str = f" [{''.join(icons)}]"
 
-        return results
+        return results, bar_str, all_cached, min_ttl
 
 
 class SearchCache:
@@ -256,7 +273,8 @@ class SearchCache:
 
     def get(self, key):
         val, exp = self.cache.get(key, (None, 0))
-        return val if time.time() < exp else None
+        # 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-2.7.0.dist-info → quasarr-2.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.7.0
+Version: 2.7.1
 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.0.dist-info → quasarr-2.7.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
 quasarr/__init__.py,sha256=nh1MU1Evh0G1Pm657qtMMWWX4NSHm6PpETqGFtK2QLE,17197
 quasarr/api/__init__.py,sha256=2CXR0JEjC3zooTB8Bk-z_aZgVM2cPE9ijfO5yJAE9CE,20142
-quasarr/api/arr/__init__.py,sha256=1NcjcfNOjzTQCUDedTGJluK0xU-6krh0T8QSGu7eoeU,22283
+quasarr/api/arr/__init__.py,sha256=0g-2yJC73xfaPz7dWplWI5_ggGqw5kYwGm38wOYjGXM,18844
 quasarr/api/captcha/__init__.py,sha256=9wBmdYKn0DImiFatHe4y2icV57d4710vfXFncvPKki8,78030
 quasarr/api/config/__init__.py,sha256=FJZHALhL6NExonhCk53vOYnM1ICkmbTRue5UMCy5Yzg,8813
 quasarr/api/jdownloader/__init__.py,sha256=SixcV-sgMAunjAT5LawASb1qSuOOokorQo2F7cQ3jZ4,9427
@@ -9,7 +9,7 @@ quasarr/api/sponsors_helper/__init__.py,sha256=QAFXK_JTtAnstRAlieCbbCsoTwIcBu7ZX
 quasarr/api/statistics/__init__.py,sha256=rJz6S4jSnpFDWtjU7O-2jECUEqlueOHOEfRUjSb3cMY,7943
 quasarr/downloads/__init__.py,sha256=571QRloySskkg-JRi7JjyrKyfZIRnd9WgotbOOZ9k0s,17364
 quasarr/downloads/linkcrypters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quasarr/downloads/linkcrypters/al.py,sha256=sNdEl1gogVn2xerd5fSOkAOgEF2sslQr81g34Jhu5So,8996
+quasarr/downloads/linkcrypters/al.py,sha256=_a5kbSLtwOf6y6gN_8_ZpJxvzWJa3lLQTqcTvk_Cjgo,8996
 quasarr/downloads/linkcrypters/filecrypt.py,sha256=yMkDM_GVOd3Bl9lgPkL1BDDuYOpMgxnVwlqRtskZ0Xo,17729
 quasarr/downloads/linkcrypters/hide.py,sha256=t9p_Hb5taJDuRAPaWZw7T1GTcLVgd8keD9LlZJ1-Gsg,6266
 quasarr/downloads/packages/__init__.py,sha256=MdKug4D-ex6sJBJuM0mi3_IjXX7AjV5ryUonOs2aupc,34887
@@ -33,11 +33,11 @@ quasarr/downloads/sources/wd.py,sha256=Xh5cvsGGBfM7iYWmBktmRHaWX6vZBRerBy-L8ycJW
 quasarr/downloads/sources/wx.py,sha256=b3_--zovX4BrknzGEmdh_QQw72dtyPfIrI_me_KyVjo,6772
 quasarr/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/auth.py,sha256=qDdXr28SJ078Q8AVZ_50Z1FwVhfuinOtRl6JHF4RgnM,10412
-quasarr/providers/cloudflare.py,sha256=oLtwQ_UElLIWJ-c-qH2c9NUjsZtlmzYpXlAWhQcE1FM,9076
+quasarr/providers/cloudflare.py,sha256=gwcznTQXZ0Xc0G5kLy42Ix90_MicAdN55BSLjrw9LyE,9076
 quasarr/providers/hostname_issues.py,sha256=SpnZAxOLejSXJGFnYkCrRzR8D0IQsTMtylM-O0h21Z0,1462
 quasarr/providers/html_images.py,sha256=xmxfNwqAqQimVaOq7IelkxlBdcRpPZZLGli_MJDOacI,19755
 quasarr/providers/html_templates.py,sha256=e5b66N47y5Uq7Ikwcm6kOWiyXZ7Bz4gqg2DcajIBGgE,16360
-quasarr/providers/imdb_metadata.py,sha256=JP9YQ7jU1H2-dify6q-qE7gpbJ9ospY4evNLQaa4FDY,21946
+quasarr/providers/imdb_metadata.py,sha256=IOsmk3-e8b-CUJmbfn-dwFZbP33VOAjt095ji8tyM7A,21946
 quasarr/providers/jd_cache.py,sha256=RZsjw9X8wouVH__T2EG7w18CLUrxKh73BHnk_rpHdgE,13534
 quasarr/providers/log.py,sha256=E5g5Angdn9iflW_Z0PNbAmhVK_ZC6IwLnOaJ_mVarqM,7018
 quasarr/providers/myjd_api.py,sha256=hCWVU5IAl7QQV_icMF0B91y7CLLM_j2xfyByTP7an0g,35206
@@ -46,14 +46,14 @@ quasarr/providers/obfuscated.py,sha256=IAN0-5m6UblLjaFdPhRy75ryqDMF0nlbkClq5-n1b
 quasarr/providers/shared_state.py,sha256=alUxC0KJQEGsERcHUSn-nSY53PcUjmgHk5R04kj_hOs,33247
 quasarr/providers/statistics.py,sha256=1X_Aa7TE3W7ovwkemVMsgIx55Jw3eYMiyUxuCUDgO5s,8666
 quasarr/providers/utils.py,sha256=FR0tGwao1ytYtWbmUocaHwt29pHKqskKMH2YE2bgSFI,12481
-quasarr/providers/version.py,sha256=vYbQKxf4PPBZ1AradCg9Rn9q7TQrQLaNkfDHTi2Cs_k,4424
+quasarr/providers/version.py,sha256=rlliPV3fGhAn-87DmPCAlY0Q74O2bvpzbG_pIl3ikSE,4424
 quasarr/providers/web_server.py,sha256=tHkMxhV6eaHC8cWsEpbUqD_U29IFE24VsU6tjk-xCEM,1765
 quasarr/providers/sessions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/sessions/al.py,sha256=AOWl1v-wcwxUeo1bRizd7zAzbUludsFbgCGICHCVZFQ,13270
 quasarr/providers/sessions/dd.py,sha256=K503Ny-3zWolzpGVane4ag5Gu1yzPv49eni0I8Hw4v8,3353
 quasarr/providers/sessions/dl.py,sha256=PnyuX_h4gQIk81w0NKYCFxpg-Il0gi72BQxbdLED1ds,5820
 quasarr/providers/sessions/nx.py,sha256=BkEMEVAiJQBlsGQYw4ZTSyys8Ua-WToAmqL0Il41OAg,3491
-quasarr/search/__init__.py,sha256=ggQG8NreFQ4IU6SAigh3YXCScUcQbcQjf3-nyfICOoQ,8162
+quasarr/search/__init__.py,sha256=O3rj40brKvimHRA2YAlk9aBL9lh3NvKDZ5c_MSJc2pQ,8790
 quasarr/search/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/search/sources/al.py,sha256=2RsaIfA4o3uMZuJZwPh1tETdLkNeAQ6-ymFVBL706Po,18206
 quasarr/search/sources/by.py,sha256=cgy39DN0LIMqO9Yfs6mx7Uio9unuEk4Our562BKQWz0,8971
@@ -77,8 +77,8 @@ quasarr/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/storage/config.py,sha256=sjpfVq_Bxkj9gVwCXB_MAreB9ezf-YEJQKxQmQhUv9s,6540
 quasarr/storage/setup.py,sha256=zb83kvQfxMFHxC7EvWWaVTy0MtG7iEjMRyfY4hdcbOk,61520
 quasarr/storage/sqlite_database.py,sha256=tmHUotMWIwtyH-g244WvcGhMQMMjGokncv7JpFSi8NM,3639
-quasarr-2.7.0.dist-info/METADATA,sha256=NtSLKAF7rVh-4Y_5M1ibnP8fgG7EOS8jdy1h_qZsjdA,14822
-quasarr-2.7.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-quasarr-2.7.0.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
-quasarr-2.7.0.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
-quasarr-2.7.0.dist-info/RECORD,,
+quasarr-2.7.1.dist-info/METADATA,sha256=ZDpw6B-2AFHJZo-jop8bZa9CbFmaRAjTrKjpSDmp-bE,14822
+quasarr-2.7.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+quasarr-2.7.1.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
+quasarr-2.7.1.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
+quasarr-2.7.1.dist-info/RECORD,,