quasarr 1.4.1__py3-none-any.whl → 1.20.4__py3-none-any.whl

quasarr/__init__.py

@@ -17,8 +17,10 @@ import requests
 from quasarr.api import get_api
 from quasarr.providers import shared_state, version
 from quasarr.providers.log import info, debug
+from quasarr.providers.notifications import send_discord_message
 from quasarr.storage.config import Config, get_clean_hostnames
-from quasarr.storage.setup import path_config, hostnames_config, hostname_credentials_config, jdownloader_config
+from quasarr.storage.setup import path_config, hostnames_config, hostname_credentials_config, flaresolverr_config, \
+    jdownloader_config
 from quasarr.storage.sqlite_database import DataBase
 
 
@@ -44,24 +46,12 @@ def run():
 └────────────────────────────────────┘""")
 
         print("\n===== Recommended Services =====")
-        print('- For automated CAPTCHA solutions use SponsorsHelper: "https://github.com/users/rix1337/sponsorship"')
-        print('- For convenient universal premium downloads use: "https://linksnappy.com/?ref=397097"')
+        print('For convenient universal premium downloads use: "https://linksnappy.com/?ref=397097"')
+        print(
+            'Sponsors get automated CAPTCHA solutions: "https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper"')
 
         print("\n===== Startup Info =====")
-
-        try:
-            update_available = version.newer_version_available()
-        except Exception as e:
-            print(f"Error getting latest version: {str(e)}")
-            print('Please manually check: "https://github.com/rix1337/Quasarr/releases/" for more information!')
-            update_available = None
-        if update_available:
-            print("!!! UPDATE AVAILABLE !!!")
-            print(f"Please update to the latest version: {update_available} as soon as possible!")
-            print('Release notes at: "https://github.com/rix1337/Quasarr/releases/"')
-
         port = int('8080')
-
         config_path = ""
         if os.environ.get('DOCKER'):
             config_path = "/config"
@@ -110,12 +100,21 @@ def run():
         shared_state.update("database", DataBase)
         supported_hostnames = extract_allowed_keys(Config._DEFAULT_CONFIG, 'Hostnames')
         shared_state.update("sites", [key.upper() for key in supported_hostnames])
-        shared_state.update("user_agent",
-                            "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36")
+        shared_state.update("user_agent", "")  # will be set by FlareSolverr
         shared_state.update("helper_active", False)
 
         print(f'Config path: "{config_path}"')
 
+        flaresolverr_url = Config('FlareSolverr').get('url')
+        if not flaresolverr_url:
+            flaresolverr_config(shared_state)
+        else:
+            print(f'Flaresolverr URL: "{flaresolverr_url}"')
+            flaresolverr_check = check_flaresolverr(shared_state, flaresolverr_url)
+            if flaresolverr_check:
+                print(f'User Agent: "{shared_state.values["user_agent"]}"')
+
+        print("\n===== Hostnames =====")
         try:
             if arguments.hostnames:
                 hostnames_link = make_raw_pastebin_link(arguments.hostnames)
@@ -135,7 +134,8 @@ def run():
                     if results:
                         hostnames = Config('Hostnames')
                         for shorthand, hostname in results.items():
-                            valid_domain = shared_state.extract_valid_hostname(hostname, shorthand)
+                            domain_check = shared_state.extract_valid_hostname(hostname, shorthand)
+                            valid_domain = domain_check.get('domain', None)
                             if valid_domain:
                                 hostnames.save(shorthand, hostname)
                                 extracted_hostnames += 1
@@ -153,17 +153,19 @@ def run():
         except Exception as e:
             print(f'Error parsing hostnames link: "{e}"')
 
-        print("\n===== Configuration =====")
-        api_key = Config('API').get('key')
-        if not api_key:
-            api_key = shared_state.generate_api_key()
-
         hostnames = get_clean_hostnames(shared_state)
         if not hostnames:
             hostnames_config(shared_state)
             hostnames = get_clean_hostnames(shared_state)
         print(f"You have [{len(hostnames)} of {len(Config._DEFAULT_CONFIG['Hostnames'])}] supported hostnames set up")
-        print(f"For efficiency it is recommended to set up as few hostnames as needed.\n")
+        print(f"For efficiency it is recommended to set up as few hostnames as needed.")
+
+        al = Config('Hostnames').get('al')
+        if al:
+            user = Config('AL').get('user')
+            password = Config('AL').get('password')
+            if not user or not password:
+                hostname_credentials_config(shared_state, "AL", al)
 
         dd = Config('Hostnames').get('dd')
         if dd:
@@ -187,6 +189,7 @@ def run():
         if not user or not password or not device:
             jdownloader_config(shared_state)
 
+        print("\n===== Notifications =====")
         discord_url = ""
         if arguments.discord:
             discord_webhook_pattern = r'^https://discord\.com/api/webhooks/\d+/[\w-]+$'
@@ -200,17 +203,17 @@ def run():
             print("No Discord Webhook URL provided")
         shared_state.update("discord", discord_url)
 
-        jdownloader = multiprocessing.Process(target=jdownloader_connection,
-                                              args=(shared_state_dict, shared_state_lock))
-        jdownloader.start()
-
         print("\n===== API Information =====")
-        print(f'Quasarr API now running at: "{shared_state.values['external_address']}"')
-        print('Use the above URL to set up a "Newznab Indexer" and "SABnzbd Download Client" in Radarr/Sonarr')
-        print(f'Leave all settings at default and use this API key: "{api_key}" (without quotes)')
-        print(
-            'Optionally set one desired mirror in "API Path" at the advanced indexer settings, e.g. "/api/dropbox/" instead of "/api/"')
-        print('For more details, check https://github.com/rix1337/Quasarr?tab=readme-ov-file#instructions.')
+        api_key = Config('API').get('key')
+        if not api_key:
+            api_key = shared_state.generate_api_key()
+
+        print('Setup instructions: "https://github.com/rix1337/Quasarr?tab=readme-ov-file#instructions"')
+        print(f'URL: "{shared_state.values['internal_address']}"')
+        print(f'API key: "{api_key}" (without quotes)')
+
+        if external_address != internal_address:
+            print(f'External URL: "{shared_state.values["external_address"]}"')
 
         print("\n===== Quasarr Info Log =====")
         if os.getenv('DEBUG'):
@@ -222,49 +225,101 @@ def run():
             info(f'CAPTCHA-Solution required for {package_count} package{'s' if package_count > 1 else ''} at: '
                  f'"{shared_state.values["external_address"]}/captcha"!')
 
+        jdownloader = multiprocessing.Process(
+            target=jdownloader_connection,
+            args=(shared_state_dict, shared_state_lock)
+        )
+        jdownloader.start()
+
+        updater = multiprocessing.Process(
+            target=update_checker,
+            args=(shared_state_dict, shared_state_lock)
+        )
+        updater.start()
+
         try:
             get_api(shared_state_dict, shared_state_lock)
         except KeyboardInterrupt:
+            jdownloader.kill()
+            updater.kill()
             sys.exit(0)
 
 
-def jdownloader_connection(shared_state_dict, shared_state_lock):
-    shared_state.set_state(shared_state_dict, shared_state_lock)
-
-    shared_state.set_device_from_config()
-
-    connection_established = shared_state.get_device() and shared_state.get_device().name
-    if not connection_established:
-        i = 0
-        while i < 10:
-            i += 1
-            info(f'Connection {i} to JDownloader failed. Device name: "{shared_state.values["device"]}"')
-            time.sleep(60)
-            shared_state.set_device_from_config()
-            connection_established = shared_state.get_device() and shared_state.get_device().name
-            if connection_established:
-                break
-
+def update_checker(shared_state_dict, shared_state_lock):
     try:
-        info(f'Connection to JDownloader successful. Device name: "{shared_state.get_device().name}"')
-    except Exception as e:
-        info(f'Error connecting to JDownloader: {e}! Stopping Quasarr!')
-        sys.exit(1)
+        shared_state.set_state(shared_state_dict, shared_state_lock)
 
-    try:
-        shared_state.set_device_settings()
-    except Exception as e:
-        print(f"Error checking settings: {e}")
+        message = "!!! UPDATE AVAILABLE !!!"
+        link = "https://github.com/rix1337/Quasarr/releases/latest"
 
-    try:
-        shared_state.update_jdownloader()
-    except Exception as e:
-        print(f"Error updating JDownloader: {e}")
+        shared_state.update("last_checked_version", f"v.{version.get_version()}")
 
+        while True:
+            try:
+                update_available = version.newer_version_available()
+            except Exception as e:
+                info(f"Error getting latest version: {e}")
+                info(f'Please manually check: "{link}" for more information!')
+                update_available = None
+
+            if update_available and shared_state.values["last_checked_version"] != update_available:
+                shared_state.update("last_checked_version", update_available)
+                info(message)
+                info(f"Please update to {update_available} as soon as possible!")
+                info(f'Release notes at: "{link}"')
+                update_available = {
+                    "version": update_available,
+                    "link": link
+                }
+                send_discord_message(shared_state, message, "quasarr_update", details=update_available)
+
+            # wait one hour before next check
+            time.sleep(60 * 60)
+    except KeyboardInterrupt:
+        pass
+
+
+def jdownloader_connection(shared_state_dict, shared_state_lock):
     try:
-        shared_state.start_downloads()
-    except Exception as e:
-        print(f"Error starting downloads: {e}")
+        shared_state.set_state(shared_state_dict, shared_state_lock)
+
+        shared_state.set_device_from_config()
+
+        connection_established = shared_state.get_device() and shared_state.get_device().name
+        if not connection_established:
+            i = 0
+            while i < 10:
+                i += 1
+                info(f'Connection {i} to JDownloader failed. Device name: "{shared_state.values["device"]}"')
+                time.sleep(60)
+                shared_state.set_device_from_config()
+                connection_established = shared_state.get_device() and shared_state.get_device().name
+                if connection_established:
+                    break
+
+        try:
+            info(f'Connection to JDownloader successful. Device name: "{shared_state.get_device().name}"')
+        except Exception as e:
+            info(f'Error connecting to JDownloader: {e}! Stopping Quasarr!')
+            sys.exit(1)
+
+        try:
+            shared_state.set_device_settings()
+        except Exception as e:
+            print(f"Error checking settings: {e}")
+
+        try:
+            shared_state.update_jdownloader()
+        except Exception as e:
+            print(f"Error updating JDownloader: {e}")
+
+        try:
+            shared_state.start_downloads()
+        except Exception as e:
+            print(f"Error starting downloads: {e}")
+
+    except KeyboardInterrupt:
+        pass
 
 
 class Unbuffered(object):
@@ -295,6 +350,41 @@ def check_ip():
     return ip
 
 
+def check_flaresolverr(shared_state, flaresolverr_url):
+    # Ensure it ends with /v<digit+>
+    if not re.search(r"/v\d+$", flaresolverr_url):
+        print(f"FlareSolverr URL does not end with /v#: {flaresolverr_url}")
+        return False
+
+    # Try sending a simple test request
+    headers = {"Content-Type": "application/json"}
+    data = {
+        "cmd": "request.get",
+        "url": "http://www.google.com/",
+        "maxTimeout": 10000
+    }
+
+    try:
+        response = requests.post(flaresolverr_url, headers=headers, json=data, timeout=10)
+        response.raise_for_status()
+        json_data = response.json()
+
+        # Check if the structure looks like a valid FlareSolverr response
+        if "status" in json_data and json_data["status"] == "ok":
+            solution = json_data["solution"]
+            solution_ua = solution.get("userAgent", None)
+            if solution_ua:
+                shared_state.update("user_agent", solution_ua)
+            return True
+        else:
+            print(f"Unexpected FlareSolverr response: {json_data}")
+            return False
+
+    except Exception as e:
+        print(f"Failed to connect to FlareSolverr: {e}")
+        return False
+
+
 def make_raw_pastebin_link(url):
     """
     Takes a Pastebin URL and ensures it is a raw link.

quasarr/api/__init__.py

@@ -4,9 +4,12 @@
 
 from bottle import Bottle
 
+import quasarr.providers.html_images as images
 from quasarr.api.arr import setup_arr_routes
 from quasarr.api.captcha import setup_captcha_routes
+from quasarr.api.config import setup_config
 from quasarr.api.sponsors_helper import setup_sponsors_helper_routes
+from quasarr.api.statistics import setup_statistics
 from quasarr.providers import shared_state
 from quasarr.providers.html_templates import render_button, render_centered_html
 from quasarr.providers.web_server import Server
@@ -20,6 +23,8 @@ def get_api(shared_state_dict, shared_state_lock):
 
     setup_arr_routes(app)
     setup_captcha_routes(app)
+    setup_config(app, shared_state)
+    setup_statistics(app, shared_state)
     setup_sponsors_helper_routes(app)
 
     @app.get('/')
@@ -30,63 +35,141 @@ def get_api(shared_state_dict, shared_state_lock):
         captcha_hint = ""
         if protected:
             plural = 's' if len(protected) > 1 else ''
-            captcha_hint = f"""
-            <h2>Protected link{plural} found</h2>
-            <p>{render_button(f"Solve CAPTCHA{plural}", 'primary', {'onclick': "location.href='/captcha'"})}</p>
-            <a href="https://github.com/users/rix1337/sponsorship" target="_blank">For automated CAPTCHA solutions, use SponsorsHelper!</a>
+            captcha_hint += f"""
+            <div class="section">
+                <h2>🔒 Link{plural} waiting for CAPTCHA solution</h2>
+                """
+
+            if not shared_state.values.get("helper_active"):
+                captcha_hint += f"""
+                <p>
+                    <a href="https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper" target="_blank">
+                        Sponsors get automated CAPTCHA solutions!
+                    </a>
+                </p>
+                """
+
+            plural = 's' if len(protected) > 1 else ''
+            captcha_hint += f"""
+                <p>{render_button(f"Solve CAPTCHA{plural}", 'primary', {'onclick': "location.href='/captcha'"})}</p>
+            </div>
+            <hr>
             """
 
         info = f"""
-        <h1><img src="https://raw.githubusercontent.com/rix1337/Quasarr/main/Quasarr.png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+        <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+
         {captcha_hint}
-        <h2>Setup Instructions</h2>
-        <p>Use these to set up a <strong>Newznab Indexer</strong> and <strong>SABnzbd Download Client</strong> in Radarr/Sonarr:</p>
-        
-        <h3>URL</h3>
-        <div class="url-wrapper">
-          <input id="urlInput" class="url-input" type="text" readonly value="{shared_state.values['internal_address']}" />
-          <button id="copyUrl" class="btn-primary small">Copy</button>
+
+        <div class="section">
+            <h2>📖 Setup Instructions</h2>
+            <p>
+                <a href="https://github.com/rix1337/Quasarr?tab=readme-ov-file#instructions" target="_blank">
+                    Refer to the README for detailed instructions.
+                </a>
+            </p>
         </div>
-        
-        <script>
-          const urlInput = document.getElementById('urlInput');
-          const copyUrlBtn = document.getElementById('copyUrl');
-        
-          copyUrlBtn.onclick = () => {{
-            urlInput.select();
-            document.execCommand('copy');
-            copyUrlBtn.innerText = 'Copied!';
-            setTimeout(() => {{ copyUrlBtn.innerText = 'Copy'; }}, 2000);
-          }};
-        </script>
 
-        <h3>API Key</h3>
-        <div class=\"api-key-wrapper\">
-          <input id=\"apiKeyInput\" class=\"api-key-input\" type=\"password\" readonly value=\"{api_key}\" />
-          <button id=\"toggleKey\" class=\"btn-secondary small\">Show</button>
-          <button id=\"copyKey\" class=\"btn-primary small\">Copy</button>
+        <hr>
+
+        <div class="section">
+            <h2>⚙️ API Configuration</h2>
+            <p>Use the URL and API Key below to set up a <strong>Newznab Indexer</strong> and <strong>SABnzbd Download Client</strong> in Radarr/Sonarr:</p>
+
+            <details id="apiDetails">
+                <summary id="apiSummary">Show API Settings</summary>
+                <div class="api-settings">
+
+                    <h3>URL</h3>
+                    <div class="url-wrapper">
+                      <input id="urlInput" class="copy-input" type="text" readonly value="{shared_state.values['internal_address']}" />
+                      <button id="copyUrl" class="btn-primary small">Copy</button>
+                    </div>
+
+                    <h3>API Key</h3>
+                    <div class="api-key-wrapper">
+                      <input id="apiKeyInput" class="copy-input" type="password" readonly value="{api_key}" />
+                      <button id="toggleKey" class="btn-secondary small">Show</button>
+                      <button id="copyKey" class="btn-primary small">Copy</button>
+                    </div>
+
+                    <p>{render_button("Regenerate API key", "secondary", {"onclick": "if(confirm('Regenerate API key?')) location.href='/regenerate-api-key';"})}</p>
+                </div>
+            </details>
+        </div>
+
+        <hr>
+
+        <div class="section">
+            <h2>🔧 Quick Actions</h2>
+            <p><button class="btn-primary" onclick="location.href='/hostnames'">Update Hostnames</button></p>
+            <p><button class="btn-primary" onclick="location.href='/statistics'">View Statistics</button></p>
         </div>
 
-        <p>{render_button("Regenerate API key", "secondary", {"onclick": "if(confirm('Regenerate API key?')) location.href='/regenerate-api-key';"})}</p>
+        <style>
+            .section {{ margin: 20px 0; }}
+            .api-settings {{ padding: 15px 0; }}
+            hr {{ margin: 25px 0; border: none; border-top: 1px solid #ddd; }}
+            details {{ margin: 10px 0; }}
+            summary {{ 
+                cursor: pointer; 
+                padding: 8px 0; 
+                font-weight: 500;
+            }}
+            summary:hover {{ 
+                color: #0066cc; 
+            }}
+        </style>
 
         <script>
+          const urlInput = document.getElementById('urlInput');
+          const copyUrlBtn = document.getElementById('copyUrl');
+
+          if (copyUrlBtn) {{
+            copyUrlBtn.onclick = () => {{
+              urlInput.select();
+              document.execCommand('copy');
+              copyUrlBtn.innerText = 'Copied!';
+              setTimeout(() => {{ copyUrlBtn.innerText = 'Copy'; }}, 2000);
+            }};
+          }}
+
           const apiInput = document.getElementById('apiKeyInput');
           const toggleBtn = document.getElementById('toggleKey');
           const copyBtn = document.getElementById('copyKey');
 
-          toggleBtn.onclick = () => {{
-            const isHidden = apiInput.type === 'password';
-            apiInput.type = isHidden ? 'text' : 'password';
-            toggleBtn.innerText = isHidden ? 'Hide' : 'Show';
-          }};
-          copyBtn.onclick = () => {{
-            apiInput.type = 'text';
-            apiInput.select();
-            document.execCommand('copy');
-            copyBtn.innerText = 'Copied!';
-            toggleBtn.innerText = 'Hide';
-            setTimeout(() => {{ copyBtn.innerText = 'Copy'; }}, 2000);
-          }};
+          if (toggleBtn) {{
+            toggleBtn.onclick = () => {{
+              const isHidden = apiInput.type === 'password';
+              apiInput.type = isHidden ? 'text' : 'password';
+              toggleBtn.innerText = isHidden ? 'Hide' : 'Show';
+            }};
+          }}
+
+          if (copyBtn) {{
+            copyBtn.onclick = () => {{
+              apiInput.type = 'text';
+              apiInput.select();
+              document.execCommand('copy');
+              copyBtn.innerText = 'Copied!';
+              toggleBtn.innerText = 'Hide';
+              setTimeout(() => {{ copyBtn.innerText = 'Copy'; }}, 2000);
+            }};
+          }}
+
+          // Handle details toggle
+          const apiDetails = document.getElementById('apiDetails');
+          const apiSummary = document.getElementById('apiSummary');
+
+          if (apiDetails && apiSummary) {{
+            apiDetails.addEventListener('toggle', () => {{
+              if (apiDetails.open) {{
+                apiSummary.textContent = 'Hide API Settings';
+              }} else {{
+                apiSummary.textContent = 'Show API Settings';
+              }}
+            }});
+          }}
         </script>
         """
         return render_centered_html(info)