quasarr 1.32.0__py3-none-any.whl → 2.1.0__py3-none-any.whl

quasarr/api/__init__.py

@@ -8,9 +8,11 @@ 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.packages import setup_packages_routes
 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.auth import add_auth_routes, add_auth_hook, show_logout_link
 from quasarr.providers.html_templates import render_button, render_centered_html
 from quasarr.providers.web_server import Server
 from quasarr.storage.config import Config
@@ -21,158 +23,374 @@ def get_api(shared_state_dict, shared_state_lock):
 
     app = Bottle()
 
+    # Auth: routes must come first, then hook
+    add_auth_routes(app)
+    add_auth_hook(app, whitelist_prefixes=['/api', '/api/' '/sponsors_helper/', '/download/'])
+
     setup_arr_routes(app)
     setup_captcha_routes(app)
     setup_config(app, shared_state)
     setup_statistics(app, shared_state)
     setup_sponsors_helper_routes(app)
+    setup_packages_routes(app)
 
     @app.get('/')
     def index():
         protected = shared_state.get_db("protected").retrieve_all_titles()
         api_key = Config('API').get('key')
+
+        # Get quick status summary
+        try:
+            device = shared_state.values.get("device")
+            jd_connected = device is not None
+        except:
+            jd_connected = False
+
+        # CAPTCHA banner
         captcha_hint = ""
         if protected:
             plural = 's' if len(protected) > 1 else ''
-            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>
+            captcha_hint = f"""
+            <div class="alert alert-warning">
+                <span class="alert-icon">🔒</span>
+                <div class="alert-content">
+                    <strong>{len(protected)} link{plural} waiting for CAPTCHA</strong>
+                    {"" if shared_state.values.get("helper_active") else '<br><a href="https://github.com/rix1337/Quasarr?tab=readme-ov-file#sponsorshelper" target="_blank">Sponsors get automated CAPTCHA solutions!</a>'}
+                </div>
+                <div class="alert-action">
+                    {render_button(f"Solve CAPTCHA{plural}", 'primary', {'onclick': "location.href='/captcha'"})}
+                </div>
             </div>
-            <hr>
             """
 
+        # JDownloader status
+        jd_status = f"""
+            <div class="status-bar">
+                <span class="status-pill {'success' if jd_connected else 'error'}">
+                    {'✅' if jd_connected else '❌'} JDownloader {'Connected' if jd_connected else 'Disconnected'}
+                </span>
+            </div>
+        """
+
         info = f"""
         <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
 
+        {jd_status}
         {captcha_hint}
 
-        <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 class="quick-actions">
+            <a href="/packages" class="action-card">
+                <span class="action-icon">📦</span>
+                <span class="action-label">Packages</span>
+            </a>
+            <a href="/statistics" class="action-card">
+                <span class="action-icon">📊</span>
+                <span class="action-label">Statistics</span>
+            </a>
+            <a href="/hostnames" class="action-card">
+                <span class="action-icon">🌐</span>
+                <span class="action-label">Hostnames</span>
+            </a>
+            <a href="/flaresolverr" class="action-card">
+                <span class="action-icon">🛡️</span>
+                <span class="action-label">FlareSolverr</span>
+            </a>
         </div>
 
-        <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>
+                <summary id="apiSummary">⚙️ API Configuration</summary>
                 <div class="api-settings">
+                    <p class="api-hint">Use these settings for <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="copy-input" type="text" readonly value="{shared_state.values['internal_address']}" />
-                      <button id="copyUrl" class="btn-primary small">Copy</button>
+                    <div class="input-group">
+                        <label>URL</label>
+                        <div class="input-row">
+                            <input id="urlInput" type="text" readonly value="{shared_state.values['internal_address']}" />
+                            <button id="copyUrl" type="button">Copy</button>
+                        </div>
                     </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 class="input-group">
+                        <label>API Key</label>
+                        <div class="input-row">
+                            <input id="apiKeyInput" type="password" readonly value="{api_key}" />
+                            <button id="toggleKey" type="button">Show</button>
+                            <button id="copyKey" type="button">Copy</button>
+                        </div>
                     </div>
 
-                    <p>{render_button("Regenerate API key", "secondary", {"onclick": "if(confirm('Regenerate API key?')) location.href='/regenerate-api-key';"})}</p>
+                    <p style="margin-top: 15px;">
+                        {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='/flaresolverr'">Configure FlareSolverr</button></p>
-            <p><button class="btn-primary" onclick="location.href='/statistics'">View Statistics</button></p>
+        <div class="section help-link">
+            <a href="https://github.com/rix1337/Quasarr?tab=readme-ov-file#instructions" target="_blank">
+                📖 Setup Instructions & Documentation
+            </a>
         </div>
 
         <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; 
+            .status-bar {{
+                display: flex;
+                justify-content: center;
+                gap: 20px;
+                margin-bottom: 20px;
+                flex-wrap: wrap;
+            }}
+            .status-item {{
+                font-size: 0.9em;
+                padding: 6px 12px;
+                border-radius: 20px;
+                background: var(--status-bg, #f5f5f5);
+            }}
+            .status-ok {{ color: var(--status-ok, #2e7d32); }}
+            .status-error {{ color: var(--status-error, #c62828); }}
+
+            .alert {{
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                text-align: center;
+                gap: 12px;
+                padding: 20px;
+                border-radius: 8px;
+                margin-bottom: 25px;
+            }}
+            .alert-warning {{
+                background: var(--alert-warning-bg, #fff3e0);
+                border: 1px solid var(--alert-warning-border, #ffb74d);
+            }}
+            .alert-icon {{ font-size: 1.5em; }}
+            .alert-content {{ }}
+            .alert-content a {{ color: var(--link-color, #0066cc); }}
+            .alert-action {{ margin-top: 5px; }}
+
+            .quick-actions {{
+                display: grid;
+                grid-template-columns: repeat(4, 1fr);
+                gap: 12px;
+                max-width: 500px;
+                margin: 0 auto 30px auto;
+            }}
+            @media (max-width: 500px) {{
+                .quick-actions {{
+                    grid-template-columns: repeat(2, 1fr);
+                }}
+            }}
+            .action-card {{
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                padding: 15px 10px;
+                background: var(--card-bg, #f8f9fa);
+                border: 1px solid var(--card-border, #dee2e6);
+                border-radius: 10px;
+                text-decoration: none;
+                color: inherit;
+                transition: transform 0.2s, box-shadow 0.2s;
+            }}
+            .action-card:hover {{
+                transform: translateY(-2px);
+                box-shadow: 0 4px 12px var(--card-shadow, rgba(0,0,0,0.1));
+                border-color: var(--card-hover-border, #007bff);
+            }}
+            .action-icon {{ font-size: 1.8em; margin-bottom: 5px; }}
+            .action-label {{ font-size: 0.85em; font-weight: 500; }}
+
+            .section {{ margin: 20px 0; max-width: 500px; margin-left: auto; margin-right: auto; }}
+            details {{ background: var(--card-bg, #f8f9fa); border: 1px solid var(--card-border, #dee2e6); border-radius: 8px; }}
+            summary {{
+                cursor: pointer;
+                padding: 12px 15px;
+                font-weight: 500;
+                list-style: none;
+            }}
+            summary::-webkit-details-marker {{ display: none; }}
+            summary::before {{ content: '▶ '; font-size: 0.8em; }}
+            details[open] summary::before {{ content: '▼ '; }}
+            summary:hover {{ color: var(--link-color, #0066cc); }}
+
+            .api-settings {{ padding: 15px; border-top: 1px solid var(--card-border, #dee2e6); }}
+            .api-hint {{ font-size: 0.9em; color: var(--text-muted, #666); margin-bottom: 15px; }}
+            .input-group {{ margin-bottom: 15px; }}
+            .input-group label {{ display: block; font-weight: 500; margin-bottom: 6px; font-size: 0.95em; text-align: left; }}
+            .input-row {{
+                display: flex;
+                gap: 8px;
+                align-items: stretch;
+            }}
+            .input-row input {{
+                flex: 1;
+                padding: 8px 12px;
+                border: 1px solid var(--input-border, #ced4da);
+                border-radius: 4px;
+                font-family: monospace;
+                font-size: 0.9em;
+                background: var(--input-bg, #e9ecef);
+                color: var(--fg-color, #212529);
+                min-width: 0;
+                margin: 0;
+            }}
+            .input-row button {{
+                padding: 8px 16px;
+                border: none;
+                border-radius: 4px;
+                cursor: pointer;
+                font-size: 0.9em;
+                font-weight: 500;
+                transition: background 0.2s;
+                white-space: nowrap;
+                margin: 0;
+                flex-shrink: 0;
+            }}
+            #copyUrl, #copyKey {{
+                background: var(--btn-primary-bg, #007bff);
+                color: white;
+            }}
+            #copyUrl:hover, #copyKey:hover {{
+                background: var(--btn-primary-hover, #0056b3);
+            }}
+            #toggleKey {{
+                background: var(--btn-secondary-bg, #6c757d);
+                color: white;
+            }}
+            #toggleKey:hover {{
+                background: var(--btn-secondary-hover, #545b62);
+            }}
+
+            .help-link {{
+                text-align: center;
+                padding: 15px;
+                background: var(--card-bg, #f8f9fa);
+                border: 1px solid var(--card-border, #dee2e6);
+                border-radius: 8px;
+            }}
+            .help-link a {{
+                color: var(--link-color, #0066cc);
+                text-decoration: none;
                 font-weight: 500;
             }}
-            summary:hover {{ 
-                color: #0066cc; 
+            .help-link a:hover {{ text-decoration: underline; }}
+
+            .logout-link {{
+                display: block;
+                text-align: center;
+                margin-top: 20px;
+                font-size: 0.85em;
+            }}
+            .logout-link a {{
+                color: var(--text-muted, #666);
+                text-decoration: none;
+            }}
+            .logout-link a:hover {{ text-decoration: underline; }}
+
+            /* Dark mode */
+            @media (prefers-color-scheme: dark) {{
+                :root {{
+                    --status-bg: #2d3748;
+                    --status-ok: #68d391;
+                    --status-error: #fc8181;
+                    --alert-warning-bg: #3d3520;
+                    --alert-warning-border: #d69e2e;
+                    --card-bg: #2d3748;
+                    --card-border: #4a5568;
+                    --card-shadow: rgba(0,0,0,0.3);
+                    --card-hover-border: #63b3ed;
+                    --text-muted: #a0aec0;
+                    --link-color: #63b3ed;
+                    --input-bg: #1a202c;
+                    --input-border: #4a5568;
+                    --btn-primary-bg: #3182ce;
+                    --btn-primary-hover: #2c5282;
+                    --btn-secondary-bg: #4a5568;
+                    --btn-secondary-hover: #2d3748;
+                }}
             }}
         </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');
-
-          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';
-              }}
-            }});
-          }}
+            (function() {{
+                var urlInput = document.getElementById('urlInput');
+                var copyUrlBtn = document.getElementById('copyUrl');
+                var apiInput = document.getElementById('apiKeyInput');
+                var toggleBtn = document.getElementById('toggleKey');
+                var copyKeyBtn = document.getElementById('copyKey');
+
+                function copyToClipboard(text, button, callback) {{
+                    if (navigator.clipboard && navigator.clipboard.writeText) {{
+                        navigator.clipboard.writeText(text).then(function() {{
+                            var originalText = button.innerText;
+                            button.innerText = 'Copied!';
+                            setTimeout(function() {{
+                                button.innerText = originalText;
+                                if (callback) callback();
+                            }}, 1500);
+                        }}).catch(function() {{
+                            fallbackCopy(text, button, callback);
+                        }});
+                    }} else {{
+                        fallbackCopy(text, button, callback);
+                    }}
+                }}
+
+                function fallbackCopy(text, button, callback) {{
+                    var textarea = document.createElement('textarea');
+                    textarea.value = text;
+                    textarea.style.position = 'fixed';
+                    textarea.style.opacity = '0';
+                    document.body.appendChild(textarea);
+                    textarea.select();
+                    try {{
+                        document.execCommand('copy');
+                        var originalText = button.innerText;
+                        button.innerText = 'Copied!';
+                        setTimeout(function() {{
+                            button.innerText = originalText;
+                            if (callback) callback();
+                        }}, 1500);
+                    }} catch (e) {{
+                        alert('Copy failed. Please copy manually.');
+                    }}
+                    document.body.removeChild(textarea);
+                }}
+
+                if (copyUrlBtn) {{
+                    copyUrlBtn.onclick = function() {{
+                        copyToClipboard(urlInput.value, copyUrlBtn);
+                    }};
+                }}
+
+                if (copyKeyBtn) {{
+                    copyKeyBtn.onclick = function() {{
+                        copyToClipboard(apiInput.value, copyKeyBtn, function() {{
+                            // Re-hide the API key after copying
+                            apiInput.type = 'password';
+                            toggleBtn.innerText = 'Show';
+                        }});
+                    }};
+                }}
+
+                if (toggleBtn) {{
+                    toggleBtn.onclick = function() {{
+                        if (apiInput.type === 'password') {{
+                            apiInput.type = 'text';
+                            toggleBtn.innerText = 'Hide';
+                        }} else {{
+                            apiInput.type = 'password';
+                            toggleBtn.innerText = 'Show';
+                        }}
+                    }};
+                }}
+            }})();
         </script>
         """
-        return render_centered_html(info)
+        # Add logout link for form auth
+        logout_html = '<a href="/logout">Logout</a>' if show_logout_link() else ''
+        return render_centered_html(info, footer_content=logout_html)
 
     @app.get('/regenerate-api-key')
     def regenerate_api_key():

quasarr/api/arr/__init__.py

@@ -34,18 +34,57 @@ def require_api_key(func):
     return decorated
 
 
+def parse_payload(payload_str):
+    """
+    Parse the base64-encoded payload string into its components.
+
+    Supports both legacy 6-field format and new 7-field format:
+    - Legacy (6 fields): title|url|mirror|size_mb|password|imdb_id
+    - New (7 fields): title|url|mirror|size_mb|password|imdb_id|source_key
+
+    Returns:
+        dict with keys: title, url, mirror, size_mb, password, imdb_id, source_key
+    """
+    decoded = urlsafe_b64decode(payload_str.encode()).decode()
+    parts = decoded.split("|")
+
+    if len(parts) == 6:
+        # Legacy format - no source_key provided
+        title, url, mirror, size_mb, password, imdb_id = parts
+        source_key = None
+    elif len(parts) == 7:
+        # New format with source_key
+        title, url, mirror, size_mb, password, imdb_id, source_key = parts
+    else:
+        raise ValueError(f"expected 6 or 7 fields, got {len(parts)}")
+
+    return {
+        "title": title,
+        "url": url,
+        "mirror": None if mirror == "None" else mirror,
+        "size_mb": size_mb,
+        "password": password if password else None,
+        "imdb_id": imdb_id if imdb_id else None,
+        "source_key": source_key if source_key else None
+    }
+
+
 def setup_arr_routes(app):
     @app.get('/download/')
     def fake_nzb_file():
         payload = request.query.payload
         decoded_payload = urlsafe_b64decode(payload).decode("utf-8").split("|")
+
+        # Support both 6 and 7 field formats
         title = decoded_payload[0]
         url = decoded_payload[1]
         mirror = decoded_payload[2]
         size_mb = decoded_payload[3]
         password = decoded_payload[4]
         imdb_id = decoded_payload[5]
-        return f'<nzb><file title="{title}" url="{url}" mirror="{mirror}" size_mb="{size_mb}" password="{password}" imdb_id="{imdb_id}"/></nzb>'
+        source_key = decoded_payload[6] if len(decoded_payload) > 6 else ""
+
+        return f'<nzb><file title="{title}" url="{url}" mirror="{mirror}" size_mb="{size_mb}" password="{password}" imdb_id="{imdb_id}" source_key="{source_key}"/></nzb>'
 
     @app.post('/api')
     @require_api_key
@@ -65,10 +104,12 @@ def setup_arr_routes(app):
             size_mb = root.find(".//file").attrib["size_mb"]
             password = root.find(".//file").attrib.get("password")
             imdb_id = root.find(".//file").attrib.get("imdb_id")
+            source_key = root.find(".//file").attrib.get("source_key") or None
 
             info(f'Attempting download for "{title}"')
             request_from = request.headers.get('User-Agent')
-            downloaded = download(shared_state, request_from, title, url, mirror, size_mb, password, imdb_id)
+            downloaded = download(shared_state, request_from, title, url, mirror, size_mb, password, imdb_id,
+                                  source_key)
             try:
                 success = downloaded["success"]
                 package_id = downloaded["package_id"]
@@ -166,37 +207,31 @@ def setup_arr_routes(app):
                     if not payload:
                         abort(400, "missing 'payload' parameter in URL")
 
-                    title = url = mirror = size_mb = password = imdb_id = None
                     try:
-                        decoded = urlsafe_b64decode(payload.encode()).decode()
-                        parts = decoded.split("|")
-                        if len(parts) != 6:
-                            raise ValueError(f"expected 6 fields, got {len(parts)}")
-                        title, url, mirror, size_mb, password, imdb_id = parts
+                        parsed_payload = parse_payload(payload)
                     except Exception as e:
                         abort(400, f"invalid payload format: {e}")
 
-                    mirror = None if mirror == "None" else mirror
-
                     nzo_ids = []
-                    info(f'Attempting download for "{title}"')
+                    info(f'Attempting download for "{parsed_payload["title"]}"')
                     request_from = "lazylibrarian"
 
                     downloaded = download(
                         shared_state,
                         request_from,
-                        title,
-                        url,
-                        mirror,
-                        size_mb,
-                        password or None,
-                        imdb_id or None,
+                        parsed_payload["title"],
+                        parsed_payload["url"],
+                        parsed_payload["mirror"],
+                        parsed_payload["size_mb"],
+                        parsed_payload["password"],
+                        parsed_payload["imdb_id"],
+                        parsed_payload["source_key"],
                     )
 
                     try:
                         success = downloaded["success"]
                         package_id = downloaded["package_id"]
-                        title = downloaded.get("title", title)
+                        title = downloaded.get("title", parsed_payload["title"])
 
                         if success:
                             info(f'"{title}" added successfully!')
@@ -204,7 +239,7 @@ def setup_arr_routes(app):
                             info(f'"{title}" added unsuccessfully! See log for details.')
                         nzo_ids.append(package_id)
                     except KeyError:
-                        info(f'Failed to download "{title}" - no package_id returned')
+                        info(f'Failed to download "{parsed_payload["title"]}" - no package_id returned')
 
                     return {
                         "status": True,
@@ -353,7 +388,8 @@ def setup_arr_routes(app):
                             <enclosure url="{release.get("link", "")}" length="{release.get("size", 0)}" type="application/x-nzb" />
                         </item>'''
 
-                    requires_placeholder_item = not getattr(request.query, 'imdbid', '') and not getattr(request.query, 'q', '')
+                    requires_placeholder_item = not getattr(request.query, 'imdbid', '') and not getattr(request.query,
+                                                                                                         'q', '')
                     if requires_placeholder_item and not items:
                         items = f'''
                         <item>