quasarr 2.3.1__tar.gz → 2.3.3__tar.gz

{quasarr-2.3.1 → quasarr-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.3.1
+Version: 2.3.3
 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-2.3.1 → quasarr-2.3.3}/quasarr/__init__.py

@@ -169,6 +169,14 @@ def run():
                     else:
                         hostname_credentials_config(shared_state, site.upper(), hostname)
 
+        # Check FlareSolverr configuration
+        skip_flaresolverr_db = DataBase("skip_flaresolverr")
+        flaresolverr_skipped = skip_flaresolverr_db.retrieve("skipped")
+        flaresolverr_url = Config('FlareSolverr').get('url')
+
+        if not flaresolverr_url and not flaresolverr_skipped:
+            flaresolverr_config(shared_state)
+
         config = Config('JDownloader')
         user = config.get('user')
         password = config.get('password')
@@ -249,23 +257,33 @@ def flaresolverr_checker(shared_state_dict, shared_state_lock):
         flaresolverr_skipped = skip_flaresolverr_db.retrieve("skipped")
 
         flaresolverr_url = Config('FlareSolverr').get('url')
+        
+        # If FlareSolverr is not configured and not skipped, it means it's the first run
+        # and the user needs to be prompted via the WebUI.
+        # This background process should NOT block or prompt the user.
+        # It should only check and log the status.
         if not flaresolverr_url and not flaresolverr_skipped:
-            flaresolverr_config(shared_state)
-            # Re-check after config - user may have skipped
-            flaresolverr_skipped = skip_flaresolverr_db.retrieve("skipped")
-            flaresolverr_url = Config('FlareSolverr').get('url')
+            info('FlareSolverr URL not configured. Please configure it via the WebUI.')
+            info('Some sites (AL) will not work without FlareSolverr.')
+            return # Exit the checker, it will be re-checked if user configures it later
 
         if flaresolverr_skipped:
             info('FlareSolverr setup skipped by user preference')
             info('Some sites (AL) will not work without FlareSolverr. Configure it later in the web UI.')
         elif flaresolverr_url:
-            print(f'Flaresolverr URL: "{flaresolverr_url}"')
+            info(f'Checking FlareSolverr at URL: "{flaresolverr_url}"')
             flaresolverr_check = check_flaresolverr(shared_state, flaresolverr_url)
             if flaresolverr_check:
-                print(f'Using same User-Agent as FlareSolverr: "{shared_state.values["user_agent"]}"')
+                info(f'FlareSolverr connection successful. Using User-Agent: "{shared_state.values["user_agent"]}"')
+            else:
+                info('FlareSolverr check failed - using fallback user agent')
+                # Fallback user agent is already set in main process, but we log it
+                info(f'User Agent (fallback): "{FALLBACK_USER_AGENT}"')
 
     except KeyboardInterrupt:
         pass
+    except Exception as e:
+        info(f"An unexpected error occurred in FlareSolverr checker: {e}")
 
 
 def update_checker(shared_state_dict, shared_state_lock):

{quasarr-2.3.1 → quasarr-2.3.3}/quasarr/api/config/__init__.py

@@ -288,8 +288,8 @@ def setup_config(app, shared_state):
                         "FlareSolverr URL saved successfully! A restart is recommended.")
                 else:
                     return render_fail(f"FlareSolverr returned unexpected status: {json_data.get('status')}")
-        except requests.RequestException as e:
-            return render_fail(f"Could not reach FlareSolverr: {str(e)}")
+        except requests.RequestException:
+            return render_fail(f"Could not reach FlareSolverr!")
 
         return render_fail("Could not reach FlareSolverr at that URL (expected HTTP 200).")
 

{quasarr-2.3.1 → quasarr-2.3.3}/quasarr/api/sponsors_helper/__init__.py

@@ -33,16 +33,16 @@ def setup_sponsors_helper_routes(app):
             if not protected:
                 return abort(404, "No encrypted packages found")
 
-            # Find the first package without a "session" key
+            # Find the first package that hasn't been disabled
             selected_package = None
             for package in protected:
                 data = json.loads(package[1])
-                if "session" not in data:
+                if "disabled" not in data:
                     selected_package = (package[0], data)
                     break
 
             if not selected_package:
-                return abort(404, "No valid packages without session found")
+                return abort(404, "No valid packages found")
 
             package_id, data = selected_package
             title = data["title"]
@@ -67,9 +67,9 @@ def setup_sponsors_helper_routes(app):
         except Exception as e:
             return abort(500, str(e))
 
-    @app.post("/sponsors_helper/api/to_download/")
+    @app.post("/sponsors_helper/api/download/")
     @require_api_key
-    def to_download_api():
+    def download_api():
         try:
             data = request.json
             title = data.get('name')
@@ -97,51 +97,39 @@ def setup_sponsors_helper_routes(app):
         StatsHelper(shared_state).increment_failed_decryptions_automatic()
         return abort(500, "Failed")
 
-    @app.post("/sponsors_helper/api/to_replace/")
+    @app.post("/sponsors_helper/api/disable/")
     @require_api_key
-    def to_replace_api():
+    def disable_api():
         try:
             data = request.json
-            name = data.get('name')
             package_id = data.get('package_id')
-            password = data.get('password')
-            replace_url = data.get('replace_url')
-            mirror = data.get('mirror')
-            session = data.get('session')
-
-            if not all([name, package_id, replace_url, mirror, session]):
-                info("Missing required replacement data")
-                return {"error": "Missing required replacement data"}, 400
-
-            if password is None:
-                password = ""
-
-            blob = json.dumps(
-                {
-                    "title": name,
-                    "links": [replace_url, mirror],
-                    "size_mb": 0,
-                    "password": password,
-                    "mirror": mirror,
-                    "session": session
-                })
 
-            shared_state.get_db("protected").update_store(package_id, blob)
+            if not package_id:
+                return {"error": "Missing package_id"}, 400
+
+            StatsHelper(shared_state).increment_failed_decryptions_automatic()
 
-            info(f"Another CAPTCHA solution is required for {mirror} link: {replace_url}")
+            blob = shared_state.get_db("protected").retrieve(package_id)
+            package_data = json.loads(blob)
+            title = package_data.get('title')
+
+            package_data["disabled"] = True
+
+            shared_state.get_db("protected").update_store(package_id, json.dumps(package_data))
+
+            info(f"Disabled package {title}")
 
             StatsHelper(shared_state).increment_captcha_decryptions_automatic()
 
-            return f"Replacement link stored for {name}"
+            return f"Package {title} disabled"
 
         except Exception as e:
-            StatsHelper(shared_state).increment_failed_decryptions_automatic()
-            info(f"Error handling replacement: {e}")
+            info(f"Error handling disable: {e}")
             return {"error": str(e)}, 500
 
-    @app.delete("/sponsors_helper/api/to_failed/")
+    @app.delete("/sponsors_helper/api/fail/")
     @require_api_key
-    def move_to_failed_api():
+    def fail_api():
         try:
             StatsHelper(shared_state).increment_failed_decryptions_automatic()
 
@@ -165,7 +153,7 @@ def setup_sponsors_helper_routes(app):
 
     @app.put("/sponsors_helper/api/set_sponsor_status/")
     @require_api_key
-    def activate_sponsor_status():
+    def set_sponsor_status_api():
         try:
             data = request.body.read().decode("utf-8")
             payload = json.loads(data)