quasarr 2.4.11__py3-none-any.whl → 2.6.0__py3-none-any.whl

quasarr/api/jdownloader/__init__.py

@@ -0,0 +1,232 @@
+# -*- coding: utf-8 -*-
+# Quasarr
+# Project by https://github.com/rix1337
+
+from quasarr.providers.html_templates import render_button
+from quasarr.storage.config import Config
+
+
+def get_jdownloader_status(shared_state):
+    """Get JDownloader connection status and device name."""
+    try:
+        device = shared_state.values.get("device")
+        jd_connected = device is not None and device is not False
+    except:
+        jd_connected = False
+
+    jd_config = Config("JDownloader")
+    jd_device = jd_config.get("device") or ""
+    
+    dev_name = jd_device if jd_device else "JDownloader"
+    dev_name_safe = dev_name.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace('"', "&quot;")
+
+    if jd_connected:
+        status_text = f"✅ {dev_name_safe} connected"
+        status_class = "success"
+    elif jd_device:
+        status_text = f"❌ {dev_name_safe} disconnected"
+        status_class = "error"
+    else:
+        status_text = "❌ JDownloader disconnected"
+        status_class = "error"
+
+    return {
+        "connected": jd_connected,
+        "device_name": jd_device,
+        "status_text": status_text,
+        "status_class": status_class
+    }
+
+
+def get_jdownloader_modal_script():
+    """Return the JavaScript for the JDownloader configuration modal."""
+    jd_config = Config("JDownloader")
+    jd_user = jd_config.get("user") or ""
+    jd_pass = jd_config.get("password") or ""
+    jd_device = jd_config.get("device") or ""
+    
+    jd_user_js = jd_user.replace("\\", "\\\\").replace("'", "\\'")
+    jd_pass_js = jd_pass.replace("\\", "\\\\").replace("'", "\\'")
+    jd_device_js = jd_device.replace("\\", "\\\\").replace("'", "\\'")
+
+    return f"""
+    <script>
+    function openJDownloaderModal() {{
+        var currentUser = '{jd_user_js}';
+        var currentPass = '{jd_pass_js}';
+        var currentDevice = '{jd_device_js}';
+        
+        var content = `
+            <div id="jd-step-1">
+                <input type="hidden" id="jd-current-device" value="${{currentDevice}}">
+                <p><strong>JDownloader must be running and connected to My JDownloader!</strong></p>
+                <div style="margin-bottom: 1rem;">
+                    <label style="display:block; font-size: 0.875rem;">E-Mail</label>
+                    <input type="text" id="jd-user" value="${{currentUser}}" placeholder="user@example.org" style="width: 100%; padding: 0.375rem 0.75rem; border: 1px solid #ced4da; border-radius: 0.25rem;">
+                </div>
+                <div style="margin-bottom: 1rem;">
+                    <label style="display:block; font-size: 0.875rem;">Password</label>
+                    <input type="password" id="jd-pass" value="${{currentPass}}" placeholder="Password" style="width: 100%; padding: 0.375rem 0.75rem; border: 1px solid #ced4da; border-radius: 0.25rem;">
+                </div>
+                <div id="jd-status" style="margin-bottom: 0.5rem; font-size: 0.875rem; min-height: 1.25em;"></div>
+                <button class="btn-primary" onclick="verifyJDCredentials()">Verify Credentials</button>
+            </div>
+            
+            <div id="jd-step-2" style="display:none;">
+                <p>Select your JDownloader instance:</p>
+                <div style="margin-bottom: 1rem;">
+                    <select id="jd-device" style="width: 100%; padding: 0.375rem 0.75rem; border: 1px solid #ced4da; border-radius: 0.25rem;"></select>
+                </div>
+                <div id="jd-save-status" style="margin-bottom: 0.5rem; font-size: 0.875rem; min-height: 1.25em;"></div>
+                <button class="btn-primary" onclick="saveJDSettings()">Save</button>
+            </div>
+        `;
+        
+        showModal('Configure JDownloader', content, '<button class="btn-secondary" onclick="closeModal()">Close</button>');
+    }}
+
+    function verifyJDCredentials() {{
+        var user = document.getElementById('jd-user').value;
+        var pass = document.getElementById('jd-pass').value;
+        var statusDiv = document.getElementById('jd-status');
+        
+        statusDiv.innerHTML = 'Verifying...';
+        statusDiv.style.color = 'var(--secondary, #6c757d)';
+        
+        fetch('/api/jdownloader/verify', {{
+            method: 'POST',
+            headers: {{ 'Content-Type': 'application/json' }},
+            body: JSON.stringify({{ user: user, pass: pass }})
+        }})
+        .then(response => response.json())
+        .then(data => {{
+            if (data.success) {{
+                var select = document.getElementById('jd-device');
+                select.innerHTML = '';
+                var currentDevice = document.getElementById('jd-current-device').value;
+                data.devices.forEach(device => {{
+                    var opt = document.createElement('option');
+                    opt.value = device;
+                    opt.innerHTML = device;
+                    if (device === currentDevice) {{
+                        opt.selected = true;
+                    }}
+                    select.appendChild(opt);
+                }});
+                
+                document.getElementById('jd-step-1').style.display = 'none';
+                document.getElementById('jd-step-2').style.display = 'block';
+            }} else {{
+                statusDiv.innerHTML = '❌ ' + (data.message || 'Verification failed');
+                statusDiv.style.color = '#dc3545';
+            }}
+        }})
+        .catch(error => {{
+            statusDiv.innerHTML = '❌ Error: ' + error.message;
+            statusDiv.style.color = '#dc3545';
+        }});
+    }}
+
+    function saveJDSettings() {{
+        var user = document.getElementById('jd-user').value;
+        var pass = document.getElementById('jd-pass').value;
+        var device = document.getElementById('jd-device').value;
+        var statusDiv = document.getElementById('jd-save-status');
+        
+        statusDiv.innerHTML = 'Saving...';
+        statusDiv.style.color = 'var(--secondary, #6c757d)';
+        
+        fetch('/api/jdownloader/save', {{
+            method: 'POST',
+            headers: {{ 'Content-Type': 'application/json' }},
+            body: JSON.stringify({{ user: user, pass: pass, device: device }})
+        }})
+        .then(response => response.json())
+        .then(data => {{
+            if (data.success) {{
+                statusDiv.innerHTML = '✅ ' + data.message;
+                statusDiv.style.color = '#198754';
+                setTimeout(function() {{
+                    window.location.reload();
+                }}, 1000);
+            }} else {{
+                statusDiv.innerHTML = '❌ ' + data.message;
+                statusDiv.style.color = '#dc3545';
+            }}
+        }})
+        .catch(error => {{
+            statusDiv.innerHTML = '❌ Error: ' + error.message;
+            statusDiv.style.color = '#dc3545';
+        }});
+    }}
+    </script>
+    """
+
+
+def get_jdownloader_status_pill(shared_state):
+    """Return the HTML for the JDownloader status pill."""
+    status = get_jdownloader_status(shared_state)
+    
+    return f"""
+        <span class="status-pill {status['status_class']}" 
+              onclick="openJDownloaderModal()" 
+              style="cursor: pointer;"
+              title="Click to configure JDownloader">
+            {status['status_text']}
+        </span>
+    """
+
+
+def get_jdownloader_disconnected_page(shared_state, back_url="/"):
+    """Return a full error page when JDownloader is disconnected."""
+    import quasarr.providers.html_images as images
+    from quasarr.providers.html_templates import render_centered_html
+    
+    status_pill = get_jdownloader_status_pill(shared_state)
+    modal_script = get_jdownloader_modal_script()
+    
+    back_btn = render_button("Back", "secondary", {"onclick": f"location.href='{back_url}'"})
+    
+    content = f'''
+        <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+        <div class="status-bar">
+            {status_pill}
+        </div>
+        <p>{back_btn}</p>
+        <style>
+            .status-pill {{
+                font-size: 0.9em;
+                padding: 8px 16px;
+                border-radius: 0.5rem;
+                font-weight: 500;
+                transition: transform 0.1s ease;
+            }}
+            .status-pill:hover {{
+                transform: scale(1.05);
+            }}
+            .status-pill.success {{
+                background: var(--status-success-bg, #e8f5e9);
+                color: var(--status-success-color, #2e7d32);
+                border: 1px solid var(--status-success-border, #a5d6a7);
+            }}
+            .status-pill.error {{
+                background: var(--status-error-bg, #ffebee);
+                color: var(--status-error-color, #c62828);
+                border: 1px solid var(--status-error-border, #ef9a9a);
+            }}
+            /* Dark mode */
+            @media (prefers-color-scheme: dark) {{
+                :root {{
+                    --status-success-bg: #1c4532;
+                    --status-success-color: #68d391;
+                    --status-success-border: #276749;
+                    --status-error-bg: #3d2d2d;
+                    --status-error-color: #fc8181;
+                    --status-error-border: #c53030;
+                }}
+            }}
+        </style>
+        {modal_script}
+    '''
+    
+    return render_centered_html(content)

quasarr/api/packages/__init__.py

@@ -3,6 +3,7 @@
 # Project by https://github.com/rix1337
 
 import quasarr.providers.html_images as images
+from quasarr.api.jdownloader import get_jdownloader_disconnected_page
 from quasarr.downloads.packages import delete_package, get_packages
 from quasarr.providers import shared_state
 from quasarr.providers.html_templates import render_button, render_centered_html
@@ -349,18 +350,7 @@ def setup_packages_routes(app):
             device = None
 
         if not device:
-            back_btn = render_button(
-                "Back", "secondary", {"onclick": "location.href='/'"}
-            )
-            return render_centered_html(f'''
-                <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-                <div class="status-bar">
-                    <span class="status-pill error">
-                        ❌ JDownloader disconnected
-                    </span>
-                </div>
-                <p>{back_btn}</p>
-            ''')
+            return get_jdownloader_disconnected_page(shared_state)
 
         # Check for delete status from redirect
         deleted = request.query.get("deleted")

quasarr/downloads/__init__.py

@@ -16,6 +16,7 @@ from quasarr.downloads.sources.dl import get_dl_download_links
 from quasarr.downloads.sources.dt import get_dt_download_links
 from quasarr.downloads.sources.dw import get_dw_download_links
 from quasarr.downloads.sources.he import get_he_download_links
+from quasarr.downloads.sources.hs import get_hs_download_links
 from quasarr.downloads.sources.mb import get_mb_download_links
 from quasarr.downloads.sources.nk import get_nk_download_links
 from quasarr.downloads.sources.nx import get_nx_download_links
@@ -57,6 +58,7 @@ SOURCE_GETTERS = {
     "dt": get_dt_download_links,
     "dw": get_dw_download_links,
     "he": get_he_download_links,
+    "hs": get_hs_download_links,
     "mb": get_mb_download_links,
     "nk": get_nk_download_links,
     "nx": get_nx_download_links,

quasarr/downloads/sources/hs.py

@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+# Quasarr
+# Project by https://github.com/rix1337
+
+import re
+
+import requests
+from bs4 import BeautifulSoup
+
+from quasarr.providers.hostname_issues import mark_hostname_issue
+from quasarr.providers.log import debug, info
+
+hostname = "hs"
+
+FILECRYPT_REGEX = re.compile(
+    r"https?://(?:www\.)?filecrypt\.(?:cc|co|to)/[Cc]ontainer/[A-Za-z0-9]+\.html", re.I
+)
+AFFILIATE_REGEX = re.compile(r"af\.php\?v=([a-zA-Z0-9]+)")
+
+
+def normalize_mirror_name(name):
+    """Normalize mirror names - ddlto/ddl.to -> ddownload"""
+    if not name:
+        return None
+    name_lower = name.lower().strip()
+    if "ddlto" in name_lower or "ddl.to" in name_lower or "ddownload" in name_lower:
+        return "ddownload"
+    if "rapidgator" in name_lower:
+        return "rapidgator"
+    if "katfile" in name_lower:
+        return "katfile"
+    return name_lower
+
+
+def get_hs_download_links(shared_state, url, mirror, title, password):
+    """
+    KEEP THE SIGNATURE EVEN IF SOME PARAMETERS ARE UNUSED!
+
+    HS handler - extracts filecrypt download links from release pages.
+    The site structure pairs affiliate links (indicating mirror) with filecrypt links.
+    """
+    headers = {"User-Agent": shared_state.values["user_agent"]}
+
+    mirror_lower = mirror.lower() if mirror else None
+    links = []
+
+    try:
+        r = requests.get(url, headers=headers, timeout=30)
+        r.raise_for_status()
+        soup = BeautifulSoup(r.text, "html.parser")
+
+        # Find all links in the page
+        all_links = soup.find_all("a", href=True)
+
+        # Strategy: Build mirror detection from multiple sources
+        # 1. Text labels on filecrypt links (most reliable)
+        # 2. Affiliate links preceding filecrypt links (fallback)
+
+        # First pass: detect mirrors from link text labels
+        text_labeled_mirrors = {}  # url -> mirror_name
+        for link in all_links:
+            href = link.get("href", "")
+            if FILECRYPT_REGEX.match(href):
+                link_text = link.get_text(strip=True).lower()
+                detected_mirror = None
+                if "ddownload" in link_text or "ddl" in link_text:
+                    detected_mirror = "ddownload"
+                elif "rapidgator" in link_text:
+                    detected_mirror = "rapidgator"
+                elif "katfile" in link_text:
+                    detected_mirror = "katfile"
+                if detected_mirror:
+                    text_labeled_mirrors[href] = detected_mirror
+
+        # Second pass: track affiliate links for fallback
+        affiliate_mirrors = {}  # url -> mirror_name (from preceding affiliate)
+        current_mirror = None
+        for link in all_links:
+            href = link.get("href", "")
+
+            # Check if this is an affiliate link (indicates mirror name)
+            aff_match = AFFILIATE_REGEX.search(href)
+            if aff_match:
+                current_mirror = normalize_mirror_name(aff_match.group(1))
+                continue
+
+            # Check if this is a filecrypt link
+            if FILECRYPT_REGEX.match(href):
+                if current_mirror and href not in affiliate_mirrors:
+                    affiliate_mirrors[href] = current_mirror
+                current_mirror = None  # Reset for next pair
+
+        # Combine results: text labels take priority over affiliate tracking
+        filecrypt_mirrors = []
+        seen_urls = set()
+        for link in all_links:
+            href = link.get("href", "")
+            if FILECRYPT_REGEX.match(href) and href not in seen_urls:
+                seen_urls.add(href)
+                # Priority: text label > affiliate > "filecrypt"
+                mirror_name = (
+                    text_labeled_mirrors.get(href)
+                    or affiliate_mirrors.get(href)
+                    or "filecrypt"
+                )
+                filecrypt_mirrors.append((href, mirror_name))
+
+        # Filter by requested mirror and deduplicate
+        seen_urls = set()
+        for fc_url, fc_mirror in filecrypt_mirrors:
+            if fc_url in seen_urls:
+                continue
+            seen_urls.add(fc_url)
+
+            # Filter by requested mirror if specified
+            if mirror_lower:
+                if mirror_lower != fc_mirror:
+                    debug(f"Skipping {fc_mirror} link (requested mirror: {mirror})")
+                    continue
+
+            # Store [url, mirror_name] - mirror_name is used by CAPTCHA page for filtering
+            links.append([fc_url, fc_mirror])
+
+        if not links:
+            debug(f"No filecrypt links found on {url} for {title}")
+
+    except Exception as e:
+        info(f"Error loading HS download links: {e}")
+        mark_hostname_issue(hostname, "download", str(e))
+
+    return {"links": links}

quasarr/providers/html_templates.py

@@ -143,6 +143,7 @@ def render_centered_html(inner_content, footer_content=""):
                 justify-content: center;
                 margin-bottom: 0.5rem;
                 font-size: 2rem;
+                cursor: pointer;
             }
             .logo {
                 width: 48px;
@@ -333,6 +334,16 @@ def render_centered_html(inner_content, footer_content=""):
                 justify-content: flex-end;
             }
         </style>
+        <script>
+            document.addEventListener('DOMContentLoaded', function() {
+                const h1 = document.querySelector('h1');
+                if (h1) {
+                    h1.onclick = function() {
+                        window.location.href = '/';
+                    };
+                }
+            });
+        </script>
     </head>"""
     )
 
@@ -417,7 +428,7 @@ def render_button(text, button_type="primary", attributes=None):
 
 def render_form(header, form="", script="", footer_content=""):
     content = f'''
-    <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+    <h1 onclick="window.location.href='/'"><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
     <h2>{header}</h2>
     {form}
     {script}
@@ -446,7 +457,7 @@ def render_success(message, timeout=10, optional_text=""):
             }}, 1000);
         </script>
     """
-    content = f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+    content = f'''<h1 onclick="window.location.href='/'"><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
     <h2>{message}</h2>
     {optional_text}
     {button_html}
@@ -459,7 +470,7 @@ def render_fail(message):
     button_html = render_button(
         "Back", "secondary", {"onclick": "window.location.href='/'"}
     )
-    return render_centered_html(f"""<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+    return render_centered_html(f"""<h1 onclick="window.location.href='/'"><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
         <h2>{message}</h2>
         {button_html}
     """)

quasarr/providers/sessions/al.py

@@ -371,6 +371,7 @@ def fetch_via_requests_session(
     target_url: str,
     post_data: dict = None,
     timeout: int = 30,
+    year: int = None,
 ):
     """
     - method: "GET" or "POST"
@@ -383,6 +384,9 @@ def fetch_via_requests_session(
             f"{hostname}: site not usable (login skipped or no credentials)"
         )
 
+    if year:
+        sess.cookies["filter"] = f'{{"year":{{"from":{year},"to":{year}}}}}'
+
     # Execute request
     if method.upper() == "GET":
         r = sess.get(target_url, timeout=timeout)

quasarr/providers/shared_state.py

@@ -171,19 +171,18 @@ def set_device_from_config():
 
 def check_device(device):
     try:
-        valid = (
-            isinstance(device, (type, Jddevice))
-            and device.downloadcontroller.get_current_state()
-        )
-    except (
-        AttributeError,
-        KeyError,
-        TokenExpiredException,
-        RequestTimeoutException,
-        MYJDException,
-    ):
-        valid = False
-    return valid
+        if not isinstance(device, (type, Jddevice)):
+            return False
+
+        # Trigger a network request to verify connectivity
+        # get_current_state() performs an API call to JDownloader
+        state = device.downloadcontroller.get_current_state()
+
+        if state:
+            return True
+        return False
+    except Exception:
+        return False
 
 
 def connect_device():
@@ -627,11 +626,12 @@ def search_string_in_sanitized_title(search_string, title):
     sanitized_search_string = sanitize_string(search_string)
     sanitized_title = sanitize_string(title)
 
+    search_regex = r"\b.+\b".join(
+        [re.escape(s) for s in sanitized_search_string.split(" ")]
+    )
     # Use word boundaries to ensure full word/phrase match
-    if re.search(rf"\b{re.escape(sanitized_search_string)}\b", sanitized_title):
-        debug(
-            f"Matched search string: {sanitized_search_string} with title: {sanitized_title}"
-        )
+    if re.search(rf"\b{search_regex}\b", sanitized_title):
+        debug(f"Matched search string: {search_regex} with title: {sanitized_title}")
         return True
     else:
         debug(

quasarr/providers/version.py

@@ -5,7 +5,7 @@
 import re
 import sys
 
-__version__ = "2.4.11"
+__version__ = "2.6.0"
 
 
 def get_version():