quasarr 2.0.0__py3-none-any.whl → 2.1.1__py3-none-any.whl

quasarr/api/__init__.py

@@ -25,7 +25,7 @@ def get_api(shared_state_dict, shared_state_lock):
 
     # Auth: routes must come first, then hook
     add_auth_routes(app)
-    add_auth_hook(app, whitelist_prefixes=['/api', '/api/' '/sponsors_helper/', '/download/'])
+    add_auth_hook(app, whitelist_prefixes=['/api', '/api/', '/sponsors_helper/', '/download/'])
 
     setup_arr_routes(app)
     setup_captcha_routes(app)
@@ -66,7 +66,7 @@ def get_api(shared_state_dict, shared_state_lock):
         # JDownloader status
         jd_status = f"""
             <div class="status-bar">
-                <span class="status-item {'status-ok' if jd_connected else 'status-error'}">
+                <span class="status-pill {'success' if jd_connected else 'error'}">
                     {'✅' if jd_connected else '❌'} JDownloader {'Connected' if jd_connected else 'Disconnected'}
                 </span>
             </div>
@@ -389,8 +389,8 @@ def get_api(shared_state_dict, shared_state_lock):
         </script>
         """
         # Add logout link for form auth
-        logout_html = '<div class="logout-link"><a href="/logout">Logout</a></div>' if show_logout_link() else ''
-        return render_centered_html(info + logout_html)
+        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

@@ -6,7 +6,6 @@ import traceback
 import xml.sax.saxutils as sax_utils
 from base64 import urlsafe_b64decode
 from datetime import datetime
-from functools import wraps
 from urllib.parse import urlparse, parse_qs
 from xml.etree import ElementTree
 
@@ -15,23 +14,45 @@ from bottle import abort, request
 from quasarr.downloads import download
 from quasarr.downloads.packages import get_packages, delete_package
 from quasarr.providers import shared_state
+from quasarr.providers.auth import require_api_key
 from quasarr.providers.log import info, debug
 from quasarr.providers.version import get_version
 from quasarr.search import get_search_results
-from quasarr.storage.config import Config
 
 
-def require_api_key(func):
-    @wraps(func)
-    def decorated(*args, **kwargs):
-        api_key = Config('API').get('key')
-        if not request.query.apikey:
-            return abort(401, "Missing API key")
-        if request.query.apikey != api_key:
-            return abort(403, "Invalid API key")
-        return func(*args, **kwargs)
-
-    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):
@@ -39,13 +60,17 @@ def setup_arr_routes(app):
     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 +90,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 +193,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 +225,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 +374,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>

quasarr/api/config/__init__.py

@@ -235,7 +235,7 @@ def setup_config(app, shared_state):
         }}
         </script>
         '''
-        return render_form("Configure FlareSolverr", form_html)
+        return render_form("FlareSolverr", form_html)
 
     @app.post('/api/flaresolverr')
     def set_flaresolverr_url():

quasarr/api/packages/__init__.py

@@ -13,21 +13,17 @@ def setup_packages_routes(app):
     def delete_package_route(package_id):
         success = delete_package(shared_state, package_id)
 
+        # Redirect back to packages page with status message via query param
+        from bottle import redirect
         if success:
-            return render_centered_html(f'''
-                <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-                <p>✅ Package deleted successfully.</p>
-                <p>{render_button("Back to Packages", "primary", {"onclick": "location.href='/packages'"})}</p>
-            ''')
+            redirect('/packages?deleted=1')
         else:
-            return render_centered_html(f'''
-                <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-                <p>❌ Failed to delete package.</p>
-                <p>{render_button("Back to Packages", "secondary", {"onclick": "location.href='/packages'"})}</p>
-            ''')
+            redirect('/packages?deleted=0')
 
     @app.get('/packages')
     def packages_status():
+        from bottle import request
+
         try:
             device = shared_state.values["device"]
         except KeyError:
@@ -41,6 +37,14 @@ def setup_packages_routes(app):
                 <p>{back_btn}</p>
             ''')
 
+        # Check for delete status from redirect
+        deleted = request.query.get('deleted')
+        status_message = ""
+        if deleted == '1':
+            status_message = '<div class="status-message success">✅ Package deleted successfully.</div>'
+        elif deleted == '0':
+            status_message = '<div class="status-message error">❌ Failed to delete package.</div>'
+
         # Get packages data
         downloads = get_packages(shared_state)
         queue = downloads.get('queue', [])
@@ -143,29 +147,43 @@ def setup_packages_routes(app):
         def render_history_item(item):
             name = item.get('name', 'Unknown')
             status = item.get('status', 'Unknown')
-            category = item.get('category', 'not_quasarr')
             bytes_val = item.get('bytes', 0)
-            is_archive = item.get('is_archive')
-            extraction_ok = item.get('extraction_ok', False)
+            category = item.get('category', 'not_quasarr')
+            is_archive = item.get('is_archive', False)
+            extraction_status = item.get('extraction_status', '')
             fail_message = item.get('fail_message', '')
             nzo_id = item.get('nzo_id', '')
 
-            status_emoji = '✅' if status == 'Completed' else '❌'
-
-            archive_badge = ''
-            if is_archive:
-                archive_badge = '<span class="badge extracted">📁 EXTRACTED</span>' if extraction_ok else '<span class="badge pending">📁 NOT EXTRACTED</span>'
+            is_error = status.lower() in ['failed', 'error'] or fail_message
+            card_class = 'package-card error' if is_error else 'package-card'
 
             cat_emoji = get_category_emoji(category)
             size_str = format_size(bytes_val=bytes_val)
 
+            archive_badge = ''
+            if is_archive:
+                if extraction_status == 'SUCCESSFUL':
+                    archive_badge = '<span class="badge extracted">✅ EXTRACTED</span>'
+                elif extraction_status == 'RUNNING':
+                    archive_badge = '<span class="badge pending">⏳ EXTRACTING</span>'
+                else:
+                    archive_badge = '<span class="badge archive">📁 ARCHIVE</span>'
+
+            status_emoji = '❌' if is_error else '✅'
             error_html = f'<div class="package-error">⚠️ {fail_message}</div>' if fail_message else ''
-            error_class = 'error' if status != 'Completed' else ''
 
-            delete_btn = f'<div class="package-actions right-only"><button class="btn-small danger" onclick="confirmDelete(\'{nzo_id}\', \'{escape_js(name)}\')">🗑️</button></div>' if nzo_id else ''
+            # Delete button for history items
+            if nzo_id:
+                actions = f'''
+                    <div class="package-actions right-only">
+                        <button class="btn-small danger" onclick="confirmDelete('{nzo_id}', '{escape_js(name)}')">🗑️</button>
+                    </div>
+                '''
+            else:
+                actions = ''
 
             return f'''
-                <div class="package-card {error_class}">
+                <div class="{card_class}">
                     <div class="package-header">
                         <span class="status-emoji">{status_emoji}</span>
                         <span class="package-name">{name}</span>
@@ -176,24 +194,46 @@ def setup_packages_routes(app):
                         <span>{cat_emoji} {category}</span>
                     </div>
                     {error_html}
-                    {delete_btn}
+                    {actions}
                 </div>
             '''
 
-        # Build HTML sections
-        queue_html = ''.join(render_queue_item(item) for item in
-                             quasarr_queue) if quasarr_queue else '<p class="empty-message">No Quasarr packages in queue</p>'
-        history_html = ''.join(render_history_item(item) for item in
-                               quasarr_history) if quasarr_history else '<p class="empty-message">No Quasarr packages in history</p>'
+        # Build queue section
+        queue_html = ''
+        if quasarr_queue:
+            queue_items = ''.join(render_queue_item(item) for item in quasarr_queue)
+            queue_html = f'''
+                <div class="section">
+                    <h3>⬇️ Downloading</h3>
+                    <div class="packages-list">{queue_items}</div>
+                </div>
+            '''
+        else:
+            queue_html = '<div class="section"><p class="empty-message">No active downloads</p></div>'
+
+        # Build history section
+        history_html = ''
+        if quasarr_history:
+            history_items = ''.join(render_history_item(item) for item in quasarr_history[:10])
+            history_html = f'''
+                <div class="section">
+                    <h3>📜 Recent History</h3>
+                    <div class="packages-list">{history_items}</div>
+                </div>
+            '''
 
+        # Build "other packages" section (non-Quasarr)
         other_html = ''
-        if other_queue or other_history:
-            other_count = len(other_queue) + len(other_history)
+        other_count = len(other_queue) + len(other_history)
+        if other_count > 0:
             other_items = ''
             if other_queue:
-                other_items += '<h4>⏳ Queue</h4>' + ''.join(render_queue_item(item) for item in other_queue)
+                other_items += f'<h4>Queue ({len(other_queue)})</h4>'
+                other_items += ''.join(render_queue_item(item) for item in other_queue)
             if other_history:
-                other_items += '<h4>📜 History</h4>' + ''.join(render_history_item(item) for item in other_history)
+                other_items += f'<h4>History ({len(other_history)})</h4>'
+                other_items += ''.join(render_history_item(item) for item in other_history[:5])
+
             plural = 's' if other_count != 1 else ''
             other_html = f'''
                 <div class="other-packages-section">
@@ -204,36 +244,30 @@ def setup_packages_routes(app):
                 </div>
             '''
 
-        queue_extra = f" + {len(other_queue)} other" if other_queue else ""
-        history_extra = f" + {len(other_history)} other" if other_history else ""
-
-        refresh_btn = render_button("Refresh Now", "primary", {"onclick": "location.reload()"})
         back_btn = render_button("Back", "secondary", {"onclick": "location.href='/'"})
 
         packages_html = f'''
             <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-            <h2>📦 Package Status</h2>
-            <div class="refresh-indicator"><span id="countdown">30</span>s until refresh</div>
+            <h2>Packages</h2>
+
+            {status_message}
+
+            <div class="refresh-indicator" onclick="location.reload()">
+                Auto-refresh in <span id="countdown">10</span>s
+            </div>
 
             <div class="packages-container">
-                <div class="section">
-                    <h3>⏳ Queue ({len(quasarr_queue)}{queue_extra})</h3>
-                    <div class="packages-list">{queue_html}</div>
-                </div>
-                <div class="section">
-                    <h3>📜 History ({len(quasarr_history)}{history_extra})</h3>
-                    <div class="packages-list">{history_html}</div>
-                </div>
+                {queue_html}
+                {history_html}
                 {other_html}
             </div>
 
-            <p>{refresh_btn}</p>
             <p>{back_btn}</p>
 
-            <!-- Delete Confirmation Modal -->
-            <div id="deleteModal" class="modal">
+            <!-- Delete confirmation modal -->
+            <div class="modal" id="deleteModal">
                 <div class="modal-content">
-                    <h3>⚠️ Delete Package?</h3>
+                    <h3>🗑️ Delete Package?</h3>
                     <p class="modal-package-name" id="modalPackageName"></p>
                     <div class="modal-warning">
                         <strong>⛔ Warning:</strong> This will permanently delete the package AND all associated files from disk. This action cannot be undone!
@@ -289,7 +323,8 @@ def setup_packages_routes(app):
                 .btn-small.danger:hover {{ background: var(--btn-danger-hover-bg, #dc3545); color: white; }}
 
                 .empty-message {{ color: var(--text-muted, #888); font-style: italic; text-align: center; padding: 20px; }}
-                .refresh-indicator {{ text-align: center; font-size: 0.85em; color: var(--text-muted, #888); margin-bottom: 15px; }}
+                .refresh-indicator {{ text-align: center; font-size: 0.85em; color: var(--text-muted, #888); margin-bottom: 15px; cursor: pointer; }}
+                .refresh-indicator:hover {{ color: var(--link-color, #0066cc); text-decoration: underline; }}
 
                 .other-packages-section {{ margin-top: 30px; padding-top: 20px; border-top: 1px solid var(--border-color, #ddd); }}
                 .other-packages-section summary {{ cursor: pointer; padding: 8px 0; color: var(--text-muted, #666); }}
@@ -297,12 +332,30 @@ def setup_packages_routes(app):
                 .other-packages-content {{ margin-top: 15px; }}
                 .other-packages-content h4 {{ margin: 15px 0 10px 0; font-size: 0.95em; color: var(--text-muted, #666); }}
 
+                /* Status message styling */
+                .status-message {{
+                    padding: 10px 15px;
+                    border-radius: 6px;
+                    margin-bottom: 15px;
+                    font-weight: 500;
+                }}
+                .status-message.success {{
+                    background: var(--success-bg, #d1e7dd);
+                    color: var(--success-color, #198754);
+                    border: 1px solid var(--success-border, #a3cfbb);
+                }}
+                .status-message.error {{
+                    background: var(--error-bg, #f8d7da);
+                    color: var(--error-color, #dc3545);
+                    border: 1px solid var(--error-border, #f1aeb5);
+                }}
+
                 /* Modal */
                 .modal {{ display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,0.5); z-index: 1000; align-items: center; justify-content: center; }}
                 .modal.show {{ display: flex; }}
                 .modal-content {{ background: var(--modal-bg, white); padding: 25px; border-radius: 12px; max-width: 400px; width: 90%; text-align: center; }}
                 .modal-content h3 {{ margin: 0 0 15px 0; color: var(--error-msg-color, #c62828); }}
-                .modal-package-name {{ font-weight: 500; word-break: break-word; padding: 10px; background: var(--card-bg, #f5f5f5); border-radius: 6px; margin: 10px 0; }}
+                .modal-package-name {{ font-weight: 500; word-break: break-word; padding: 10px; background: var(--code-bg, #f5f5f5); border-radius: 6px; margin: 10px 0; }}
                 .modal-warning {{ background: var(--error-msg-bg, #ffebee); color: var(--error-msg-color, #c62828); padding: 12px; border-radius: 6px; margin: 15px 0; font-size: 0.9em; text-align: left; }}
                 .modal-buttons {{ display: flex; gap: 10px; justify-content: center; margin-top: 20px; }}
                 .btn-danger {{ background: var(--btn-danger-bg, #dc3545); color: white; border: none; padding: 10px 20px; border-radius: 6px; cursor: pointer; font-weight: 500; }}
@@ -314,19 +367,20 @@ def setup_packages_routes(app):
                         --card-bg: #2d3748; --card-border: #4a5568; --card-shadow: rgba(0,0,0,0.3);
                         --border-color: #4a5568; --text-muted: #a0aec0;
                         --progress-track: #4a5568; --progress-fill: #68d391;
-                        --error-border: #fc8181; --error-bg: #2d2d2d; --error-msg-bg: #3d2d2d; --error-msg-color: #fc8181;
+                        --error-border: #fc8181; --error-bg: #3d2d2d; --error-msg-bg: #3d2d2d; --error-msg-color: #fc8181;
                         --badge-archive-bg: #1a365d; --badge-archive-color: #63b3ed;
                         --badge-success-bg: #1c4532; --badge-success-color: #68d391;
                         --badge-warning-bg: #3d2d1a; --badge-warning-color: #f6ad55;
-                        --link-color: #63b3ed; --modal-bg: #2d3748;
+                        --link-color: #63b3ed; --modal-bg: #2d3748; --code-bg: #1a202c;
                         --btn-primary-bg: #3182ce; --btn-primary-hover: #2c5282;
                         --btn-danger-text: #fc8181; --btn-danger-border: #fc8181; --btn-danger-hover-bg: #e53e3e;
+                        --success-bg: #1c4532; --success-color: #68d391; --success-border: #276749;
                     }}
                 }}
             </style>
 
             <script>
-                let countdown = 30;
+                let countdown = 10;
                 const countdownEl = document.getElementById('countdown');
                 const refreshInterval = setInterval(() => {{
                     countdown--;
@@ -334,6 +388,13 @@ def setup_packages_routes(app):
                     if (countdown <= 0) location.reload();
                 }}, 1000);
 
+                // Clear status message from URL after display
+                if (window.location.search.includes('deleted=')) {{
+                    const url = new URL(window.location);
+                    url.searchParams.delete('deleted');
+                    window.history.replaceState({{}}, '', url);
+                }}
+
                 // Restore collapse state from localStorage
                 const otherDetails = document.getElementById('otherPackagesDetails');
                 const otherSummary = document.getElementById('otherPackagesSummary');

quasarr/api/sponsors_helper/__init__.py

@@ -8,13 +8,21 @@ from bottle import request, abort
 
 from quasarr.downloads import fail
 from quasarr.providers import shared_state
+from quasarr.providers.auth import require_api_key
 from quasarr.providers.log import info
 from quasarr.providers.notifications import send_discord_message
 from quasarr.providers.statistics import StatsHelper
 
 
 def setup_sponsors_helper_routes(app):
+    @app.get("/sponsors_helper/api/ping/")
+    @require_api_key
+    def ping_api():
+        """Health check endpoint for SponsorsHelper to verify connectivity."""
+        return "pong"
+
     @app.get("/sponsors_helper/api/to_decrypt/")
+    @require_api_key
     def to_decrypt_api():
         try:
             if not shared_state.values["helper_active"]:
@@ -60,6 +68,7 @@ def setup_sponsors_helper_routes(app):
             return abort(500, str(e))
 
     @app.post("/sponsors_helper/api/to_download/")
+    @require_api_key
     def to_download_api():
         try:
             data = request.json
@@ -86,9 +95,10 @@ def setup_sponsors_helper_routes(app):
             info(f"Error decrypting: {e}")
 
         StatsHelper(shared_state).increment_failed_decryptions_automatic()
-        return abort(500, "Failed")  #
+        return abort(500, "Failed")
 
     @app.post("/sponsors_helper/api/to_replace/")
+    @require_api_key
     def to_replace_api():
         try:
             data = request.json
@@ -130,6 +140,7 @@ def setup_sponsors_helper_routes(app):
             return {"error": str(e)}, 500
 
     @app.delete("/sponsors_helper/api/to_failed/")
+    @require_api_key
     def move_to_failed_api():
         try:
             StatsHelper(shared_state).increment_failed_decryptions_automatic()
@@ -153,6 +164,7 @@ def setup_sponsors_helper_routes(app):
         return abort(500, "Failed")
 
     @app.put("/sponsors_helper/api/set_sponsor_status/")
+    @require_api_key
     def activate_sponsor_status():
         try:
             data = request.body.read().decode("utf-8")
@@ -164,7 +176,3 @@ def setup_sponsors_helper_routes(app):
         except:
             pass
         return abort(500, "Failed")
-
-    @app.get("/sponsors_helper/api/ping/")
-    def get_sponsor_status():
-        return "pong"