quasarr 2.6.1__py3-none-any.whl → 2.7.1__py3-none-any.whl

quasarr/api/captcha/__init__.py

@@ -16,7 +16,7 @@ from quasarr.downloads.linkcrypters.filecrypt import DLC, get_filecrypt_links
 from quasarr.downloads.packages import delete_package
 from quasarr.providers import obfuscated, shared_state
 from quasarr.providers.html_templates import render_button, render_centered_html
-from quasarr.providers.log import debug, info
+from quasarr.providers.log import debug, error, info, trace
 from quasarr.providers.statistics import StatsHelper
 
 
@@ -212,37 +212,22 @@ def setup_captcha_routes(app):
             f"pkg_pass={quote(password)}"
         )
 
+        js_url = url_with_quick_transfer_params.replace("'", "\\'")
+        js_userscript_url = userscript_url.replace("'", "\\'")
+        js_provider_name = provider_name.replace("'", "\\'")
+
         return f'''
             <div>
-                <!-- One-time setup section - visually separated -->
-                <div id="setup-instructions" class="setup-box">
-                    <h3>📦 First Time Setup:</h3>
-                    <p style="margin-bottom: 8px;">
-                        <a href="https://www.tampermonkey.net/" target="_blank" rel="noopener noreferrer">1. On mobile Safari/Firefox or any Desktop Browser install Tampermonkey</a>
-                    </p>
-                    <p style="margin-top: 0; margin-bottom: 8px;">
-                        <a href="{userscript_url}" target="_blank">2. Install the {provider_name} userscript</a>
-                    </p>
-                    <p style="margin-top: 0; margin-bottom: 12px;">
-                        3. Open link, solve CAPTCHAs, and links are automatically sent back to Quasarr!
-                    </p>
-                    <p style="margin-top: 0;">
-                        <button id="hide-setup-btn" type="button" class="btn-subtle">
-                            ✅ Don't show this again
-                        </button>
-                    </p>
-                </div>
-
-                <!-- Hidden "show instructions" button -->
-                <div id="show-instructions-link" style="display: none; margin-bottom: 16px;">
-                    <button id="show-setup-btn" type="button" class="btn-subtle">
-                        ℹ️ Show setup instructions
-                    </button>
-                </div>
-
                 <!-- Primary action - the quick transfer link -->
                 <p>
-                    {render_button(f"Open {provider_name} & Get Download Links", "primary", {"onclick": f"if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();location.href='{url_with_quick_transfer_params}'"})}
+                    {render_button(f"Open {provider_name} & Get Download Links", "primary", {"onclick": f"handleProviderClick('{js_url}', '{storage_key}', '{js_provider_name}', '{js_userscript_url}')"})}
+                </p>
+
+                <!-- Reset tutorial button -->
+                <p id="reset-tutorial-btn" style="display: none;">
+                    <button type="button" class="btn-subtle" onclick="localStorage.removeItem('{storage_key}'); showModal('Tutorial Reset', '<p>Tutorial reset! Click the Open button to see it again.</p>', '<button class=\\'btn-primary\\' onclick=\\'location.reload()\\'>Reload</button>');">
+                        ℹ️ Reset Setup Guide
+                    </button>
                 </p>
 
                 <!-- Manual submission - collapsible -->
@@ -286,29 +271,60 @@ def setup_captcha_routes(app):
                 }});
               }}
 
-              // Handle setup instructions hide/show
-              const hideSetup = localStorage.getItem('{storage_key}');
-              const setupBox = document.getElementById('setup-instructions');
-              const showLink = document.getElementById('show-instructions-link');
-
-              if (hideSetup === 'true') {{
-                setupBox.style.display = 'none';
-                showLink.style.display = 'block';
+              // Show reset button if tutorial was already seen
+              if (localStorage.getItem('{storage_key}') === 'true') {{
+                  document.getElementById('reset-tutorial-btn').style.display = 'block';
               }}
 
-              // Hide setup instructions
-              document.getElementById('hide-setup-btn').addEventListener('click', function() {{
-                localStorage.setItem('{storage_key}', 'true');
-                setupBox.style.display = 'none';
-                showLink.style.display = 'block';
-              }});
-
-              // Show setup instructions again
-              document.getElementById('show-setup-btn').addEventListener('click', function() {{
-                localStorage.setItem('{storage_key}', 'false');
-                setupBox.style.display = 'block';
-                showLink.style.display = 'none';
-              }});
+              // Global handler for provider clicks
+              if (!window.handleProviderClick) {{
+                  window.handleProviderClick = function(url, storageKey, providerName, userscriptUrl) {{
+                    if (localStorage.getItem(storageKey) === 'true') {{
+                        if(typeof incrementCaptchaAttempts==='function') incrementCaptchaAttempts();
+                        window.location.href = url;
+                        return;
+                    }}
+
+                    const content = `
+                        <p style="margin-bottom: 8px;">
+                            <a href="https://www.tampermonkey.net/" target="_blank" rel="noopener noreferrer">1. On mobile Safari/Firefox or any Desktop Browser install Tampermonkey</a>
+                        </p>
+                        <p style="margin-top: 0; margin-bottom: 8px;">
+                            <a href="${{userscriptUrl}}" target="_blank">2. Install the ${{providerName}} userscript</a>
+                        </p>
+                        <p style="margin-top: 0; margin-bottom: 12px;">
+                            3. Open link, solve CAPTCHAs, and links are automatically sent back to Quasarr!
+                        </p>
+                    `;
+
+                    const btnId = 'modal-proceed-btn-' + Math.floor(Math.random() * 10000);
+                    const buttons = `
+                        <button id="${{btnId}}" class="btn-primary" disabled>Wait 5s...</button>
+                        <button class="btn-secondary" onclick="closeModal()">Cancel</button>
+                    `;
+
+                    showModal('📦 First Time Setup', content, buttons);
+
+                    let count = 5;
+                    const btn = document.getElementById(btnId);
+                    const interval = setInterval(() => {{
+                        count--;
+                        if (count <= 0) {{
+                            clearInterval(interval);
+                            btn.innerText = 'I have installed Tampermonkey and the userscript';
+                            btn.disabled = false;
+                            btn.onclick = function() {{
+                                localStorage.setItem(storageKey, 'true');
+                                closeModal();
+                                if(typeof incrementCaptchaAttempts==='function') incrementCaptchaAttempts();
+                                window.location.href = url;
+                            }};
+                        }} else {{
+                            btn.innerText = 'Wait ' + count + 's...';
+                        }}
+                    }}, 1000);
+                  }};
+              }}
             </script>
         '''
 
@@ -547,40 +563,26 @@ def setup_captcha_routes(app):
             f"pkg_pass={quote(password)}"
         )
 
+        js_url = url_with_quick_transfer_params.replace("'", "\\'")
+        storage_key = "hideFileCryptSetupInstructions"
+        provider_name = "FileCrypt"
+        userscript_url = "/captcha/filecrypt.user.js"
+
         return f'''
             <div class="section-divider" style="max-width: 370px; margin-left: auto; margin-right: auto;">
                 <details id="bypassDetails">
                 <summary id="bypassSummary">Show CAPTCHA Bypass</summary><br>
 
-                    <!-- One-time setup section - visually separated -->
-                    <div id="setup-instructions" class="setup-box">
-                        <h3>📦 First Time Setup:</h3>
-                        <p style="margin-bottom: 8px;">
-                            <a href="https://www.tampermonkey.net/" target="_blank" rel="noopener noreferrer">1. On mobile Safari/Firefox or any Desktop Browser install Tampermonkey</a>
-                        </p>
-                        <p style="margin-top: 0; margin-bottom: 8px;">
-                            <a href="/captcha/filecrypt.user.js" target="_blank">2. Install the FileCrypt userscript</a>
-                        </p>
-                        <p style="margin-top: 0; margin-bottom: 12px;">
-                            3. Open link, solve CAPTCHAs, and links are automatically sent back to Quasarr!
-                        </p>
-                        <p style="margin-top: 0;">
-                            <button id="hide-setup-btn" type="button" class="btn-subtle">
-                                ✅ Don't show this again
-                            </button>
-                        </p>
-                    </div>
-
-                    <!-- Hidden "show instructions" button -->
-                    <div id="show-instructions-link" style="display: none; margin-bottom: 16px;">
-                        <button id="show-setup-btn" type="button" class="btn-subtle">
-                            ℹ️ Show setup instructions
-                        </button>
-                    </div>
-
                     <!-- Primary action button -->
                     <p>
-                        {render_button("Open FileCrypt & Get Download Links", "primary", {"onclick": f"if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();location.href='{url_with_quick_transfer_params}'"})}
+                        {render_button("Open FileCrypt & Get Download Links", "primary", {"onclick": f"handleProviderClick('{js_url}', '{storage_key}', '{provider_name}', '{userscript_url}')"})}
+                    </p>
+
+                    <!-- Reset tutorial button -->
+                    <p id="reset-tutorial-btn" style="display: none;">
+                        <button type="button" class="btn-subtle" onclick="localStorage.removeItem('{storage_key}'); showModal('Tutorial Reset', '<p>Tutorial reset! Click the Open button to see it again.</p>', '<button class=\\'btn-primary\\' onclick=\\'location.reload()\\'>Reload</button>');">
+                            ℹ️ Reset Setup Guide
+                        </button>
                     </p>
 
                     <!-- Manual submission section -->
@@ -625,29 +627,60 @@ def setup_captcha_routes(app):
                 }});
               }}
 
-              // Handle setup instructions hide/show
-              const hideSetup = localStorage.getItem('hideFileCryptSetupInstructions');
-              const setupBox = document.getElementById('setup-instructions');
-              const showLink = document.getElementById('show-instructions-link');
-
-              if (hideSetup === 'true') {{
-                setupBox.style.display = 'none';
-                showLink.style.display = 'block';
+              // Show reset button if tutorial was already seen
+              if (localStorage.getItem('{storage_key}') === 'true') {{
+                  document.getElementById('reset-tutorial-btn').style.display = 'block';
               }}
 
-              // Hide setup instructions
-              document.getElementById('hide-setup-btn').addEventListener('click', function() {{
-                localStorage.setItem('hideFileCryptSetupInstructions', 'true');
-                setupBox.style.display = 'none';
-                showLink.style.display = 'block';
-              }});
-
-              // Show setup instructions again
-              document.getElementById('show-setup-btn').addEventListener('click', function() {{
-                localStorage.setItem('hideFileCryptSetupInstructions', 'false');
-                setupBox.style.display = 'block';
-                showLink.style.display = 'none';
-              }});
+              // Global handler for provider clicks (if not already defined)
+              if (!window.handleProviderClick) {{
+                  window.handleProviderClick = function(url, storageKey, providerName, userscriptUrl) {{
+                    if (localStorage.getItem(storageKey) === 'true') {{
+                        if(typeof incrementCaptchaAttempts==='function') incrementCaptchaAttempts();
+                        window.location.href = url;
+                        return;
+                    }}
+
+                    const content = `
+                        <p style="margin-bottom: 8px;">
+                            <a href="https://www.tampermonkey.net/" target="_blank" rel="noopener noreferrer">1. On mobile Safari/Firefox or any Desktop Browser install Tampermonkey</a>
+                        </p>
+                        <p style="margin-top: 0; margin-bottom: 8px;">
+                            <a href="${{userscriptUrl}}" target="_blank">2. Install the ${{providerName}} userscript</a>
+                        </p>
+                        <p style="margin-top: 0; margin-bottom: 12px;">
+                            3. Open link, solve CAPTCHAs, and links are automatically sent back to Quasarr!
+                        </p>
+                    `;
+
+                    const btnId = 'modal-proceed-btn-' + Math.floor(Math.random() * 10000);
+                    const buttons = `
+                        <button id="${{btnId}}" class="btn-primary" disabled>Wait 5s...</button>
+                        <button class="btn-secondary" onclick="closeModal()">Cancel</button>
+                    `;
+
+                    showModal('📦 First Time Setup', content, buttons);
+
+                    let count = 5;
+                    const btn = document.getElementById(btnId);
+                    const interval = setInterval(() => {{
+                        count--;
+                        if (count <= 0) {{
+                            clearInterval(interval);
+                            btn.innerText = 'I have installed Tampermonkey and the userscript';
+                            btn.disabled = false;
+                            btn.onclick = function() {{
+                                localStorage.setItem(storageKey, 'true');
+                                closeModal();
+                                if(typeof incrementCaptchaAttempts==='function') incrementCaptchaAttempts();
+                                window.location.href = url;
+                            }};
+                        }} else {{
+                            btn.innerText = 'Wait ' + count + 's...';
+                        }}
+                    }}, 1000);
+                  }};
+              }}
             </script>
         '''
 
@@ -735,7 +768,7 @@ def setup_captcha_routes(app):
 
             selected = "selected" if pkg_id == current_package_id else ""
             # Truncate long titles for display
-            display_title = (title[:50] + "...") if len(title) > 53 else title
+            display_title = title
             options.append(
                 f'<option value="{captcha_type}|{quote(encoded)}" {selected}>{display_title}</option>'
             )
@@ -745,7 +778,7 @@ def setup_captcha_routes(app):
         return f"""
             <div class="package-selector" style="margin-bottom: 20px; padding: 12px; background: rgba(128, 128, 128, 0.1); border: 1px solid rgba(128, 128, 128, 0.3); border-radius: 8px;">
                 <label for="package-select" style="display: block; margin-bottom: 8px; font-weight: bold;">📦 Select Package:</label>
-                <select id="package-select" style="width: 100%; padding: 8px; border-radius: 4px; background: inherit; color: inherit; border: 1px solid rgba(128, 128, 128, 0.5); cursor: pointer;">
+                <select id="package-select" style="width: 100%; padding: 8px; border-radius: 4px; background: inherit; color: inherit; border: 1px solid rgba(128, 128, 128, 0.5); cursor: pointer; text-overflow: ellipsis; white-space: nowrap; overflow: hidden;">
                     {options_html}
                 </select>
             </div>
@@ -885,6 +918,11 @@ def setup_captcha_routes(app):
         if original_url:
             source_button = f"<p>{render_button('Source', 'secondary', {'onclick': f"window.open('{js_single_quoted_string_safe(original_url)}', '_blank')"})}</p>"
 
+        js_url = url_with_quick_transfer_params.replace("'", "\\'")
+        storage_key = "hideFileCryptFallbackSetupInstructions"
+        provider_name = "FileCrypt"
+        userscript_url = "/captcha/filecrypt.user.js"
+
         return render_centered_html(f"""
         <!DOCTYPE html>
         <html>
@@ -894,35 +932,16 @@ def setup_captcha_routes(app):
             {failed_warning}
 
             <div>
-                <!-- One-time setup section - visually separated -->
-                <div id="setup-instructions" class="setup-box">
-                    <h3>📦 First Time Setup:</h3>
-                    <p style="margin-bottom: 8px;">
-                        <a href="https://www.tampermonkey.net/" target="_blank" rel="noopener noreferrer">1. On mobile Safari/Firefox or any Desktop Browser install Tampermonkey</a>
-                    </p>
-                    <p style="margin-top: 0; margin-bottom: 8px;">
-                        <a href="/captcha/filecrypt.user.js" target="_blank">2. Install the FileCrypt userscript</a>
-                    </p>
-                    <p style="margin-top: 0; margin-bottom: 12px;">
-                        3. Open link, solve CAPTCHAs, and links are automatically sent back to Quasarr!
-                    </p>
-                    <p style="margin-top: 0;">
-                        <button id="hide-setup-btn" type="button" class="btn-subtle">
-                            ✅ Don't show this again
-                        </button>
-                    </p>
-                </div>
-
-                <!-- Hidden "show instructions" button -->
-                <div id="show-instructions-link" style="display: none; margin-bottom: 16px;">
-                    <button id="show-setup-btn" type="button" class="btn-subtle">
-                        ℹ️ Show setup instructions
-                    </button>
-                </div>
-
                 <!-- Primary action button -->
                 <p>
-                    {render_button("Open FileCrypt & Get Download Links", "primary", {"onclick": f"if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();location.href='{url_with_quick_transfer_params}'"})}
+                    {render_button("Open FileCrypt & Get Download Links", "primary", {"onclick": f"handleProviderClick('{js_url}', '{storage_key}', '{provider_name}', '{userscript_url}')"})}
+                </p>
+
+                <!-- Reset tutorial button -->
+                <p id="reset-tutorial-btn" style="display: none;">
+                    <button type="button" class="btn-subtle" onclick="localStorage.removeItem('{storage_key}'); showModal('Tutorial Reset', '<p>Tutorial reset! Click the Open button to see it again.</p>', '<button class=\\'btn-primary\\' onclick=\\'location.reload()\\'>Reload</button>');">
+                        ℹ️ Reset Setup Guide
+                    </button>
                 </p>
 
                 <!-- Manual submission section -->
@@ -980,29 +999,58 @@ def setup_captcha_routes(app):
                 }});
               }}
 
-              // Handle setup instructions hide/show
-              const hideSetup = localStorage.getItem('hideFileCryptFallbackSetupInstructions');
-              const setupBox = document.getElementById('setup-instructions');
-              const showLink = document.getElementById('show-instructions-link');
-
-              if (hideSetup === 'true') {{
-                setupBox.style.display = 'none';
-                showLink.style.display = 'block';
+              // Show reset button if tutorial was already seen
+              if (localStorage.getItem('{storage_key}') === 'true') {{
+                  document.getElementById('reset-tutorial-btn').style.display = 'block';
               }}
 
-              // Hide setup instructions
-              document.getElementById('hide-setup-btn').addEventListener('click', function() {{
-                localStorage.setItem('hideFileCryptFallbackSetupInstructions', 'true');
-                setupBox.style.display = 'none';
-                showLink.style.display = 'block';
-              }});
-
-              // Show setup instructions again
-              document.getElementById('show-setup-btn').addEventListener('click', function() {{
-                localStorage.setItem('hideFileCryptFallbackSetupInstructions', 'false');
-                setupBox.style.display = 'block';
-                showLink.style.display = 'none';
-              }});
+              // Global handler for provider clicks
+              window.handleProviderClick = function(url, storageKey, providerName, userscriptUrl) {{
+                if (localStorage.getItem(storageKey) === 'true') {{
+                    if(typeof incrementCaptchaAttempts==='function') incrementCaptchaAttempts();
+                    window.location.href = url;
+                    return;
+                }}
+
+                const content = `
+                    <p style="margin-bottom: 8px;">
+                        <a href="https://www.tampermonkey.net/" target="_blank" rel="noopener noreferrer">1. On mobile Safari/Firefox or any Desktop Browser install Tampermonkey</a>
+                    </p>
+                    <p style="margin-top: 0; margin-bottom: 8px;">
+                        <a href="${{userscriptUrl}}" target="_blank">2. Install the ${{providerName}} userscript</a>
+                    </p>
+                    <p style="margin-top: 0; margin-bottom: 12px;">
+                        3. Open link, solve CAPTCHAs, and links are automatically sent back to Quasarr!
+                    </p>
+                `;
+
+                const btnId = 'modal-proceed-btn-' + Math.floor(Math.random() * 10000);
+                const buttons = `
+                    <button id="${{btnId}}" class="btn-primary" disabled>Wait 5s...</button>
+                    <button class="btn-secondary" onclick="closeModal()">Cancel</button>
+                `;
+
+                showModal('📦 First Time Setup', content, buttons);
+
+                let count = 5;
+                const btn = document.getElementById(btnId);
+                const interval = setInterval(() => {{
+                    count--;
+                    if (count <= 0) {{
+                        clearInterval(interval);
+                        btn.innerText = 'I have installed Tampermonkey and the userscript';
+                        btn.disabled = false;
+                        btn.onclick = function() {{
+                            localStorage.setItem(storageKey, 'true');
+                            closeModal();
+                            if(typeof incrementCaptchaAttempts==='function') incrementCaptchaAttempts();
+                            window.location.href = url;
+                        }};
+                    }} else {{
+                        btn.innerText = 'Wait ' + count + 's...';
+                    }}
+                }}, 1000);
+              }};
             </script>
 
           </body>
@@ -1046,7 +1094,7 @@ def setup_captcha_routes(app):
                     decoded, -15
                 )  # -15 = raw deflate, no zlib header
             except Exception as e:
-                debug(f"Decompression error: {e}, trying with header...")
+                trace(f"Decompression error: {e}, trying with header...")
                 try:
                     # Fallback: try with zlib header
                     decompressed = zlib.decompress(decoded)
@@ -1070,7 +1118,9 @@ def setup_captcha_routes(app):
                     link = "https://" + link
                 links.append(link)
 
-            info(f"Quick transfer received {len(links)} links for package {package_id}")
+            debug(
+                f"Quick transfer received {len(links)} links for package {package_id}"
+            )
 
             # Get package info
             raw_data = shared_state.get_db("protected").retrieve(package_id)
@@ -1095,7 +1145,7 @@ def setup_captcha_routes(app):
                 StatsHelper(shared_state).increment_captcha_decryptions_manual()
                 shared_state.get_db("protected").delete(package_id)
 
-                info(f"Quick transfer successful: {len(links)} links processed")
+                info(f"Quick transfer successful: <g>{len(links)}</g> links processed")
 
                 # Check if more CAPTCHAs remain
                 remaining_protected = shared_state.get_db(
@@ -1131,7 +1181,7 @@ def setup_captcha_routes(app):
                 </p>''')
 
         except Exception as e:
-            info(f"Quick transfer error: {e}")
+            error(f"Quick transfer error: {e}")
             return render_centered_html(f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
             <p><b>Error:</b> {str(e)}</p>
             <p>
@@ -1656,14 +1706,13 @@ def setup_captcha_routes(app):
             mirror = None if (mirror := data.get("mirror")) == "None" else mirror
 
             if token:
-                info(f"Received token: {token}")
-                info(f"Decrypting links for {title}")
+                info(f"Received token: {token} to decrypt links for {title}")
                 decrypted = get_filecrypt_links(
                     shared_state, token, title, link, password=password, mirror=mirror
                 )
                 if decrypted:
                     links = decrypted.get("links", [])
-                    info(f"Decrypted {len(links)} download links for {title}")
+                    info(f"Decrypted <g>{len(links)}</g> download links for {title}")
                     if not links:
                         raise ValueError("No download links found after decryption")
                     downloaded = shared_state.download_package(

quasarr/downloads/__init__.py

@@ -26,7 +26,7 @@ from quasarr.downloads.sources.sl import get_sl_download_links
 from quasarr.downloads.sources.wd import get_wd_download_links
 from quasarr.downloads.sources.wx import get_wx_download_links
 from quasarr.providers.hostname_issues import clear_hostname_issue, mark_hostname_issue
-from quasarr.providers.log import info
+from quasarr.providers.log import info, warn
 from quasarr.providers.notifications import send_discord_message
 from quasarr.providers.statistics import StatsHelper
 from quasarr.providers.utils import filter_offline_links
@@ -214,7 +214,7 @@ def handle_auto_decrypt_links(shared_state, links, title, password, package_id):
     if not decrypted_urls:
         return {"success": False, "reason": "No links decrypted"}
 
-    info(f"Decrypted {len(decrypted_urls)} download links for {title}")
+    info(f"Decrypted <g>{len(decrypted_urls)}</g> download links for {title}")
 
     if shared_state.download_package(decrypted_urls, title, password, package_id):
         StatsHelper(shared_state).increment_package_with_links(decrypted_urls)
@@ -239,7 +239,7 @@ def store_protected_links(
         package_id, json.dumps(blob_data)
     )
     info(
-        f'CAPTCHA-Solution required for "{title}" at: "{shared_state.values["external_address"]}/captcha"'
+        f'CAPTCHA-Solution required for <b>{title}</b> at: "{shared_state.values["external_address"]}/captcha"'
     )
     return {"success": True}
 
@@ -305,7 +305,9 @@ def process_links(
 
     # PRIORITY 1: Direct hoster links
     if classified["direct"]:
-        info(f"Found {len(classified['direct'])} direct hoster links for {title}")
+        info(
+            f"Found <g>{len(classified['direct'])}</g> direct hoster links for {title}"
+        )
         send_discord_message(
             shared_state,
             title=title,
@@ -322,7 +324,9 @@ def process_links(
 
     # PRIORITY 2: Auto-decryptable (hide.cx)
     if classified["auto"]:
-        info(f"Found {len(classified['auto'])} auto-decryptable links for {title}")
+        info(
+            f"Found <g>{len(classified['auto'])}</g> auto-decryptable links for {title}"
+        )
         result = handle_auto_decrypt_links(
             shared_state, classified["auto"], title, password, package_id
         )
@@ -340,7 +344,7 @@ def process_links(
 
     # PRIORITY 3: Protected (filecrypt, tolink, keeplinks, junkies)
     if classified["protected"]:
-        info(f"Found {len(classified['protected'])} protected links for {title}")
+        info(f"Found <g>{len(classified['protected'])}</g> protected links for {title}")
         send_discord_message(
             shared_state,
             title=title,
@@ -363,7 +367,7 @@ def process_links(
         title,
         package_id,
         shared_state,
-        reason=f'No usable links found for "{title}" on {label} - "{source_url}"',
+        reason=f'No usable links found for {title} on {label} - "{source_url}"',
     )
 
 
@@ -461,7 +465,7 @@ def download(
 
     # Skip Download if package_id already exists
     if package_id_exists(shared_state, package_id):
-        info(f"Package {package_id} already exists. Skipping download!")
+        warn(f"Package {package_id} already exists. Skipping download!")
         return {"success": True, "package_id": package_id, "title": title}
 
     if source_result is None:

quasarr/downloads/linkcrypters/al.py

@@ -189,8 +189,8 @@ def solve_captcha(
 
     try:
         image_ids = result["json"]
-    except ValueError:
-        raise RuntimeError(f"Cannot decode captcha IDs: {result['text']}")
+    except ValueError as e:
+        raise RuntimeError(f"Cannot decode captcha IDs: {result['text']}") from e
 
     if not isinstance(image_ids, list) or len(image_ids) < 2:
         raise RuntimeError("Unexpected captcha IDs format.")
@@ -233,7 +233,7 @@ def solve_captcha(
     images_pixel_differences = []
     for idx_i, (img_id_i, img_i) in enumerate(image_objects):
         total_difference = 0.0
-        for idx_j, (img_id_j, img_j) in enumerate(image_objects):
+        for idx_j, (_img_id_j, img_j) in enumerate(image_objects):
             if idx_i == idx_j:
                 continue  # skip self-comparison
             total_difference += calculate_pixel_based_difference(img_i, img_j)
@@ -254,7 +254,7 @@ def solve_captcha(
         method="POST",
         target_url=captcha_base,
         post_data={"cID": 0, "pC": identified_captcha_image, "rT": 2},
-        timeout=60,
+        timeout=30,
     )
 
     return {"response": result["text"], "captcha_id": identified_captcha_image}

quasarr/downloads/linkcrypters/filecrypt.py

@@ -228,10 +228,9 @@ def get_filecrypt_links(shared_state, token, title, url, password=None, mirror=N
             return False
 
         if output.status_code == 403 or is_cloudflare_challenge(output.text):
-            info(
+            debug(
                 "Encountered Cloudflare after password POST. Re-running FlareSolverr..."
             )
-            debug("Cloudflare reappeared after password submit, retrying bypass.")
             session, headers, output = ensure_session_cf_bypassed(
                 info, shared_state, session, output.url, headers
             )