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

quasarr/storage/setup.py

@@ -947,7 +947,7 @@ def save_flaresolverr_url(shared_state, is_setup=False):
         if is_setup:
             quasarr.providers.web_server.temp_server_success = True
 
-        return render_reconnect_success("FlareSolverr URL cleared (setup skipped).")
+        return render_reconnect_success("FlareSolverr URL cleared.")
 
     if not url.startswith("http://") and not url.startswith("https://"):
         url = "http://" + url
@@ -958,41 +958,23 @@ def save_flaresolverr_url(shared_state, is_setup=False):
             "FlareSolverr URL must end with /v1 (or similar version path)."
         )
 
-    try:
-        headers = {"Content-Type": "application/json"}
-        data = {
-            "cmd": "request.get",
-            "url": "http://www.google.com/",
-            "maxTimeout": 30000,
-        }
-        resp = requests.post(url, headers=headers, json=data, timeout=30)
-        if resp.status_code == 200:
-            json_data = resp.json()
-            if json_data.get("status") == "ok":
-                config.save("url", url)
-                # Clear skip preference since we now have a working URL
-                DataBase("skip_flaresolverr").delete("skipped")
-
-                # Update user agent from FlareSolverr response
-                solution = json_data.get("solution", {})
-                solution_ua = solution.get("userAgent")
-                if solution_ua:
-                    shared_state.update("user_agent", solution_ua)
-
-                info(f'FlareSolverr URL configured: "{url}"')
-
-                if is_setup:
-                    quasarr.providers.web_server.temp_server_success = True
+    flaresolverr_check = check_flaresolverr(shared_state, url)
+    if flaresolverr_check:
+        config.save("url", url)
+        # Clear skip preference since we now have a working URL
+        DataBase("skip_flaresolverr").delete("skipped")
 
-                return render_reconnect_success("FlareSolverr URL saved successfully!")
-            else:
-                return render_fail(
-                    f"FlareSolverr returned unexpected status: {json_data.get('status')}"
-                )
-    except requests.RequestException:
-        return render_fail("Could not reach FlareSolverr!")
+        info(
+            f'FlareSolverr connection successful. Using User-Agent: "{shared_state.values["user_agent"]}"'
+        )
+        info(f'FlareSolverr URL configured: "{url}"')
 
-    return render_fail("Could not reach FlareSolverr at that URL (expected HTTP 200).")
+        if is_setup:
+            quasarr.providers.web_server.temp_server_success = True
+
+        return render_reconnect_success("FlareSolverr URL saved successfully!")
+    else:
+        return render_fail("Could not reach FlareSolverr!")
 
 
 def get_flaresolverr_status_data(shared_state):
@@ -1446,6 +1428,78 @@ def flaresolverr_config(shared_state):
     ).serve_temporarily()
 
 
+def verify_jdownloader_credentials(shared_state):
+    """Verify JDownloader credentials and return devices."""
+    response.content_type = "application/json"
+    try:
+        data = request.json
+        username = data.get("user")
+        password = data.get("pass")
+
+        devices = shared_state.get_devices(username, password)
+        device_names = []
+
+        if devices:
+            for device in devices:
+                device_names.append(device["name"])
+
+        if device_names:
+            return {"success": True, "devices": device_names}
+        else:
+            return {
+                "success": False,
+                "message": "No devices found or invalid credentials",
+            }
+    except Exception as e:
+        return {"success": False, "message": str(e)}
+
+
+def save_jdownloader_settings(shared_state, is_setup=False):
+    """Save JDownloader settings."""
+    # Handle both JSON (from main UI) and Form (from setup UI)
+    if request.json:
+        username = request.json.get("user")
+        password = request.json.get("pass")
+        device = request.json.get("device")
+    else:
+        username = request.forms.get("user")
+        password = request.forms.get("pass")
+        device = request.forms.get("device")
+
+    if username and password and device:
+        # Verify connection works before saving credentials
+        if shared_state.set_device(username, password, device):
+            config = Config("JDownloader")
+            config.save("user", username)
+            config.save("password", password)
+            config.save("device", device)
+
+            if is_setup:
+                quasarr.providers.web_server.temp_server_success = True
+                return render_reconnect_success("Credentials set")
+            else:
+                response.content_type = "application/json"
+                return {
+                    "success": True,
+                    "message": "JDownloader configured successfully",
+                }
+        else:
+            if is_setup:
+                return render_fail("Could not connect to selected device!")
+            else:
+                response.content_type = "application/json"
+                return {
+                    "success": False,
+                    "message": "Could not connect to selected device",
+                }
+
+    if is_setup:
+        return render_fail("Could not set credentials!")
+    else:
+        response.content_type = "application/json"
+        return {"success": False, "message": "Missing required fields"}
+
+
 def jdownloader_config(shared_state):
     app = Bottle()
     add_no_cache_headers(app)
@@ -1549,39 +1603,11 @@ def jdownloader_config(shared_state):
 
     @app.post("/api/verify_jdownloader")
     def verify_jdownloader():
-        data = request.json
-        username = data["user"]
-        password = data["pass"]
-
-        devices = shared_state.get_devices(username, password)
-        device_names = []
-
-        if devices:
-            for device in devices:
-                device_names.append(device["name"])
-
-        if device_names:
-            return {"success": True, "devices": device_names}
-        else:
-            return {"success": False}
+        return verify_jdownloader_credentials(shared_state)
 
     @app.post("/api/store_jdownloader")
     def store_jdownloader():
-        username = request.forms.get("user")
-        password = request.forms.get("pass")
-        device = request.forms.get("device")
-
-        if username and password and device:
-            # Verify connection works before saving credentials
-            if shared_state.set_device(username, password, device):
-                config = Config("JDownloader")
-                config.save("user", username)
-                config.save("password", password)
-                config.save("device", device)
-                quasarr.providers.web_server.temp_server_success = True
-                return render_reconnect_success("Credentials set")
-
-        return render_fail("Could not set credentials!")
+        return save_jdownloader_settings(shared_state, is_setup=True)
 
     info(
         f"My-JDownloader-Credentials not set. "

{quasarr-2.5.0.dist-info → quasarr-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: quasarr
-Version: 2.5.0
+Version: 2.6.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.5.0.dist-info → quasarr-2.6.1.dist-info}/RECORD

@@ -1,12 +1,13 @@
-quasarr/__init__.py,sha256=da03581ho1rtPtd-62bpAybQPamSQm3ONivCF4_kT1k,17137
-quasarr/api/__init__.py,sha256=ulvqXi05zeaE3xE-7M-V8y-dDBUlpaIukj5wvsDTIz4,19799
-quasarr/api/arr/__init__.py,sha256=NzyzFmRSGwGwg-wmyxa-EzXda1i6W59r4ZbRe5ireJc,18156
-quasarr/api/captcha/__init__.py,sha256=NQW5qe_ykttD-3pRimB50oIA3n3KGO0jDKeEgia2IE4,75526
-quasarr/api/config/__init__.py,sha256=Qx1M1ECnqw2XsIQNs91EwRb2E0COVJ1J3Ji_bR6IifM,8467
-quasarr/api/packages/__init__.py,sha256=DOupHd2xlpzEC23ZM3R7jHJqSPL2BAkR4p8J8DAgkkI,31066
+quasarr/__init__.py,sha256=ZgxPUmVmiI3XYfocjzWNJNAGda6sO0o3OqOEFOPOQZc,16982
+quasarr/api/__init__.py,sha256=KrbMcvcPPJ3q299dBOmCJEixdZ4ftAiC1MJ_3pu8ep0,20180
+quasarr/api/arr/__init__.py,sha256=z6Cx9GqPti6zt_bVPHUmGVSdxvIYLRuL7TL7Sd5VPGI,18487
+quasarr/api/captcha/__init__.py,sha256=PPiIaW4w5qZWcm9MkEidsKFS0uaooPMtca5Cc5dL8mM,75225
+quasarr/api/config/__init__.py,sha256=FJZHALhL6NExonhCk53vOYnM1ICkmbTRue5UMCy5Yzg,8813
+quasarr/api/jdownloader/__init__.py,sha256=SixcV-sgMAunjAT5LawASb1qSuOOokorQo2F7cQ3jZ4,9427
+quasarr/api/packages/__init__.py,sha256=4T6pw0N1DKpTCj2mAgdPOjo__nhxr56aEqZOiFvPvb0,30679
 quasarr/api/sponsors_helper/__init__.py,sha256=QAFXK_JTtAnstRAlieCbbCsoTwIcBu7ZX8C3U4jZpR0,6475
 quasarr/api/statistics/__init__.py,sha256=rJz6S4jSnpFDWtjU7O-2jECUEqlueOHOEfRUjSb3cMY,7943
-quasarr/downloads/__init__.py,sha256=dSgOGiv_PPj5B5NUQGYS5Ej4YSvNqjTIhJgUBhUfqMc,17187
+quasarr/downloads/__init__.py,sha256=7LnhWeQVGjkAhDF8VbP4KbyNyfWxJ5yErF4HDzqNrGQ,17283
 quasarr/downloads/linkcrypters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/downloads/linkcrypters/al.py,sha256=0tgzTwoNjizeIfVoWyJIihlKVg3T5qOmLBJJKAPFfxY,8983
 quasarr/downloads/linkcrypters/filecrypt.py,sha256=SRUToJ5PpjWNL4n40Q8CYqxLYkyOMd1ce2QJGc1bqRE,17811
@@ -21,61 +22,63 @@ quasarr/downloads/sources/dl.py,sha256=HYdlRhBhG5TjK6NadrUwBLI532LdL87gpXbAJY_7T
 quasarr/downloads/sources/dt.py,sha256=12Iiwr3ZMUivHDG4bjJHyM5vx3Dmfu3IKDd13sYKlUg,3166
 quasarr/downloads/sources/dw.py,sha256=LgkHlYbA2nifLMMuoqZPpun-dLsmTYqIIhM6BB7i898,2993
 quasarr/downloads/sources/he.py,sha256=uTsZlPYvRo9lHjNCviSEDzde8IoLnf9VGE-b-S7VJ7s,4062
+quasarr/downloads/sources/hs.py,sha256=aZKtYg0RqZEyvo76_IlRpVWwFSc9BWvAyn-M8IaDxU4,4752
 quasarr/downloads/sources/mb.py,sha256=nKO8y0fj-LP9QTXJs0Wxw21yXqe7N6xEYJ9UK2_mPeE,1947
 quasarr/downloads/sources/nk.py,sha256=qNdQqoP6czgypf3sPcoxDl6fIwrMWAzNv6rKXIKlpWc,2104
 quasarr/downloads/sources/nx.py,sha256=Kn3Nn87NcrKada3j8jpTlunKJ7-ggDyQOiRSoCdxySk,3670
 quasarr/downloads/sources/sf.py,sha256=f_jC4Shnl2GWCro6JcBLjbmZA8nSPVPr4vdf0WR_r7k,6927
 quasarr/downloads/sources/sj.py,sha256=h3x7F8UUPvcyTf6gkKn6fBLTFeQjvqD7MJ1TtuiqhUU,390
 quasarr/downloads/sources/sl.py,sha256=G5TehRfrdlNT-jJ1PiSEzq1IWqL2UCq73LIMqvYef2c,3573
-quasarr/downloads/sources/wd.py,sha256=mUFvH1OptEOBfQMw6TmucfC-Da8lpf-ThLGyK1oh_Xc,5135
+quasarr/downloads/sources/wd.py,sha256=pmXkScWTrMvQHTOx770M_caF92VIKvHmUu1ncqrmxvY,6042
 quasarr/downloads/sources/wx.py,sha256=-6SEY_3lvtONZXxkit4MIYLHsPY9Z1VzOvv5MYbDag8,7091
 quasarr/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/auth.py,sha256=mLd22xsTO29rgPwEU9SkFHRLuYxev-_11TQXicXLon8,10570
-quasarr/providers/cloudflare.py,sha256=mnq8NZN_NZlmWC5Mg-s51pSIlA7i8O4kYgGbxd_vumA,7759
+quasarr/providers/cloudflare.py,sha256=K5fd0cbVvppYpulz_aYQnyXhkFTZA6ZiwL6v_t_HrC8,9021
 quasarr/providers/hostname_issues.py,sha256=SpnZAxOLejSXJGFnYkCrRzR8D0IQsTMtylM-O0h21Z0,1462
 quasarr/providers/html_images.py,sha256=xmxfNwqAqQimVaOq7IelkxlBdcRpPZZLGli_MJDOacI,19755
-quasarr/providers/html_templates.py,sha256=yNDkJ-ETeAw11UuUiAPkv3dAw9DIFF__neFQUM5QEvw,15878
+quasarr/providers/html_templates.py,sha256=e5b66N47y5Uq7Ikwcm6kOWiyXZ7Bz4gqg2DcajIBGgE,16360
 quasarr/providers/imdb_metadata.py,sha256=ZKnB7Ep3cjeCnie6-NCoYwTQzWb4mlm5NUUL95bD7fs,21999
 quasarr/providers/jd_cache.py,sha256=l9eNNUZhadygQ2HvhHPjW4IfFTzJOZNStSdi7tNfzkQ,14724
 quasarr/providers/log.py,sha256=wn-cQVbWFxjFXRR4TlBiDnFB3SxaJrGKX-NKg5OjUvw,313
 quasarr/providers/myjd_api.py,sha256=06NWo8MqRHp9fU363OhcXQGHLKxsnMSygu-4JdtGrrs,34225
 quasarr/providers/notifications.py,sha256=fL0HQdk7jBLXToM_URQiJq6y2UAHs0RzMFMCFdb3SHQ,4894
 quasarr/providers/obfuscated.py,sha256=IAN0-5m6UblLjaFdPhRy75ryqDMF0nlbkClq5-n1bQQ,2275634
-quasarr/providers/shared_state.py,sha256=PtViw25o-3mYTbFfbJpGb2F_QB8TNy4Ov1Jb8JAR09A,32690
+quasarr/providers/shared_state.py,sha256=Pv7UUaoPtsl7Rp_vbK_fAnyzlEAdn9Hj_DcVJ4LROqs,32789
 quasarr/providers/statistics.py,sha256=1X_Aa7TE3W7ovwkemVMsgIx55Jw3eYMiyUxuCUDgO5s,8666
 quasarr/providers/utils.py,sha256=YXW34xi8569-Tr-cpr8GyOCrWvZ_GKWrX5x0-sxMpOU,12169
-quasarr/providers/version.py,sha256=FuV1qOy3P-mS-Hi_PRoY4Zm1j5MK_HaUNm7udgRyRcI,4424
+quasarr/providers/version.py,sha256=peW1DQ2L5XTmtez6gPVEC0say4xucb1RNTyv0_NDmqY,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=VvqqgmwzZfCI_pIvzxvdaIvuBiqANbkkiJNEOBKW3zA,13456
+quasarr/providers/sessions/al.py,sha256=obDBotLA8vhbSsIw3VErj-FujVgYc4RimqxLqycfbVE,13569
 quasarr/providers/sessions/dd.py,sha256=OImrnHCXeeGqPOSMnwGH7897EVZWA9fqH2yzk4FQqcA,3375
 quasarr/providers/sessions/dl.py,sha256=fKnakgGp0vhTRYP2m4HWbcX3ZuqaqSqoRNtismtU314,5973
 quasarr/providers/sessions/nx.py,sha256=qY1i0Nxx32S8j2QQEP6SHn5XxZmic7shyaBuaVAxV34,3513
-quasarr/search/__init__.py,sha256=XupcFNsTp5laLQ7mE-XiJ_1R2Ey9Kt5vXW-p88LNSi4,7962
+quasarr/search/__init__.py,sha256=K2y46W4xV9ubH9KqwVGh5N-UhWwFVWqVbsCja3qcZYI,8129
 quasarr/search/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quasarr/search/sources/al.py,sha256=BvVL4RoPpObhS2TVms4rPvs_kdoIrYkiyG22PdA0g3E,18279
-quasarr/search/sources/by.py,sha256=jakh4w3u9NQrGhV2t3ZwsS9ZKgE2_dcYyd9pPUH4cQo,8926
-quasarr/search/sources/dd.py,sha256=GdXalOUK1YPzqrHP7G4djnAGNUbqJdOjFFFQ9aMG4ls,5725
+quasarr/search/sources/al.py,sha256=8AGAcAiEzqHcW76nPIFn417B9CaVgneEtkYiQhq2MzY,18429
+quasarr/search/sources/by.py,sha256=Hk9RArTmWqcE4AxxDVy2l3-64vPpLHpeqME5nrkWBiQ,9045
+quasarr/search/sources/dd.py,sha256=oMK6kcoNbUc5veQ3224aM9Y2yooysN2gCyKmtUH7ylI,6296
 quasarr/search/sources/dj.py,sha256=f-snv7zPYdmQM50XUiGCjHtwl0JnnJ-1R-GW1sjaJH0,7825
-quasarr/search/sources/dl.py,sha256=eyYAZz0MfvrizWxvqsVBoupy-kg2mKc42TAdB_rXK4k,13801
+quasarr/search/sources/dl.py,sha256=WhOoUPLqJfWmJH8wgEkz3Rg5fChqH_Jp8q58NKZgekE,14323
 quasarr/search/sources/dt.py,sha256=i_JSxydoASLlTRRhPk5av0fgzw1xhtAkjeF2_7KxbkM,10675
 quasarr/search/sources/dw.py,sha256=ZRWwA4PljLMyBqN1V9SThcL9Bc4KzR4k-7F2LecIMeM,8803
 quasarr/search/sources/fx.py,sha256=J2yUn8_1zMgPlJ9RPeBXoVD-KhSwj97CUQaVMgs8N3U,10297
 quasarr/search/sources/he.py,sha256=X-eyVWkDXsKjXDBLRGoFiA5qA8Z4NeO-jJfygnxnWZg,7762
-quasarr/search/sources/mb.py,sha256=DaNOppqCNVtkGamBbULlT04UP9AzJh-nDPycYrU1Kz4,8476
+quasarr/search/sources/hs.py,sha256=TVVlvPl_DWogoUV7eUTWQXAYR7PVL2AMjHwi2_9esTY,17827
+quasarr/search/sources/mb.py,sha256=iwjMYEiHWicJY5psch5Xsd04XH5KOM98cvysUYesz9Y,8210
 quasarr/search/sources/nk.py,sha256=vU9aK2EjjR6ZF1QP4r4CzcF1qO7LEjuZ_qsf_nKvSc4,7554
-quasarr/search/sources/nx.py,sha256=ABc_B6Pi_SBKGvHhZRq5bdMGX_oeRCULGbEbpQQUh60,7908
+quasarr/search/sources/nx.py,sha256=HvZfzNrteHvjSY6LuPEyKjUHiuuBDrL_zZ-a7bIvLSY,8027
 quasarr/search/sources/sf.py,sha256=W_620AdArvINjhKjBKYvoAX3OKBSeRtOWzTpQFhOmZY,17102
 quasarr/search/sources/sj.py,sha256=fQ1xhaDc1hvycLv2sVYXx_ZBNkjXsJ_s4-VcgJEWy8A,7887
 quasarr/search/sources/sl.py,sha256=XvY7XC4AIXh6-GYsTwERoRKMi4euo1zk2X2gKff8S8E,11079
-quasarr/search/sources/wd.py,sha256=qqhYoYrrbwxDsyETfsZOQQu8wnq8O87hpOSMx71MMIY,8084
-quasarr/search/sources/wx.py,sha256=KLMUbnh3SGrWsQq3YyI9LRq4VjDj_JmjXU4-fMqxDMk,15377
+quasarr/search/sources/wd.py,sha256=Y_kSbri6u7QaO0JDCeIBtYeo5r_EJXgpDL4WzMrg268,9235
+quasarr/search/sources/wx.py,sha256=3GMgOz2QhmeU1ip-lX5_JrltJi_uuSFGNHJr0Lk7l4c,15555
 quasarr/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-quasarr/storage/config.py,sha256=lvh3Vtf6pQ_ZIyH9TrHzcifRKkzq8QsV61xDhbrOpog,6584
-quasarr/storage/setup.py,sha256=xDS7ALm1zR1uYgMiPeKCYiCbTqltYg2JfXLPIMDfdww,60790
+quasarr/storage/config.py,sha256=IzPrfwuR_4fsgh-cBQigOtQwqzrtBAsZfdzDotCabJw,6618
+quasarr/storage/setup.py,sha256=zb83kvQfxMFHxC7EvWWaVTy0MtG7iEjMRyfY4hdcbOk,61520
 quasarr/storage/sqlite_database.py,sha256=tmHUotMWIwtyH-g244WvcGhMQMMjGokncv7JpFSi8NM,3639
-quasarr-2.5.0.dist-info/METADATA,sha256=_zn9rKyhnjing9g60Ltp8Q2wxtn7R0mZJQc0n3OSiMU,14727
-quasarr-2.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-quasarr-2.5.0.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
-quasarr-2.5.0.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
-quasarr-2.5.0.dist-info/RECORD,,
+quasarr-2.6.1.dist-info/METADATA,sha256=KOEKXAbtynYwQcL7NH32JJvXJ6cfdoN7_LVrPMkW8jE,14727
+quasarr-2.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+quasarr-2.6.1.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
+quasarr-2.6.1.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
+quasarr-2.6.1.dist-info/RECORD,,