quasarr 2.1.3__py3-none-any.whl → 2.1.5__py3-none-any.whl

quasarr/api/packages/__init__.py

@@ -9,11 +9,17 @@ from quasarr.providers.html_templates import render_button, render_centered_html
 
 
 def _get_category_emoji(cat):
-    return {'movies': '🎬', 'tv': '📺', 'docs': '📄', 'not_quasarr': '📦'}.get(cat, '📦')
+    return {'movies': '🎬', 'tv': '📺', 'docs': '📄', 'not_quasarr': '❓'}.get(cat, '❓')
 
 
 def _format_size(mb=None, bytes_val=None):
     if bytes_val is not None:
+        if bytes_val == 0:
+            return "? MB"
+        if bytes_val < 1024:
+            return f"{bytes_val} B"
+        if bytes_val < 1024 * 1024:
+            return f"{bytes_val // 1024} KB"
         mb = bytes_val / (1024 * 1024)
     if mb is None or mb == 0:
         return "? MB"
@@ -30,6 +36,7 @@ def _render_queue_item(item):
     filename = item.get('filename', 'Unknown')
     percentage = item.get('percentage', 0)
     timeleft = item.get('timeleft', '??:??:??')
+    bytes_val = item.get('bytes', 0)
     mb = item.get('mb', 0)
     cat = item.get('cat', 'not_quasarr')
     is_archive = item.get('is_archive', False)
@@ -51,9 +58,9 @@ def _render_queue_item(item):
     for prefix in ['[Downloading] ', '[Extracting] ', '[Paused] ', '[Linkgrabber] ', '[CAPTCHA not solved!] ']:
         display_name = display_name.replace(prefix, '')
 
-    archive_badge = '<span class="badge archive">📁 ARCHIVE</span>' if is_archive else ''
+    archive_badge = '<span class="badge archive">📁</span>' if is_archive else ''
     cat_emoji = _get_category_emoji(cat)
-    size_str = _format_size(mb=mb)
+    size_str = _format_size(bytes_val=bytes_val) if bytes_val else _format_size(mb=mb)
 
     # Progress bar - show "waiting..." for 0%
     if percentage == 0:
@@ -84,7 +91,6 @@ def _render_queue_item(item):
             <div class="package-header">
                 <span class="status-emoji">{status_emoji}</span>
                 <span class="package-name">{display_name}</span>
-                {archive_badge}
             </div>
             <div class="package-progress">
                 {progress_html}
@@ -93,7 +99,8 @@ def _render_queue_item(item):
             <div class="package-details">
                 <span>⏱️ {timeleft}</span>
                 <span>💾 {size_str}</span>
-                <span>{cat_emoji} {cat}</span>
+                <span>{cat_emoji}</span>
+                {archive_badge}
             </div>
             {actions}
         </div>
@@ -119,11 +126,11 @@ def _render_history_item(item):
     archive_badge = ''
     if is_archive:
         if extraction_status == 'SUCCESSFUL':
-            archive_badge = '<span class="badge extracted">✅ EXTRACTED</span>'
+            archive_badge = '<span class="badge extracted">✅</span>'
         elif extraction_status == 'RUNNING':
-            archive_badge = '<span class="badge pending">⏳ EXTRACTING</span>'
+            archive_badge = '<span class="badge pending">⏳</span>'
         else:
-            archive_badge = '<span class="badge archive">📁 ARCHIVE</span>'
+            archive_badge = '<span class="badge archive">📁</span>'
 
     status_emoji = '❌' if is_error else '✅'
     error_html = f'<div class="package-error">⚠️ {fail_message}</div>' if fail_message else ''
@@ -143,11 +150,11 @@ def _render_history_item(item):
             <div class="package-header">
                 <span class="status-emoji">{status_emoji}</span>
                 <span class="package-name">{name}</span>
-                {archive_badge}
             </div>
             <div class="package-details">
                 <span>💾 {size_str}</span>
-                <span>{cat_emoji} {category}</span>
+                <span>{cat_emoji}</span>
+                {archive_badge}
             </div>
             {error_html}
             {actions}
@@ -167,7 +174,12 @@ def _render_packages_content():
     quasarr_history = [p for p in history if p.get('category') != 'not_quasarr']
     other_history = [p for p in history if p.get('category') == 'not_quasarr']
 
-    # Build queue section
+    # Check if there's anything at all
+    has_quasarr_content = quasarr_queue or quasarr_history
+    has_other_content = other_queue or other_history
+    has_any_content = has_quasarr_content or has_other_content
+
+    # Build queue section (only if has items)
     queue_html = ''
     if quasarr_queue:
         queue_items = ''.join(_render_queue_item(item) for item in quasarr_queue)
@@ -177,10 +189,8 @@ def _render_packages_content():
                 <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
+    # Build history section (only if has items)
     history_html = ''
     if quasarr_history:
         history_items = ''.join(_render_history_item(item) for item in quasarr_history[:10])
@@ -204,20 +214,28 @@ def _render_packages_content():
             other_items += ''.join(_render_history_item(item) for item in other_history[:5])
 
         plural = 's' if other_count != 1 else ''
+        # Only add separator class if there's Quasarr content above
+        section_class = 'other-packages-section' if has_quasarr_content else 'other-packages-section no-separator'
         other_html = f'''
-            <div class="other-packages-section">
+            <div class="{section_class}">
                 <details id="otherPackagesDetails">
-                    <summary id="otherPackagesSummary">Show {other_count} non-Quasarr package{plural}</summary>
+                    <summary id="otherPackagesSummary">Show {other_count} other package{plural}</summary>
                     <div class="other-packages-content">{other_items}</div>
                 </details>
             </div>
         '''
 
+    # Only show "no downloads" if there's literally nothing
+    empty_html = ''
+    if not has_any_content:
+        empty_html = '<p class="empty-message">No packages</p>'
+
     return f'''
         <div class="packages-container">
             {queue_html}
             {history_html}
             {other_html}
+            {empty_html}
         </div>
     '''
 
@@ -283,6 +301,8 @@ def setup_packages_routes(app):
 
             {status_message}
 
+            <div id="slow-warning" class="slow-warning" style="display:none;">⚠️ Slow connection detected</div>
+
             <div id="packages-content">
                 {packages_content}
             </div>
@@ -349,7 +369,26 @@ def setup_packages_routes(app):
 
                 .empty-message {{ color: var(--text-muted, #888); font-style: italic; text-align: center; padding: 20px; }}
 
+                .slow-warning {{
+                    text-align: center;
+                    font-size: 0.85em;
+                    color: #856404;
+                    background: #fff3cd;
+                    border: 1px solid #ffc107;
+                    padding: 8px 12px;
+                    border-radius: 6px;
+                    margin-bottom: 15px;
+                }}
+                @media (prefers-color-scheme: dark) {{
+                    .slow-warning {{
+                        color: #ffc107;
+                        background: #3d3510;
+                        border-color: #665c00;
+                    }}
+                }}
+
                 .other-packages-section {{ margin-top: 30px; padding-top: 20px; border-top: 1px solid var(--border-color, #ddd); }}
+                .other-packages-section.no-separator {{ margin-top: 0; padding-top: 0; border-top: none; }}
                 .other-packages-section summary {{ cursor: pointer; padding: 8px 0; color: var(--text-muted, #666); }}
                 .other-packages-section summary:hover {{ color: var(--link-color, #0066cc); }}
                 .other-packages-content {{ margin-top: 15px; }}
@@ -405,24 +444,51 @@ def setup_packages_routes(app):
             <script>
                 // Background refresh - fetches content via AJAX, waits 5s between refresh cycles
                 let refreshPaused = false;
+                let slowConnection = false;
 
                 async function refreshContent() {{
                     if (refreshPaused) return;
+
+                    const startTime = Date.now();
+                    const warningEl = document.getElementById('slow-warning');
+
+                    // Save scroll position before refresh
+                    const scrollY = window.scrollY;
+
+                    // Show warning after 5s if still loading
+                    const slowTimer = setTimeout(() => {{
+                        slowConnection = true;
+                        if (warningEl) warningEl.style.display = 'block';
+                    }}, 5000);
+
                     try {{
                         const response = await fetch('/api/packages/content');
+                        const elapsed = Date.now() - startTime;
+
+                        clearTimeout(slowTimer);
+
+                        // Update slow connection state
+                        if (elapsed < 5000) {{
+                            slowConnection = false;
+                            if (warningEl) warningEl.style.display = 'none';
+                        }} else {{
+                            slowConnection = true;
+                            if (warningEl) warningEl.style.display = 'block';
+                        }}
+
                         if (response.ok) {{
                             const html = await response.text();
                             const container = document.getElementById('packages-content');
                             if (container && html) {{
                                 container.innerHTML = html;
-                                // Re-apply collapse state after content update
                                 restoreCollapseState();
+                                // Restore scroll position after content update
+                                window.scrollTo(0, scrollY);
                             }}
                         }}
                     }} catch (e) {{
-                        // Silent fail - will retry on next cycle
+                        clearTimeout(slowTimer);
                     }}
-                    // Schedule next refresh 5 seconds after this one completes
                     setTimeout(refreshContent, 5000);
                 }}
 
@@ -434,7 +500,7 @@ def setup_packages_routes(app):
                         const plural = count !== '1' ? 's' : '';
                         if (localStorage.getItem('otherPackagesOpen') === 'true') {{
                             otherDetails.open = true;
-                            otherSummary.textContent = 'Hide ' + count + ' non-Quasarr package' + plural;
+                            otherSummary.textContent = 'Hide ' + count + ' other package' + plural;
                         }}
                         // Re-attach event listener
                         otherDetails.onclick = null;
@@ -442,23 +508,36 @@ def setup_packages_routes(app):
                             localStorage.setItem('otherPackagesOpen', this.open);
                             const summaryEl = document.getElementById('otherPackagesSummary');
                             if (summaryEl) {{
-                                summaryEl.textContent = (this.open ? 'Hide ' : 'Show ') + count + ' non-Quasarr package' + plural;
+                                summaryEl.textContent = (this.open ? 'Hide ' : 'Show ') + count + ' other package' + plural;
                             }}
                         }});
                     }}
                 }}
 
-                // Start refresh cycle after initial 5s delay
-                setTimeout(refreshContent, 5000);
-
                 // Initial collapse state setup
                 restoreCollapseState();
 
-                // Clear status message from URL after display
+                // Clear status message from URL after display and auto-hide after 5s
                 if (window.location.search.includes('deleted=')) {{
                     const url = new URL(window.location);
                     url.searchParams.delete('deleted');
                     window.history.replaceState({{}}, '', url);
+
+                    // Hide the status message after 5 seconds
+                    const statusMsg = document.querySelector('.status-message');
+                    if (statusMsg) {{
+                        setTimeout(() => {{
+                            statusMsg.style.transition = 'opacity 0.3s';
+                            statusMsg.style.opacity = '0';
+                            setTimeout(() => statusMsg.remove(), 300);
+                        }}, 5000);
+                    }}
+
+                    // Reset refresh - start fresh 5s countdown after delete
+                    setTimeout(refreshContent, 5000);
+                }} else {{
+                    // Normal start - 5s delay
+                    setTimeout(refreshContent, 5000);
                 }}
 
                 // Delete modal

quasarr/downloads/packages/__init__.py

@@ -468,8 +468,10 @@ def get_packages(shared_state, _cache=None):
                 details = package["details"]
                 name = f"[Linkgrabber] {details.get('name', 'unknown')}"
                 try:
-                    mb = mb_left = int(details.get("bytesTotal", 0)) / (1024 * 1024)
+                    bytes_total = int(details.get("bytesTotal", 0))
+                    mb = mb_left = bytes_total / (1024 * 1024)
                 except (KeyError, TypeError, ValueError):
+                    bytes_total = 0
                     mb = mb_left = 0
                 package_id = package["comment"]
                 category = get_category_from_package_id(package_id)
@@ -505,27 +507,30 @@ def get_packages(shared_state, _cache=None):
                 details = package["details"]
                 name = f"[CAPTCHA not solved!] {details.get('title', 'unknown')}"
                 mb = mb_left = details.get("size_mb") or 0
+                bytes_total = 0  # Protected packages don't have reliable byte data
                 package_id = package.get("package_id")
                 category = get_category_from_package_id(package_id)
                 package_type = "protected"
                 package_uuid = None
 
-            if package_id:
+            # Use package_id if available, otherwise use uuid as fallback for non-Quasarr packages
+            effective_id = package_id or package_uuid
+
+            if effective_id:
                 try:
-                    mb_left = int(mb_left) if mb_left else 0
-                    mb = int(mb) if mb else 0
                     percentage = int(100 * (mb - mb_left) / mb) if mb > 0 else 0
                 except (ZeroDivisionError, ValueError, TypeError):
                     percentage = 0
 
                 downloads["queue"].append({
                     "index": queue_index,
-                    "nzo_id": package_id,
+                    "nzo_id": effective_id,
                     "priority": "Normal",
                     "filename": name,
                     "cat": category,
-                    "mbleft": mb_left,
-                    "mb": mb,
+                    "mbleft": int(mb_left) if mb_left else 0,
+                    "mb": int(mb) if mb else 0,
+                    "bytes": bytes_total,
                     "status": "Downloading",
                     "percentage": percentage,
                     "timeleft": time_left,
@@ -535,18 +540,21 @@ def get_packages(shared_state, _cache=None):
                 })
                 queue_index += 1
             else:
-                debug(f"get_packages: Skipping queue package without package_id: {name}")
+                debug(f"get_packages: Skipping queue package without package_id or uuid: {name}")
 
         elif package["location"] == "history":
             details = package["details"]
             name = details.get("name", "unknown")
             try:
-                size = int(details.get("bytesLoaded", 0))
+                # Use bytesLoaded first, fall back to bytesTotal for failed/incomplete downloads
+                size = int(details.get("bytesLoaded", 0)) or int(details.get("bytesTotal", 0))
             except (KeyError, TypeError, ValueError):
                 size = 0
             storage = details.get("saveTo", "/")
 
             package_id = package.get("comment")
+            # Use package_id if available, otherwise use uuid as fallback for non-Quasarr packages
+            effective_id = package_id or package.get("uuid")
             category = get_category_from_package_id(package_id)
 
             error = package.get("error")
@@ -562,7 +570,7 @@ def get_packages(shared_state, _cache=None):
                 "category": category,
                 "storage": storage,
                 "status": status,
-                "nzo_id": package_id,
+                "nzo_id": effective_id,
                 "name": name,
                 "bytes": int(size),
                 "percentage": 100,
@@ -671,7 +679,8 @@ def delete_package(shared_state, package_id):
         found = False
         for package_location in packages:
             for package in packages[package_location]:
-                if package.get("nzo_id") == package_id:
+                # Compare as strings to handle int UUIDs from JDownloader
+                if str(package.get("nzo_id", "")) == str(package_id):
                     found = True
                     package_type = package.get("type")
                     package_uuid = package.get("uuid")

quasarr/providers/version.py

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

{quasarr-2.1.3.dist-info → quasarr-2.1.5.dist-info}/METADATA

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

@@ -3,7 +3,7 @@ quasarr/api/__init__.py,sha256=yrDJM0qxmsOruOyqUwhSmmaT6E3DLK-yPy7Lutk1WYM,16384
 quasarr/api/arr/__init__.py,sha256=eEop8A5t936uT5azn4qz0bq1DMX84_Ja16wyleGFhyM,18495
 quasarr/api/captcha/__init__.py,sha256=2pca9jnJMWZECHeAvKP9Lwsa3_GkVsvQEn7rof8Ep1s,73504
 quasarr/api/config/__init__.py,sha256=HDoqRv6El-e5iejVpwEz6ttySjDeiTQGom5D__nachU,13682
-quasarr/api/packages/__init__.py,sha256=srQw71KSMr2gjvrISyXute606QJhPdVNwaGzRM9OrVA,22989
+quasarr/api/packages/__init__.py,sha256=IJxAPiqN14zLXFn820pZrqWGq4wuXw1WtjUoZr2U00Y,26311
 quasarr/api/sponsors_helper/__init__.py,sha256=vZIFGkc5HTRozjvi47tqxz6XpwDe8sDXVyeydc9k0Y0,6708
 quasarr/api/statistics/__init__.py,sha256=NrBAjjHkIUE95HhPUGIfNqh2IqBqJ_zm00S90Y-Qnus,7038
 quasarr/downloads/__init__.py,sha256=BUZpqWN3VnYSM8ZX4lC3MXVfShwx95I6FKz8Xl95T1s,16004
@@ -11,7 +11,7 @@ quasarr/downloads/linkcrypters/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 quasarr/downloads/linkcrypters/al.py,sha256=mfUG5VclC_-FcGoZL9zHYD7dz7X_YpaNmoKkgiyl9-0,8812
 quasarr/downloads/linkcrypters/filecrypt.py,sha256=nUZCTmvKylaNk1KAXcYUV1FgQCVAKNE3roXCNaqHLYA,17057
 quasarr/downloads/linkcrypters/hide.py,sha256=H4hJWhENkszV1u_ULC3aOW2fu9infC-Nv-7wx2DYqrA,6266
-quasarr/downloads/packages/__init__.py,sha256=zDMhLJz-16r4WSv2zzSlcBJEFrIUky2dRDkQaQLVSXY,32055
+quasarr/downloads/packages/__init__.py,sha256=ZHU5eYNfl62IKyxYIzTgfzUYbPZIYgljHiPqHJAYogg,32747
 quasarr/downloads/sources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/downloads/sources/al.py,sha256=g587VESZRZHZ03uxHKpufEr5qAtzbyGLmoijksU35jk,27297
 quasarr/downloads/sources/by.py,sha256=kmUTn3izayRCV7W-t0E4kYE8qTbt3L3reCLozfvRGcU,3807
@@ -43,7 +43,7 @@ quasarr/providers/obfuscated.py,sha256=d0dxu3oPqDqN8I7qmGPPIBqjLzTQbZTQsLAZ5auw1
 quasarr/providers/shared_state.py,sha256=5a_ZbGqTvt4-OqBt2a1WtR9I5J_Ky7IlkEY8EGtKVu8,30646
 quasarr/providers/statistics.py,sha256=cEQixYnDMDqtm5wWe40E_2ucyo4mD0n3SrfelhQi1L8,6452
 quasarr/providers/utils.py,sha256=mcUPbcXMsLmrYv0CTZO5a9aOt2-JLyL3SZxu6N8OyjU,12075
-quasarr/providers/version.py,sha256=ann8tOgDNixaxy3D0ASth3qD5mrqZy1_0RWcpePM5Rw,4003
+quasarr/providers/version.py,sha256=yR-O_QV4gc8tIxIWrG7LptGuF-2qZ9GO43zdC6USiuc,4003
 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=WXue9LaT4y0BzsbKtHbN6bb_72c4AZZWR9NP-vg9-cg,12462
@@ -73,9 +73,9 @@ quasarr/storage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 quasarr/storage/config.py,sha256=SSTgIce2FVYoVTK_6OCU3msknhxuLA3EC4Kcrrf_dxQ,6378
 quasarr/storage/setup.py,sha256=eXtgUqMacbaUDy-dszPtT15O9lJKSO1eI3v0jGjMiUA,42361
 quasarr/storage/sqlite_database.py,sha256=yMqFQfKf0k7YS-6Z3_7pj4z1GwWSXJ8uvF4IydXsuTE,3554
-quasarr-2.1.3.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
-quasarr-2.1.3.dist-info/METADATA,sha256=2CGHsGgnLrJgv0pboVyhAiKE9Sfy6RzfX3hGoD2DhHo,14914
-quasarr-2.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-quasarr-2.1.3.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
-quasarr-2.1.3.dist-info/top_level.txt,sha256=dipJdaRda5ruTZkoGfZU60bY4l9dtPlmOWwxK_oGSF0,8
-quasarr-2.1.3.dist-info/RECORD,,
+quasarr-2.1.5.dist-info/licenses/LICENSE,sha256=QQFCAfDgt7lSA8oSWDHIZ9aTjFbZaBJdjnGOHkuhK7k,1060
+quasarr-2.1.5.dist-info/METADATA,sha256=7rXMH9Ghh602E8meHbD3QEbHkBoW_NbNbFzjmr-DxBc,14914
+quasarr-2.1.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+quasarr-2.1.5.dist-info/entry_points.txt,sha256=gXi8mUKsIqKVvn-bOc8E5f04sK_KoMCC-ty6b2Hf-jc,40
+quasarr-2.1.5.dist-info/top_level.txt,sha256=dipJdaRda5ruTZkoGfZU60bY4l9dtPlmOWwxK_oGSF0,8
+quasarr-2.1.5.dist-info/RECORD,,