quasarr 1.26.0__py3-none-any.whl → 1.26.2__py3-none-any.whl

quasarr/providers/shared_state.py

@@ -120,6 +120,7 @@ def connect_to_jd(jd, user, password, device_name):
         info("Error connecting to JDownloader: " + str(e).strip())
         return False
     if not device or not isinstance(device, (type, Jddevice)):
+        info(f'Device "{device_name}" not found. Available devices may differ or be offline.')
         return False
     else:
         device.downloadcontroller.get_current_state()  # request forces direct_connection info update

quasarr/providers/version.py

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

quasarr/storage/setup.py

@@ -6,7 +6,7 @@ import os
 import sys
 
 import requests
-from bottle import Bottle, request
+from bottle import Bottle, request, response
 
 import quasarr
 import quasarr.providers.html_images as images
@@ -21,19 +21,40 @@ from quasarr.providers.web_server import Server
 from quasarr.storage.config import Config
 
 
+def add_no_cache_headers(app):
+    """Add hooks to prevent browser caching of setup pages."""
+
+    @app.hook('after_request')
+    def set_no_cache():
+        response.set_header('Cache-Control', 'no-cache, no-store, must-revalidate')
+        response.set_header('Pragma', 'no-cache')
+        response.set_header('Expires', '0')
+
+
 def path_config(shared_state):
     app = Bottle()
+    add_no_cache_headers(app)
 
     current_path = os.path.dirname(os.path.abspath(sys.argv[0]))
 
     @app.get('/')
     def config_form():
         config_form_html = f'''
-            <form action="/api/config" method="post">
+            <form action="/api/config" method="post" onsubmit="return handleSubmit(this)">
                 <label for="config_path">Path</label>
                 <input type="text" id="config_path" name="config_path" placeholder="{current_path}"><br>
-                {render_button("Save", "primary", {"type": "submit"})}
+                {render_button("Save", "primary", {"type": "submit", "id": "submitBtn"})}
             </form>
+            <script>
+            var formSubmitted = false;
+            function handleSubmit(form) {{
+                if (formSubmitted) return false;
+                formSubmitted = true;
+                var btn = document.getElementById('submitBtn');
+                if (btn) {{ btn.disabled = true; btn.textContent = 'Saving...'; }}
+                return true;
+            }}
+            </script>
             '''
         return render_form("Press 'Save' to set desired path for configuration",
                            config_form_html)
@@ -99,7 +120,7 @@ def hostname_form_html(shared_state, message):
         ))
 
     hostname_form_content = "".join(field_html)
-    button_html = render_button("Save", "primary", {"type": "submit"})
+    button_html = render_button("Save", "primary", {"type": "submit", "id": "submitBtn"})
 
     template = """
 <div id="message" style="margin-bottom:0.5em;">{message}</div>
@@ -111,13 +132,19 @@ def hostname_form_html(shared_state, message):
 </form>
 
 <script>
+  var formSubmitted = false;
   function validateHostnames(form) {{
+    if (formSubmitted) return false;
+
     var errorDiv = document.getElementById('error-msg');
     errorDiv.textContent = '';
 
     var inputs = form.querySelectorAll('input[type="text"]');
     for (var i = 0; i < inputs.length; i++) {{
       if (inputs[i].value.trim() !== '') {{
+        formSubmitted = true;
+        var btn = document.getElementById('submitBtn');
+        if (btn) {{ btn.disabled = true; btn.textContent = 'Saving...'; }}
         return true;
       }}
     }}
@@ -205,13 +232,14 @@ def save_hostnames(shared_state, timeout=5, first_run=True):
 
 def hostnames_config(shared_state):
     app = Bottle()
+    add_no_cache_headers(app)
 
     @app.get('/')
     def hostname_form():
         message = """<p>
           If you're having trouble setting this up, take a closer look at 
-          <a href="https://github.com/rix1337/Quasarr?tab=readme-ov-file#instructions" target="_blank" rel="noopener noreferrer">
-            step one of these instructions.
+          <a href="https://github.com/rix1337/Quasarr?tab=readme-ov-file#quasarr" target="_blank" rel="noopener noreferrer">
+            the instructions.
           </a>
         </p>"""
         return render_form("Set at least one valid hostname", hostname_form_html(shared_state, message))
@@ -227,6 +255,7 @@ def hostnames_config(shared_state):
 
 def hostname_credentials_config(shared_state, shorthand, domain):
     app = Bottle()
+    add_no_cache_headers(app)
 
     shorthand = shorthand.upper()
 
@@ -242,16 +271,30 @@ def hostname_credentials_config(shared_state, shorthand, domain):
         '''
 
         form_html = f'''
-        <form action="/api/credentials/{shorthand}" method="post">
+        <form id="credentialsForm" action="/api/credentials/{shorthand}" method="post" onsubmit="return handleSubmit(this)">
             {form_content}
-            {render_button("Save", "primary", {"type": "submit"})}
+            {render_button("Save", "primary", {"type": "submit", "id": "submitBtn"})}
         </form>
+        <script>
+        var formSubmitted = false;
+        function handleSubmit(form) {{
+            if (formSubmitted) return false;
+            formSubmitted = true;
+            var btn = document.getElementById('submitBtn');
+            if (btn) {{ btn.disabled = true; btn.textContent = 'Saving...'; }}
+            return true;
+        }}
+        </script>
         '''
 
         return render_form(f"Set User and Password for {shorthand}", form_html)
 
     @app.post("/api/credentials/<sh>")
     def set_credentials(sh):
+        # Guard against duplicate submissions (e.g., double-click)
+        if quasarr.providers.web_server.temp_server_success:
+            return render_success(f"{sh} credentials already being processed", 5)
+
         user = request.forms.get('user')
         password = request.forms.get('password')
         config = Config(shorthand)
@@ -294,6 +337,7 @@ def hostname_credentials_config(shared_state, shorthand, domain):
 
 def flaresolverr_config(shared_state):
     app = Bottle()
+    add_no_cache_headers(app)
 
     @app.get('/')
     def url_form():
@@ -304,10 +348,20 @@ def flaresolverr_config(shared_state):
         <input type="text" id="url" name="url" placeholder="http://192.168.0.1:8191/v1"><br>
         '''
         form_html = f'''
-        <form action="/api/flaresolverr" method="post">
+        <form action="/api/flaresolverr" method="post" onsubmit="return handleSubmit(this)">
             {form_content}
-            {render_button("Save", "primary", {"type": "submit"})}
+            {render_button("Save", "primary", {"type": "submit", "id": "submitBtn"})}
         </form>
+        <script>
+        var formSubmitted = false;
+        function handleSubmit(form) {{
+            if (formSubmitted) return false;
+            formSubmitted = true;
+            var btn = document.getElementById('submitBtn');
+            if (btn) {{ btn.disabled = true; btn.textContent = 'Saving...'; }}
+            return true;
+        }}
+        </script>
         '''
         return render_form("Set FlareSolverr URL", form_html)
 
@@ -316,6 +370,9 @@ def flaresolverr_config(shared_state):
         url = request.forms.get('url').strip()
         config = Config("FlareSolverr")
 
+        if not url.startswith("http://") and not url.startswith("https://"):
+            url = "http://" + url
+
         if url:
             try:
                 headers = {"Content-Type": "application/json"}
@@ -324,8 +381,8 @@ def flaresolverr_config(shared_state):
                     "url": "http://www.google.com/",
                     "maxTimeout": 30000
                 }
-                response = requests.post(url, headers=headers, json=data, timeout=30)
-                if response.status_code == 200:
+                resp = requests.post(url, headers=headers, json=data, timeout=30)
+                if resp.status_code == 200:
                     config.save("url", url)
                     print(f'Using Flaresolverr URL: "{url}"')
                     quasarr.providers.web_server.temp_server_success = True
@@ -347,6 +404,7 @@ def flaresolverr_config(shared_state):
 
 def jdownloader_config(shared_state):
     app = Bottle()
+    add_no_cache_headers(app)
 
     @app.get('/')
     def jd_form():
@@ -368,19 +426,26 @@ def jdownloader_config(shared_state):
 
         <p>Some JDownloader settings will be enforced by Quasarr on startup.</p>
 
-        <form action="/api/store_jdownloader" method="post" id="deviceForm" style="display: none;">
+        <form action="/api/store_jdownloader" method="post" id="deviceForm" style="display: none;" onsubmit="return handleStoreSubmit(this)">
             <input type="hidden" id="hiddenUser" name="user">
             <input type="hidden" id="hiddenPass" name="pass">
             <label for="device">JDownloader</label>
             <select id="device" name="device"></select><br>
-            {render_button("Save", "primary", {"type": "submit"})}
+            {render_button("Save", "primary", {"type": "submit", "id": "storeBtn"})}
         </form>
         <p><strong>Saving may take a while!</strong></p><br>
         '''
 
         verify_script = '''
         <script>
+        var verifyInProgress = false;
+        var storeSubmitted = false;
         function verifyCredentials() {
+            if (verifyInProgress) return;
+            verifyInProgress = true;
+            var btn = document.getElementById('verifyButton');
+            if (btn) { btn.disabled = true; btn.textContent = 'Verifying...'; }
+
             var user = document.getElementById('user').value;
             var pass = document.getElementById('pass').value;
             fetch('/api/verify_jdownloader', {
@@ -406,12 +471,23 @@ def jdownloader_config(shared_state):
                     document.getElementById('deviceForm').style.display = 'block';
                 } else {
                     alert('Fehler! Bitte die Zugangsdaten überprüfen.');
+                    verifyInProgress = false;
+                    if (btn) { btn.disabled = false; btn.textContent = 'Verify Credentials'; }
                 }
             })
             .catch((error) => {
                 console.error('Error:', error);
+                verifyInProgress = false;
+                if (btn) { btn.disabled = false; btn.textContent = 'Verify Credentials'; }
             });
         }
+        function handleStoreSubmit(form) {
+            if (storeSubmitted) return false;
+            storeSubmitted = true;
+            var btn = document.getElementById('storeBtn');
+            if (btn) { btn.disabled = true; btn.textContent = 'Saving...'; }
+            return true;
+        }
         </script>
         '''
         return render_form("Set your credentials for My JDownloader", verify_form_html, verify_script)
@@ -440,21 +516,15 @@ def jdownloader_config(shared_state):
         password = request.forms.get('pass')
         device = request.forms.get('device')
 
-        config = Config('JDownloader')
-
         if username and password and device:
-            config.save('user', username)
-            config.save('password', password)
-            config.save('device', device)
-
-            if not shared_state.set_device_from_config():
-                config.save('user', "")
-                config.save('password', "")
-                config.save('device', "")
-            else:
+            # 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_success("Credentials set",
-                                      15)
+                return render_success("Credentials set", 15)
 
         return render_fail("Could not set credentials!")
 

{quasarr-1.26.0.dist-info → quasarr-1.26.2.dist-info}/METADATA

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

@@ -31,15 +31,15 @@ quasarr/downloads/sources/wx.py,sha256=EygMfkgBMZYj3tSk4gvj5DcojkRswGhY_y8FMPNnV
 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=2n82gTJg7E7q2ytPFN4FWouYTIlmPYu_iHFtG7uktIA,28482
-quasarr/providers/html_templates.py,sha256=AMDo8cRxlEpnY8ZpwGI9TPdMLLWA0ePsYhNcIIu26zU,9496
+quasarr/providers/html_templates.py,sha256=YMwdi7l_tHL0-qsUnwi4aPrE5Q6ZDxbjsPIfr-6uemY,10265
 quasarr/providers/imdb_metadata.py,sha256=10L4kZkt6Fg0HGdNcc6KCtIQHRYEqdarLyaMVN6mT8w,4843
 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=SzhDZ-ndWtIpBulm-LR8J5Lw4LCgWOCzxB07JsBPvKg,1350372
-quasarr/providers/shared_state.py,sha256=1NUKtm9YXWPvN64By2O2OYH5ke5TmBkJSbSxiNczgtU,29849
+quasarr/providers/obfuscated.py,sha256=6hnjiNEdrMQaHNgRRBFVZej8Zld-LaihZfQe6YM8aD8,1344189
+quasarr/providers/shared_state.py,sha256=-TIiH2lkCfovq7bzUZicpUjXEjS87ZHCcevsFgySOqw,29944
 quasarr/providers/statistics.py,sha256=cEQixYnDMDqtm5wWe40E_2ucyo4mD0n3SrfelhQi1L8,6452
-quasarr/providers/version.py,sha256=MN2yssTCIGNfUfOS_cfcuJlSom7BATAfTkt7EtHX-TA,4004
+quasarr/providers/version.py,sha256=gZK-UAU9UlateFaOTImyoErz9l4su5BuOADF-ryh3ss,4004
 quasarr/providers/web_server.py,sha256=AYd0KRxdDWMBr87BP8wlSMuL4zZo0I_rY-vHBai6Pfg,1688
 quasarr/providers/sessions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/providers/sessions/al.py,sha256=F1d76eAJcbTvb6YvAIlQ4gfrYC_256QAKiWEQcuWe8k,10612
@@ -67,11 +67,11 @@ quasarr/search/sources/wd.py,sha256=O02j3irSlVw2qES82g_qHuavAk-njjSRH1dHSCnOUas,
 quasarr/search/sources/wx.py,sha256=HIGElGKoBkxBdgoYiaC70T4Y22xRUmgMzzbJpFq1cxw,12897
 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/setup.py,sha256=V_dWfyCYxRE_ahmBtD-DmHOKP2L6brBcVYydPRcHjns,21448
 quasarr/storage/sqlite_database.py,sha256=yMqFQfKf0k7YS-6Z3_7pj4z1GwWSXJ8uvF4IydXsuTE,3554
-quasarr-1.26.0.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
-quasarr-1.26.0.dist-info/METADATA,sha256=bXWnG37Ff8gVuu9F6os6mj4kMaRffuRcZk6lPxlTsxA,12805
-quasarr-1.26.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-quasarr-1.26.0.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
-quasarr-1.26.0.dist-info/top_level.txt,sha256=dipJdaRda5ruTZkoGfZU60bY4l9dtPlmOWwxK_oGSF0,8
-quasarr-1.26.0.dist-info/RECORD,,
+quasarr-1.26.2.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
+quasarr-1.26.2.dist-info/METADATA,sha256=aYxG2KoX7GLS2AFIaUw2kHc75UIOyEdjmgh4UqouJow,12805
+quasarr-1.26.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+quasarr-1.26.2.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
+quasarr-1.26.2.dist-info/top_level.txt,sha256=dipJdaRda5ruTZkoGfZU60bY4l9dtPlmOWwxK_oGSF0,8
+quasarr-1.26.2.dist-info/RECORD,,