quasarr 1.23.0__py3-none-any.whl → 1.24.0__py3-none-any.whl

quasarr/providers/sessions/al.py

@@ -5,6 +5,7 @@
 import base64
 import json
 import pickle
+import time
 import urllib.parse
 
 import requests
@@ -15,6 +16,8 @@ from quasarr.providers.log import info, debug
 
 hostname = "al"
 
+SESSION_MAX_AGE_SECONDS = 24 * 60 * 60  # 24 hours
+
 
 def create_and_persist_session(shared_state):
     cfg = shared_state.values["config"]("Hostnames")
@@ -55,7 +58,7 @@ def create_and_persist_session(shared_state):
             return None
 
         solution = fs_json["solution"]
-        # store FlareSolverr’s UA into our requests.Session
+        # store FlareSolverr's UA into our requests.Session
         fl_ua = solution.get("userAgent")
         if fl_ua:
             sess.headers.update({'User-Agent': fl_ua})
@@ -98,16 +101,36 @@ def create_and_persist_session(shared_state):
         info(f'Missing credentials for: "{hostname}" - skipping login')
         return None
 
-    blob = pickle.dumps(sess)
-    token = base64.b64encode(blob).decode("utf-8")
-    shared_state.values["database"]("sessions").update_store(hostname, token)
+    _persist_session_to_db(shared_state, sess)
     return sess
 
 
 def retrieve_and_validate_session(shared_state):
     db = shared_state.values["database"]("sessions")
-    token = db.retrieve(hostname)
-    if not token:
+    stored = db.retrieve(hostname)
+    if not stored:
+        return create_and_persist_session(shared_state)
+
+    try:
+        # Try to parse as JSON (new format with timestamp)
+        session_data = json.loads(stored)
+        token = session_data.get("token")
+        created_at = session_data.get("created_at", 0)
+
+        # 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)")
+            invalidate_session(shared_state)
+            return create_and_persist_session(shared_state)
+        else:
+            debug(f"{hostname}: 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")
+        invalidate_session(shared_state)
         return create_and_persist_session(shared_state)
 
     try:
@@ -131,10 +154,15 @@ def invalidate_session(shared_state):
 def _persist_session_to_db(shared_state, sess):
     """
     Serialize & store the given requests.Session into the database under `hostname`.
+    Includes creation timestamp for expiration checking.
     """
     blob = pickle.dumps(sess)
     token = base64.b64encode(blob).decode("utf-8")
-    shared_state.values["database"]("sessions").update_store(hostname, token)
+    session_data = json.dumps({
+        "token": token,
+        "created_at": time.time()
+    })
+    shared_state.values["database"]("sessions").update_store(hostname, session_data)
 
 
 def _load_session_cookies_for_flaresolverr(sess):
@@ -177,13 +205,13 @@ def fetch_via_flaresolverr(shared_state,
     Load (or recreate) the requests.Session from DB.
     Package its cookies into FlareSolverr payload.
     Ask FlareSolverr to do a request.get or request.post on target_url.
-    Replace the Session’s cookies with FlareSolverr’s new cookies.
+    Replace the Session's cookies with FlareSolverr's new cookies.
     Re-persist the updated session to the DB.
-    Return a dict with “status_code”, “headers”, “json” (parsed - if available), “text” and “cookies”.
+    Return a dict with "status_code", "headers", "json" (parsed - if available), "text" and "cookies".
 
     – method: "GET" or "POST"
     – post_data: dict of form‐fields if method=="POST"
-    – timeout: seconds (FlareSolverr’s internal maxTimeout = timeout*1000 ms)
+    – timeout: seconds (FlareSolverr's internal maxTimeout = timeout*1000 ms)
     """
     flaresolverr_url = shared_state.values["config"]('FlareSolverr').get('url')
 

quasarr/providers/version.py

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

quasarr/search/sources/dl.py

@@ -291,8 +291,8 @@ def _search_single_page(shared_state, host, search_string, search_id, page_num,
 def dl_search(shared_state, start_time, request_from, search_string,
               mirror=None, season=None, episode=None):
     """
-    Search with sequential pagination (max 5 pages) to find best quality releases.
-    Stops searching if a page returns 0 results.
+    Search with sequential pagination to find best quality releases.
+    Stops searching if a page returns 0 results or 10 seconds have elapsed.
     """
     releases = []
     host = shared_state.values["config"]("Hostnames").get(hostname)
@@ -306,10 +306,10 @@ def dl_search(shared_state, start_time, request_from, search_string,
         search_string = title
 
     search_string = unescape(search_string)
-    max_pages = 5
+    max_search_duration = 10
 
     debug(
-        f"{hostname}: Starting sequential paginated search for '{search_string}' (Season: {season}, Episode: {episode}) - up to {max_pages} pages")
+        f"{hostname}: Starting sequential paginated search for '{search_string}' (Season: {season}, Episode: {episode}) - max {max_search_duration}s")
 
     try:
         sess = retrieve_and_validate_session(shared_state)
@@ -318,9 +318,13 @@ def dl_search(shared_state, start_time, request_from, search_string,
             return releases
 
         search_id = None
+        page_num = 0
+        search_start_time = time.time()
+
+        # Sequential search through pages until timeout or no results
+        while (time.time() - search_start_time) < max_search_duration:
+            page_num += 1
 
-        # Sequential search through pages
-        for page_num in range(1, max_pages + 1):
             page_releases, extracted_search_id = _search_single_page(
                 shared_state, host, search_string, search_id, page_num,
                 imdb_id, mirror, request_from, season, episode

{quasarr-1.23.0.dist-info → quasarr-1.24.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 1.23.0
+Version: 1.24.0
 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
@@ -44,7 +44,7 @@ Alternatively, follow the link from the console output (or discord notification)
 Quasarr will confidently handle the rest.
 
 # Instructions
-1. Set up and run [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) 3.4.4 or later.
+1. Set up and run [FlareSolverr 3](https://github.com/FlareSolverr/FlareSolverr).
 2. Set up and run [JDownloader 2](https://jdownloader.org/download/index).
 3. Follow the next steps.
 

{quasarr-1.23.0.dist-info → quasarr-1.24.0.dist-info}/RECORD

@@ -1,33 +1,33 @@
 quasarr/__init__.py,sha256=4-EVvIdDjMqidqp3xpXfcDl-fSe0J_B415ueZDAKBss,18137
 quasarr/api/__init__.py,sha256=9Y_DTNYsHeimrXL3mAli8OUg0zqo7QGLF2ft40d3R-c,6822
 quasarr/api/arr/__init__.py,sha256=-e7Sge8mzQCtxlixY2pEJ2p2wQ06TckaczFPUZWCz3c,17361
-quasarr/api/captcha/__init__.py,sha256=oVZ6Fy7Avg5F15t1apZxljK3nFF7Wv5b5FOXQvDcON4,54492
+quasarr/api/captcha/__init__.py,sha256=E9QUmsI61ubiQRcbSknXT-Yhf_mH6fWaMwRPVYWcb9s,55119
 quasarr/api/config/__init__.py,sha256=0K7zqC9dt39Ul1RIJt0zNVdh1b9ARnfC6QFPa2D9FCw,819
 quasarr/api/sponsors_helper/__init__.py,sha256=kAZabPlplPYRG6Uw7ZHTk5uypualwvhs-NoTOjQhhhA,6369
 quasarr/api/statistics/__init__.py,sha256=NrBAjjHkIUE95HhPUGIfNqh2IqBqJ_zm00S90Y-Qnus,7038
-quasarr/downloads/__init__.py,sha256=AGZcafQG7ZKLadYaWmR0HR3lljt-l00llWw3G39Y9vA,13345
+quasarr/downloads/__init__.py,sha256=ZcX-PzMU8Dio8FOIk0PEYxuMgR31ohUS6dZteOunZ08,11555
 quasarr/downloads/linkcrypters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/downloads/linkcrypters/al.py,sha256=pM3NDan8x0WU8OS1GV3HuuV4B6Nm0a-ATrVORvLHt9M,8487
 quasarr/downloads/linkcrypters/filecrypt.py,sha256=GT51x_MG_hW4IpOF6OvL5r-2mTnMijI8K7_1D5Bfn4U,18884
 quasarr/downloads/linkcrypters/hide.py,sha256=kMxjsYZJpC1V3jwYv9b0h4HKBIectLlgglwOmexvFXs,4107
 quasarr/downloads/packages/__init__.py,sha256=Cub3ztyFYBm30HprvZl7qvfYnjaOH9FsRWDLEyCPHkE,18305
 quasarr/downloads/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quasarr/downloads/sources/al.py,sha256=Ulc4fTuX8_gOHeTJzZYEAgUCiFPoyczIdbZh6qA3jzM,26180
-quasarr/downloads/sources/by.py,sha256=VzytGYyy81vjsvNJabohoK8PkjYTKCwXM1TjeD3Ker0,3695
-quasarr/downloads/sources/dd.py,sha256=EQ823wrVusVCVJhh9Rdf67-Yae9XYio8Uj_HW_y5qO0,2841
-quasarr/downloads/sources/dj.py,sha256=b_RR_dqd4Zc9lbZbZbwZijDkXCb42OaU7eOAI4lX9EE,214
-quasarr/downloads/sources/dl.py,sha256=6EfUo3uruMabcbbwfotBAX6yX0m_xQ8_IKbPwCRFefY,7641
-quasarr/downloads/sources/dt.py,sha256=fzAyJy8nmqTAFRObvaRbvsXdBkCo5JuojCJYQMYuPOs,2108
-quasarr/downloads/sources/dw.py,sha256=15UH-kBZt06GS5CDi-TTJGV_H59mQO0Nl-y3nYA5kOk,2504
-quasarr/downloads/sources/he.py,sha256=EZ42WIHE8rwvpvwesaWeG__1dUBq75OQzJ1n7Lgrx1g,3450
-quasarr/downloads/sources/mb.py,sha256=IS5_RdACD3yterFEAj_N7RIH4TVK-VEauZqfya23hmA,1411
-quasarr/downloads/sources/nk.py,sha256=qA1qIOthu-Jt93ykPzE-gvSFEfA5YSIMNDymIWD98Tc,1538
-quasarr/downloads/sources/nx.py,sha256=nI0c-oM1g_EyW06_o2wFgn_jm_Zh1XMy3kbRCN0hw1E,3211
-quasarr/downloads/sources/sf.py,sha256=PDBuWgJmEYmD1b-5blS3YWgrqIhJjfwz91IuiMy6rX8,6224
-quasarr/downloads/sources/sj.py,sha256=d2HC52SFYXUXAr7AIaipthVvL-WpvJaD-8AuN-5Z-I8,214
-quasarr/downloads/sources/sl.py,sha256=w6Mo1dphrZRlXfhBfAhFV8KcPfHINuTiFSNu3BYd46k,2851
-quasarr/downloads/sources/wd.py,sha256=NOilEZIF9rumU2LMtfRfXyet3Mzn2shCs8NFCEC3CHY,3747
-quasarr/downloads/sources/wx.py,sha256=lufMZYNniKWj2x2mfYsEkGw_Qqi3TWg66EgU3uP9TiI,4769
+quasarr/downloads/sources/al.py,sha256=tb7HpMWFnW3VZCAjsk4tFZsh56xygDVmPgpv5cW1q1M,26942
+quasarr/downloads/sources/by.py,sha256=kmUTn3izayRCV7W-t0E4kYE8qTbt3L3reCLozfvRGcU,3807
+quasarr/downloads/sources/dd.py,sha256=8X2tOle3qTq0b60Aa3o0uqp2vNELDHYYj99ERI7U_X0,2971
+quasarr/downloads/sources/dj.py,sha256=wY00hVRNhucZBG1hfExKqayhP1ISD8FFQm7wHYxutOk,404
+quasarr/downloads/sources/dl.py,sha256=-8q3vjgdmLykptLtcehB7NLCAn5YANGWRDrLJu2Xg00,7174
+quasarr/downloads/sources/dt.py,sha256=80yIHAivsqoPKAaFdZ4wPFBVGCbHNUO130pv7EO2LTM,2605
+quasarr/downloads/sources/dw.py,sha256=_28-E58Hs9NVwHyLt2M1oYUxVZ-wpE5dQv8gMNhiAPM,2622
+quasarr/downloads/sources/he.py,sha256=AA6OrIkD3KS_w1ClvXyW1_9hujM6A8P_5VcMHRM6ngg,3680
+quasarr/downloads/sources/mb.py,sha256=bW0ahVOi1OAk8ah1-a2v8d8l9CQgaHP5d3Y_NbA5g2c,1538
+quasarr/downloads/sources/nk.py,sha256=Y7MDbReToxayADrG18_SDPMD8XUbgRP1IV6gd3ITUlA,1716
+quasarr/downloads/sources/nx.py,sha256=ESWGDz07m2kntvTGoNlL9Gleld-HUl9ckphaJA9PUbk,3758
+quasarr/downloads/sources/sf.py,sha256=ecPHNsNiRNXTfQX9MBLzJKqrEc1IpkrKkBXpihTPhkE,6352
+quasarr/downloads/sources/sj.py,sha256=Bkv0c14AXct50n_viaTNK3bYG-Bpvx8x2D0UN_6gm78,404
+quasarr/downloads/sources/sl.py,sha256=jWprFt1Hew1T67fB1O_pc9YWgc3NVh30KXSwSyS50Pc,3186
+quasarr/downloads/sources/wd.py,sha256=0FzfLaUUdrnoybWlTxszmT5a38j9KrlLGhkLNeEuIQ8,3905
+quasarr/downloads/sources/wx.py,sha256=EygMfkgBMZYj3tSk4gvj5DcojkRswGhY_y8FMPNnVeU,4834
 quasarr/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/cloudflare.py,sha256=mJxTYM7JjwIjdO6U_GyVj-dyug6XdD0-ObkYTaPtFVg,7028
 quasarr/providers/html_images.py,sha256=CvJgBs_M5ziTI-ccSQheI7FC1pZWY52R9Elq5WuBwfY,46481
@@ -36,13 +36,13 @@ quasarr/providers/imdb_metadata.py,sha256=10L4kZkt6Fg0HGdNcc6KCtIQHRYEqdarLyaMVN
 quasarr/providers/log.py,sha256=_g5RwtfuksARXnvryhsngzoJyFcNzj6suqd3ndqZM0Y,313
 quasarr/providers/myjd_api.py,sha256=Z3PEiO3c3UfDSr4Up5rgwTAnjloWHb-H1RkJ6BLKZv8,34140
 quasarr/providers/notifications.py,sha256=bohT-6yudmFnmZMc3BwCGX0n1HdzSVgQG_LDZm_38dI,4630
-quasarr/providers/obfuscated.py,sha256=yJYD7fHg0_NAt38WCYwF7n2-aDwOmdECOnbByEGo0i4,270834
+quasarr/providers/obfuscated.py,sha256=i4qoNNpwAVIjiLIhnPPBQJvmZr1ZRCPVYm1uChhY9gg,310748
 quasarr/providers/shared_state.py,sha256=1NUKtm9YXWPvN64By2O2OYH5ke5TmBkJSbSxiNczgtU,29849
 quasarr/providers/statistics.py,sha256=cEQixYnDMDqtm5wWe40E_2ucyo4mD0n3SrfelhQi1L8,6452
-quasarr/providers/version.py,sha256=f2tvL1-FUEKrswJAWmsTImJNtpXq1OcWUrNZzgOGmiE,4004
+quasarr/providers/version.py,sha256=eWfcJssPvgMn9yme0FOgOwBsMWV-m_wgBqquHsd77gc,4004
 quasarr/providers/web_server.py,sha256=XPj98T-axxgotovuB-rVw1IPCkJiNdXBlEeFvM_zSlM,1432
 quasarr/providers/sessions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quasarr/providers/sessions/al.py,sha256=mlP6SWfCY2HyOSV40uyotQ5T4eSBNYG9A5GWOEAdz-c,9589
+quasarr/providers/sessions/al.py,sha256=F1d76eAJcbTvb6YvAIlQ4gfrYC_256QAKiWEQcuWe8k,10612
 quasarr/providers/sessions/dd.py,sha256=JdXjqmjuyY32w0cIlwphRm8Sy43EK8nEEFwyXUkEGb4,2596
 quasarr/providers/sessions/dl.py,sha256=8toAHn5C9FbjHuhjfQEeKR1Fz5tRENrIgFxdjUuXCIU,5381
 quasarr/providers/sessions/nx.py,sha256=qfW12AB_0nNsAoKOaSF4z0T9DCxMQleWCYf3fqJtF2A,2688
@@ -52,7 +52,7 @@ quasarr/search/sources/al.py,sha256=yr6wx-VcSOFYK_o3N1bepC4t6Gvt9eDvcG9fQBFg0bg,
 quasarr/search/sources/by.py,sha256=vnE3L43V8suPhPHcn6LVxKO1e3mJaDRqIIMg2BGxr_g,7915
 quasarr/search/sources/dd.py,sha256=pVpdHLZlw2CYklBf_YLkeDWbCNsDLR2iecccR2c2RyI,4889
 quasarr/search/sources/dj.py,sha256=2HIdg5ddXP4DtjHlyXmuQ8QVhOPt3Hh2kL4uxhFJK-8,7074
-quasarr/search/sources/dl.py,sha256=n7WYKWLLftbNL3uBcGM0n2VaTKspNLfFOTJK3YfkVXw,12375
+quasarr/search/sources/dl.py,sha256=LLA2Pq0PT7ZzhWCueL22d8bm48AJhL6BEmSnmkLHUTk,12540
 quasarr/search/sources/dt.py,sha256=m1kQ7mC43QlWZyVIkw-OXJGjWiT9IbQuFtHWiR8CjhA,9580
 quasarr/search/sources/dw.py,sha256=-daUTBTA5izeatrE7TITVlnzNCQ5HfovYMMZ8UTM-2o,7636
 quasarr/search/sources/fx.py,sha256=JAyD727yDAFIP14bzfi2SkX9paysXGkQdIybShYtdko,8596
@@ -69,9 +69,9 @@ quasarr/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/storage/config.py,sha256=hOI7vvIo1YaML3dtAkTmp0HSedWF6brVhRk3d8pJtXI,6300
 quasarr/storage/setup.py,sha256=Gf7e125KlHsyu-hhq3uFfH7N6i7-8DDONGcYJX0haLs,18261
 quasarr/storage/sqlite_database.py,sha256=yMqFQfKf0k7YS-6Z3_7pj4z1GwWSXJ8uvF4IydXsuTE,3554
-quasarr-1.23.0.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
-quasarr-1.23.0.dist-info/METADATA,sha256=GKotgKKHwPXpqTHbqOyX6J0dYL36cf34DPQ5rDnWkHU,12743
-quasarr-1.23.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-quasarr-1.23.0.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
-quasarr-1.23.0.dist-info/top_level.txt,sha256=dipJdaRda5ruTZkoGfZU60bY4l9dtPlmOWwxK_oGSF0,8
-quasarr-1.23.0.dist-info/RECORD,,
+quasarr-1.24.0.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
+quasarr-1.24.0.dist-info/METADATA,sha256=y6ukkkj66F8rQDNFwHxQOK2y6rBBwZFziFH8LaTyDu8,12730
+quasarr-1.24.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+quasarr-1.24.0.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
+quasarr-1.24.0.dist-info/top_level.txt,sha256=dipJdaRda5ruTZkoGfZU60bY4l9dtPlmOWwxK_oGSF0,8
+quasarr-1.24.0.dist-info/RECORD,,