PyPI - quasarr - Versions diffs - 1.28.2__py3-none-any.whl → 1.30.0__py3-none-any.whl - Mend - Supply Chain Defender

quasarr 1.28.2py3-none-any.whl → 1.30.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of quasarr might be problematic. Click here for more details.

Files changed (12) hide show

quasarr/api/captcha/__init__.py CHANGED Viewed

@@ -72,25 +72,17 @@ def setup_captcha_routes(app):
             except KeyError:
                 desired_mirror = None
-            # This is set for circle CAPTCHAs
-            filecrypt_session = data.get("session", None)
             # This is required for cutcaptcha
             rapid = [ln for ln in links if "rapidgator" in ln[1].lower()]
             others = [ln for ln in links if "rapidgator" not in ln[1].lower()]
             prioritized_links = rapid + others
-            # This is required for bypass on circlecaptcha
-            original_url = data.get("original_url", "")
             payload = {
                 "package_id": package_id,
                 "title": title,
                 "password": password,
                 "mirror": desired_mirror,
-                "session": filecrypt_session,
                 "links": prioritized_links,
-                "original_url": original_url
             }
             encoded_payload = urlsafe_b64encode(json.dumps(payload).encode()).decode()
@@ -138,9 +130,6 @@ def setup_captcha_routes(app):
             elif has_tolink_links:
                 debug("Redirecting to ToLink CAPTCHA")
                 redirect(f"/captcha/tolink?data={quote(encoded_payload)}")
-            elif filecrypt_session:
-                debug(f'Redirecting to circle CAPTCHA')
-                redirect(f"/captcha/circle?data={quote(encoded_payload)}")
             else:
                 debug(f"Redirecting to cutcaptcha")
                 redirect(f"/captcha/cutcaptcha?data={quote(encoded_payload)}")
@@ -230,7 +219,7 @@ def setup_captcha_routes(app):
                 <!-- Primary action - the quick transfer link -->
                 <p>
-                    {render_button(f"Open {provider_name} & Get Download Links", "primary", {"onclick": f"location.href='{url_with_quick_transfer_params}'"})}
+                    {render_button(f"Open {provider_name} & Get Download Links", "primary", {"onclick": f"if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();location.href='{url_with_quick_transfer_params}'"})}
                 </p>
                 <!-- Manual submission - collapsible -->
@@ -241,7 +230,7 @@ def setup_captcha_routes(app):
                             <p style="font-size: 0.9em;">
                                 If the userscript doesn't work, you can manually paste the links below:
                             </p>
-                            <form id="bypass-form" action="/captcha/bypass-submit" method="post" enctype="multipart/form-data">
+                            <form id="bypass-form" action="/captcha/bypass-submit" method="post" enctype="multipart/form-data" onsubmit="if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();">
                                 <input type="hidden" name="package_id" value="{package_id}" />
                                 <input type="hidden" name="title" value="{title}" />
                                 <input type="hidden" name="password" value="{password}" />
@@ -319,11 +308,16 @@ def setup_captcha_routes(app):
         check_package_exists(package_id)
+        package_selector = render_package_selector(package_id)
+        failed_warning = render_failed_attempts_warning(package_id)
         return render_centered_html(f"""
         <!DOCTYPE html>
         <html>
           <body>
             <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+            {package_selector}
+            {failed_warning}
             <p><b>Package:</b> {title}</p>
                 {render_userscript_section(url, package_id, title, password, "hide")}
             <p>
@@ -355,11 +349,16 @@ def setup_captcha_routes(app):
         check_package_exists(package_id)
+        package_selector = render_package_selector(package_id)
+        failed_warning = render_failed_attempts_warning(package_id)
         return render_centered_html(f"""
         <!DOCTYPE html>
         <html>
           <body>
             <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+            {package_selector}
+            {failed_warning}
             <p><b>Package:</b> {title}</p>
                 {render_userscript_section(url, package_id, title, password, "junkies")}
             <p>
@@ -392,11 +391,16 @@ def setup_captcha_routes(app):
         url = urls[0][0] if isinstance(urls[0], (list, tuple)) else urls[0]
+        package_selector = render_package_selector(package_id)
+        failed_warning = render_failed_attempts_warning(package_id)
         return render_centered_html(f"""
         <!DOCTYPE html>
         <html>
           <body>
             <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+            {package_selector}
+            {failed_warning}
             <p><b>Package:</b> {title}</p>
                 {render_userscript_section(url, package_id, title, password, "keeplinks")}
             <p>
@@ -429,11 +433,16 @@ def setup_captcha_routes(app):
         url = urls[0][0] if isinstance(urls[0], (list, tuple)) else urls[0]
+        package_selector = render_package_selector(package_id)
+        failed_warning = render_failed_attempts_warning(package_id)
         return render_centered_html(f"""
         <!DOCTYPE html>
         <html>
           <body>
             <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+            {package_selector}
+            {failed_warning}
             <p><b>Package:</b> {title}</p>
                 {render_userscript_section(url, package_id, title, password, "tolink")}
             <p>
@@ -480,7 +489,7 @@ def setup_captcha_routes(app):
         return content
     def render_filecrypt_bypass_section(url, package_id, title, password):
-        """Render the bypass UI section for both cutcaptcha and circle captcha pages"""
+        """Render the bypass UI section for cutcaptcha captcha page"""
         # Generate userscript URL with transfer params
         # Get base URL of current request
@@ -539,7 +548,7 @@ def setup_captcha_routes(app):
                     <!-- Primary action button -->
                     <p>
-                        {render_button("Open FileCrypt & Get Download Links", "primary", {"onclick": f"location.href='{url_with_quick_transfer_params}'"})}
+                        {render_button("Open FileCrypt & Get Download Links", "primary", {"onclick": f"if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();location.href='{url_with_quick_transfer_params}'"})}
                     </p>
                     <!-- Manual submission section -->
@@ -547,7 +556,7 @@ def setup_captcha_routes(app):
                         <p style="font-size: 0.9em; margin-bottom: 16px;">
                             If the userscript doesn't work, you can manually paste the links or upload a DLC file:
                         </p>
-                        <form id="bypass-form" action="/captcha/bypass-submit" method="post" enctype="multipart/form-data">
+                        <form id="bypass-form" action="/captcha/bypass-submit" method="post" enctype="multipart/form-data" onsubmit="if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();">
                             <input type="hidden" name="package_id" value="{package_id}" />
                             <input type="hidden" name="title" value="{title}" />
                             <input type="hidden" name="password" value="{password}" />
@@ -610,6 +619,339 @@ def setup_captcha_routes(app):
             </script>
         '''
+    def render_package_selector(current_package_id):
+        """Render a dropdown selector for all available packages at the top of captcha UIs"""
+        protected = shared_state.get_db("protected").retrieve_all_titles()
+        if not protected or len(protected) <= 1:
+            return ""  # Don't show selector if only one or no packages
+        sj = shared_state.values["config"]("Hostnames").get("sj")
+        dj = shared_state.values["config"]("Hostnames").get("dj")
+        def is_junkies_link(link):
+            url = link[0] if isinstance(link, (list, tuple)) else link
+            mirror = link[1] if isinstance(link, (list, tuple)) and len(link) > 1 else ""
+            if mirror == "junkies":
+                return True
+            return (sj and sj in url) or (dj and dj in url)
+        def get_captcha_type_for_links(links):
+            """Determine which captcha type to use based on links"""
+            has_hide = any(("hide." in (l[0] if isinstance(l, (list, tuple)) else l)) for l in links)
+            has_junkies = any(is_junkies_link(l) for l in links)
+            has_keeplinks = any(("keeplinks." in (l[0] if isinstance(l, (list, tuple)) else l)) for l in links)
+            has_tolink = any(("tolink." in (l[0] if isinstance(l, (list, tuple)) else l)) for l in links)
+            if has_hide:
+                return "hide"
+            elif has_junkies:
+                return "junkies"
+            elif has_keeplinks:
+                return "keeplinks"
+            elif has_tolink:
+                return "tolink"
+            else:
+                return "cutcaptcha"
+        options = []
+        for package in protected:
+            pkg_id = package[0]
+            data = json.loads(package[1])
+            title = data.get("title", "Unknown")
+            links = data.get("links", [])
+            password = data.get("password", "")
+            mirror = data.get("mirror")
+            # Prioritize rapidgator links for cutcaptcha
+            rapid = [ln for ln in links if "rapidgator" in ln[1].lower()]
+            others = [ln for ln in links if "rapidgator" not in ln[1].lower()]
+            prioritized = rapid + others
+            payload = {
+                "package_id": pkg_id,
+                "title": title,
+                "password": password,
+                "mirror": mirror,
+                "links": prioritized,
+            }
+            encoded = urlsafe_b64encode(json.dumps(payload).encode()).decode()
+            captcha_type = get_captcha_type_for_links(prioritized)
+            selected = "selected" if pkg_id == current_package_id else ""
+            # Truncate long titles for display
+            display_title = (title[:50] + "...") if len(title) > 53 else title
+            options.append(f'<option value="{captcha_type}|{quote(encoded)}" {selected}>{display_title}</option>')
+        options_html = "\n".join(options)
+        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;">
+                    {options_html}
+                </select>
+            </div>
+            <script>
+                document.getElementById('package-select').addEventListener('change', function() {{
+                    const [captchaType, encodedData] = this.value.split('|');
+                    window.location.href = '/captcha/' + captchaType + '?data=' + encodedData;
+                }});
+            </script>
+        '''
+    def render_failed_attempts_warning(package_id, include_delete_button=True, fallback_url=None):
+        """Render a warning block that shows after 2+ failed attempts per package_id.
+        Uses localStorage to track attempts by package_id to ensure reliable tracking
+        even when package titles are duplicated.
+        Attempts are NOT incremented on page load - they must be incremented by
+        calling window.incrementCaptchaAttempts() when user takes an action (e.g.,
+        clicking submit, opening bypass link).
+        Args:
+            package_id: The unique package identifier
+            include_delete_button: Whether to show delete button in warning
+            fallback_url: Optional URL to a fallback page (e.g., FileCrypt manual fallback)
+        """
+        delete_button = ""
+        if include_delete_button:
+            delete_button = render_button("Delete Package", "primary",
+                                          {"onclick": f"location.href='/captcha/delete/{package_id}'"})
+        fallback_link = ""
+        if fallback_url:
+            fallback_link = f'''
+                <p style="margin-top: 12px; margin-bottom: 8px;">
+                    <a href="{fallback_url}" style="color: #cc0000;">Try the manual FileCrypt fallback page →</a>
+                </p>
+            '''
+        return f'''
+            <div id="failed-attempts-warning" class="warning-box" style="display: none; background: #fee2e2; border: 2px solid #dc2626; border-radius: 8px; padding: 16px; margin-bottom: 20px; text-align: center; color: #991b1b;">
+                <h3 style="color: #dc2626; margin-top: 0;">⚠️ Multiple Failed Attempts Detected</h3>
+                <p style="margin-bottom: 12px; color: #7f1d1d;">This CAPTCHA has failed multiple times. The link may be <b>offline</b> or require a different solution method.</p>
+                <p style="margin-bottom: 8px; color: #7f1d1d;">Please verify the link is still valid, or delete this package if it's no longer available.</p>
+                {fallback_link}
+                <div id="warning-delete-button" style="margin-top: 12px;">
+                    {delete_button}
+                </div>
+            </div>
+            <script>
+                (function() {{
+                    const packageId = '{package_id}';
+                    const storageKey = 'captcha_attempts_' + packageId;
+                    // Get current attempt count (do NOT increment on page load)
+                    let attempts = parseInt(localStorage.getItem(storageKey) || '0', 10);
+                    // Show warning if 2+ failed attempts
+                    if (attempts >= 2) {{
+                        const warningBox = document.getElementById('failed-attempts-warning');
+                        if (warningBox) {{
+                            warningBox.style.display = 'block';
+                        }}
+                    }}
+                    // Function to increment attempts (call this on submit/action)
+                    window.incrementCaptchaAttempts = function() {{
+                        let current = parseInt(localStorage.getItem(storageKey) || '0', 10);
+                        current++;
+                        localStorage.setItem(storageKey, current.toString());
+                        // Show warning immediately if we hit 2+ attempts
+                        if (current >= 2) {{
+                            const warningBox = document.getElementById('failed-attempts-warning');
+                            if (warningBox) {{
+                                warningBox.style.display = 'block';
+                            }}
+                        }}
+                        return current;
+                    }};
+                    // Function to get current attempt count
+                    window.getCaptchaAttempts = function() {{
+                        return parseInt(localStorage.getItem(storageKey) || '0', 10);
+                    }};
+                    // Function to clear attempts (call on success)
+                    window.clearCaptchaAttempts = function() {{
+                        localStorage.removeItem(storageKey);
+                    }};
+                }})();
+            </script>
+        '''
+    @app.get("/captcha/filecrypt")
+    def serve_filecrypt_fallback():
+        """Dedicated FileCrypt fallback page - similar to hide/junkies/keeplinks/tolink"""
+        payload = decode_payload()
+        if "error" in payload:
+            return render_centered_html(f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+            <p>{payload["error"]}</p>
+            <p>
+                {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
+            </p>''')
+        package_id = payload.get("package_id")
+        title = payload.get("title")
+        password = payload.get("password")
+        urls = payload.get("links")
+        check_package_exists(package_id)
+        url = urls[0][0] if isinstance(urls[0], (list, tuple)) else urls[0]
+        # Generate userscript URL with transfer params
+        base_url = request.urlparts.scheme + '://' + request.urlparts.netloc
+        transfer_url = f"{base_url}/captcha/quick-transfer"
+        url_with_quick_transfer_params = (
+            f"{url}?"
+            f"transfer_url={quote(transfer_url)}&"
+            f"pkg_id={quote(package_id)}&"
+            f"pkg_title={quote(title)}&"
+            f"pkg_pass={quote(password)}"
+        )
+        package_selector = render_package_selector(package_id)
+        failed_warning = render_failed_attempts_warning(package_id)
+        return render_centered_html(f"""
+        <!DOCTYPE html>
+        <html>
+          <body>
+            <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+            {package_selector}
+            {failed_warning}
+            <p style="max-width: 370px; word-wrap: break-word; overflow-wrap: break-word;"><b>Package:</b> {title}</p>
+            <div>
+                <!-- Info section explaining the process -->
+                <div class="info-box">
+                    <h3>ℹ️ How This Works:</h3>
+                    <p style="margin-bottom: 8px;">
+                        1. Click the button below to open FileCrypt directly
+                    </p>
+                    <p style="margin-top: 0; margin-bottom: 8px;">
+                        2. Solve any CAPTCHAs on their site to reveal the download links
+                    </p>
+                    <p style="margin-top: 0; margin-bottom: 0;">
+                        3. <b>With the userscript installed</b>, links are automatically sent back to Quasarr!
+                    </p>
+                </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. Install Tampermonkey</a>
+                    </p>
+                    <p style="margin-top: 0; margin-bottom: 12px;">
+                        <a href="/captcha/filecrypt.user.js" target="_blank">2. Install the FileCrypt userscript</a>
+                    </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}'"})}
+                </p>
+                <!-- Manual submission section -->
+                <div class="section-divider">
+                    <details id="manualSubmitDetails">
+                        <summary id="manualSubmitSummary" style="cursor: pointer;">Show Manual Submission</summary>
+                        <div style="margin-top: 16px;">
+                            <p style="font-size: 0.9em; margin-bottom: 16px;">
+                                If the userscript doesn't work, you can manually paste the links or upload a DLC file:
+                            </p>
+                            <form id="bypass-form" action="/captcha/bypass-submit" method="post" enctype="multipart/form-data" onsubmit="if(typeof incrementCaptchaAttempts==='function')incrementCaptchaAttempts();">
+                                <input type="hidden" name="package_id" value="{package_id}" />
+                                <input type="hidden" name="title" value="{title}" />
+                                <input type="hidden" name="password" value="{password}" />
+                                <div>
+                                    <strong>Paste the download links (one per line):</strong>
+                                    <textarea id="links-input" name="links" rows="5" style="width: 100%; padding: 8px; font-family: monospace; resize: vertical;"></textarea>
+                                </div>
+                                <div>
+                                    <strong>Or upload DLC file:</strong><br>
+                                    <input type="file" id="dlc-file" name="dlc_file" accept=".dlc" />
+                                </div>
+                                <div>
+                                    {render_button("Submit", "primary", {"type": "submit"})}
+                                </div>
+                            </form>
+                        </div>
+                    </details>
+                </div>
+            </div>
+            <p>
+                {render_button("Delete Package", "secondary", {"onclick": f"location.href='/captcha/delete/{package_id}'"})}
+            </p>
+            <p>
+                {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
+            </p>
+            <script>
+              // Handle manual submission toggle text
+              const manualDetails = document.getElementById('manualSubmitDetails');
+              const manualSummary = document.getElementById('manualSubmitSummary');
+              if (manualDetails && manualSummary) {{
+                manualDetails.addEventListener('toggle', () => {{
+                  if (manualDetails.open) {{
+                    manualSummary.textContent = 'Hide Manual Submission';
+                  }} else {{
+                    manualSummary.textContent = 'Show Manual Submission';
+                  }}
+                }});
+              }}
+              // 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';
+              }}
+              // 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';
+              }});
+            </script>
+          </body>
+        </html>""")
     @app.get('/captcha/quick-transfer')
     def handle_quick_transfer():
         """Handle quick transfer from userscript"""
@@ -711,7 +1053,8 @@ def setup_captcha_routes(app):
                 </p>
                 <p>
                     {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-                </p>''')
+                </p>
+                <script>localStorage.removeItem('captcha_attempts_{package_id}');</script>''')
             else:
                 StatsHelper(shared_state).increment_failed_decryptions_manual()
                 return render_centered_html(f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
@@ -751,7 +1094,8 @@ def setup_captcha_routes(app):
             </p>
             <p>
                 {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-            </p>''')
+            </p>
+            <script>localStorage.removeItem('captcha_attempts_{package_id}');</script>''')
         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>
@@ -826,8 +1170,50 @@ def setup_captcha_routes(app):
         # Add bypass section
         bypass_section = render_filecrypt_bypass_section(url, package_id, title, password)
+        # Add package selector and failed attempts warning
+        package_selector = render_package_selector(package_id)
+        # Create fallback URL for the manual FileCrypt page
+        fallback_payload = {
+            "package_id": package_id,
+            "title": title,
+            "password": password,
+            "mirror": desired_mirror,
+            "links": prioritized_links,
+        }
+        fallback_encoded = urlsafe_b64encode(json.dumps(fallback_payload).encode()).decode()
+        filecrypt_fallback_url = f"/captcha/filecrypt?data={quote(fallback_encoded)}"
+        failed_warning = render_failed_attempts_warning(package_id, include_delete_button=False,
+                                                        fallback_url=filecrypt_fallback_url)  # Delete button is already below
         content = render_centered_html(r'''
+            <style>
+                @media (max-width: 600px) {
+                    .package-selector,
+                    #failed-attempts-warning {
+                        margin-left: 0 !important;
+                        margin-right: 0 !important;
+                        padding-left: 8px !important;
+                        padding-right: 8px !important;
+                        border-radius: 0 !important;
+                        border-left: none !important;
+                        border-right: none !important;
+                    }
+                }
+            </style>
             <script type="text/javascript">
+                // Check if we should redirect to fallback due to failed attempts
+                (function() {
+                    const storageKey = 'captcha_attempts_''' + package_id + r'''';
+                    const attempts = parseInt(localStorage.getItem(storageKey) || '0', 10);
+                    if (attempts >= 2) {
+                        // Redirect to FileCrypt fallback page
+                        window.location.href = '''' + filecrypt_fallback_url + r'''';
+                        return;
+                    }
+                })();
                 var api_key = "''' + obfuscated.captcha_values()["api_key"] + r'''";
                 var endpoint = '/' + window.location.pathname.split('/')[1] + '/' + api_key + '.html';
                 var solveAnotherHtml = `<p>''' + solve_another_html + r'''</p><p>''' + back_button_html + r'''</p>`;
@@ -839,6 +1225,11 @@ def setup_captcha_routes(app):
                     document.getElementById("delete-package-section").style.display = "none";
                     document.getElementById("back-button-section").style.display = "none";
                     document.getElementById("bypass-section").style.display = "none";
+                    // Hide package selector and warning on token submission
+                    var pkgSelector = document.getElementById("package-selector-section");
+                    if (pkgSelector) pkgSelector.style.display = "none";
+                    var warnBox = document.getElementById("failed-attempts-warning");
+                    if (warnBox) warnBox.style.display = "none";
                     // Remove width limit on result screen
                     var packageTitle = document.getElementById("package-title");
@@ -867,9 +1258,17 @@ def setup_captcha_routes(app):
                         if (data.success) {
                             document.getElementById("captcha-key").insertAdjacentHTML('afterend',
                                 '<p>✅ Successful!</p>');
+                            // Clear failed attempts on success
+                            if (typeof clearCaptchaAttempts === 'function') {
+                                clearCaptchaAttempts();
+                            }
                         } else {
                             document.getElementById("captcha-key").insertAdjacentHTML('afterend',
                                 '<p>Failed. Check console for details!</p>');
+                            // Increment failed attempts on failure
+                            if (typeof incrementCaptchaAttempts === 'function') {
+                                incrementCaptchaAttempts();
+                            }
                         }
                         // Show appropriate button based on whether more CAPTCHAs exist
@@ -885,6 +1284,10 @@ def setup_captcha_routes(app):
                 ''' + obfuscated.cutcaptcha_custom_js() + f'''</script>
                 <div>
                     <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
+                    <div id="package-selector-section">
+                        {package_selector}
+                    </div>
+                    {failed_warning}
                     <p id="package-title" style="max-width: 370px; word-wrap: break-word; overflow-wrap: break-word;"><b>Package:</b> {title}</p>
                     <div id="captcha-key"></div>
                     {link_select}<br><br>
@@ -1068,7 +1471,8 @@ def setup_captcha_routes(app):
                     </p>
                     <p>
                         {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-                    </p>''')
+                    </p>
+                    <script>localStorage.removeItem('captcha_attempts_{package_id}');</script>''')
                 else:
                     StatsHelper(shared_state).increment_failed_decryptions_manual()
                     return render_centered_html(f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
@@ -1113,38 +1517,17 @@ def setup_captcha_routes(app):
                 info(f"Decrypting links for {title}")
                 decrypted = get_filecrypt_links(shared_state, token, title, link, password=password, mirror=mirror)
                 if decrypted:
-                    if decrypted.get("status", "") == "replaced":
-                        replace_url = decrypted.get("replace_url")
-                        session = decrypted.get("session")
-                        mirror = decrypted.get("mirror", "filecrypt")
-                        links = [replace_url]
-                        blob = json.dumps(
-                            {
-                                "title": title,
-                                "links": [replace_url, mirror],
-                                "size_mb": 0,
-                                "password": password,
-                                "mirror": mirror,
-                                "session": session,
-                                "original_url": link
-                            })
-                        shared_state.get_db("protected").update_store(package_id, blob)
-                        info(f"Another CAPTCHA solution is required for {mirror} link: {replace_url}")
+                    links = decrypted.get("links", [])
+                    info(f"Decrypted {len(links)} download links for {title}")
+                    if not links:
+                        raise ValueError("No download links found after decryption")
+                    downloaded = shared_state.download_package(links, title, password, package_id)
+                    if downloaded:
+                        StatsHelper(shared_state).increment_package_with_links(links)
+                        shared_state.get_db("protected").delete(package_id)
                     else:
-                        links = decrypted.get("links", [])
-                        info(f"Decrypted {len(links)} download links for {title}")
-                        if not links:
-                            raise ValueError("No download links found after decryption")
-                        downloaded = shared_state.download_package(links, title, password, package_id)
-                        if downloaded:
-                            StatsHelper(shared_state).increment_package_with_links(links)
-                            shared_state.get_db("protected").delete(package_id)
-                        else:
-                            links = []
-                            raise RuntimeError("Submitting Download to JDownloader failed")
+                        links = []
+                        raise RuntimeError("Submitting Download to JDownloader failed")
                 else:
                     raise ValueError("No download links found")
@@ -1162,171 +1545,3 @@ def setup_captcha_routes(app):
         has_more_captchas = bool(remaining_protected)
         return {"success": success, "title": title, "has_more_captchas": has_more_captchas}
-    # The following routes are for circle CAPTCHA
-    @app.get('/captcha/circle')
-    def serve_circle():
-        payload = decode_payload()
-        if "error" in payload:
-            return render_centered_html(f'''<h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-            <p>{payload["error"]}</p>
-            <p>
-                {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-            </p>''')
-        package_id = payload.get("package_id")
-        session_id = payload.get("session")
-        title = payload.get("title", "Unknown Package")
-        password = payload.get("password", "")
-        original_url = payload.get("original_url", "")
-        url = payload.get("links")[0] if payload.get("links") else None
-        check_package_exists(package_id)
-        if not url or not session_id or not package_id:
-            response.status = 400
-            return "Missing required parameters"
-        # Add bypass section
-        bypass_section = render_filecrypt_bypass_section(original_url, package_id, title, password)
-        return render_centered_html(f"""
-        <!DOCTYPE html>
-        <html>
-          <body>
-            <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-            <p><b>Package:</b> {title}</p>
-            <form action="/captcha/decrypt-filecrypt-circle?url={url}&session_id={session_id}&package_id={package_id}" method="post">
-              <input type="image" src="/captcha/circle.php?url={url}&session_id={session_id}" name="button" alt="Circle CAPTCHA">
-            </form>
-            <p>
-                {render_button("Delete Package", "secondary", {"onclick": f"location.href='/captcha/delete/{package_id}'"})}
-            </p>
-            <p>
-                {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-            </p>
-            {bypass_section}
-          </body>
-        </html>""")
-    @app.get('/captcha/circle.php')
-    def proxy_circle_php():
-        target_url = "https://filecrypt.cc/captcha/circle.php"
-        url = request.query.get('url')
-        session_id = request.query.get('session_id')
-        if not url or not session_id:
-            response.status = 400
-            return "Missing required parameters"
-        headers = {'User-Agent': shared_state.values["user_agent"]}
-        cookies = {'PHPSESSID': session_id}
-        resp = requests.get(target_url, headers=headers, cookies=cookies, verify=False)
-        response.content_type = resp.headers.get('Content-Type', 'application/octet-stream')
-        return resp.content
-    @app.post('/captcha/decrypt-filecrypt-circle')
-    def proxy_form_submit():
-        url = request.query.get('url')
-        session_id = request.query.get('session_id')
-        package_id = request.query.get('package_id')
-        success = False
-        if not url or not session_id or not package_id:
-            response.status = 400
-            return "Missing required parameters"
-        cookies = {'PHPSESSID': session_id}
-        headers = {
-            'User-Agent': shared_state.values["user_agent"],
-            "Content-Type": "application/x-www-form-urlencoded"
-        }
-        raw_body = request.body.read()
-        resp = requests.post(url, cookies=cookies, headers=headers, data=raw_body, verify=False)
-        response.content_type = resp.headers.get('Content-Type', 'text/html')
-        if "<h2>Security Check</h2>" in resp.text or "click inside the open circle" in resp.text:
-            status = "CAPTCHA verification failed. Please try again."
-            info(status)
-        match = re.search(
-            r"top\.location\.href\s*=\s*['\"]([^'\"]*?/go\b[^'\"]*)['\"]",
-            resp.text,
-            re.IGNORECASE
-        )
-        if match:
-            redirect = match.group(1)
-            resolved_url = urljoin(url, redirect)
-            info(f"Redirect URL: {resolved_url}")
-            try:
-                redirect_resp = requests.post(resolved_url, cookies=cookies, headers=headers, allow_redirects=True,
-                                              timeout=10, verify=False)
-                if "expired" in redirect_resp.text.lower():
-                    status = f"The CAPTCHA session has expired. Deleting package: {package_id}"
-                    info(status)
-                    shared_state.get_db("protected").delete(package_id)
-                else:
-                    download_link = redirect_resp.url
-                    if redirect_resp.ok:
-                        status = f"Successfully resolved download link!"
-                        info(status)
-                        raw_data = shared_state.get_db("protected").retrieve(package_id)
-                        data = json.loads(raw_data)
-                        title = data.get("title")
-                        password = data.get("password", "")
-                        links = [download_link]
-                        downloaded = shared_state.download_package(links, title, password, package_id)
-                        if downloaded:
-                            StatsHelper(shared_state).increment_package_with_links(links)
-                            success = True
-                            shared_state.get_db("protected").delete(package_id)
-                        else:
-                            raise RuntimeError("Submitting Download to JDownloader failed")
-                    else:
-                        info(
-                            f"Failed to reach redirect target. Status: {redirect_resp.status_code}, Solution: {status}")
-            except Exception as e:
-                info(f"Error while resolving download link: {e}")
-        else:
-            if resp.url.endswith("404.html"):
-                info("Your IP has been blocked by Filecrypt. Please try again later.")
-            else:
-                info("You did not solve the CAPTCHA correctly. Please try again.")
-        if success:
-            StatsHelper(shared_state).increment_captcha_decryptions_manual()
-        else:
-            StatsHelper(shared_state).increment_failed_decryptions_manual()
-        # Check if there are more CAPTCHAs to solve
-        remaining_protected = shared_state.get_db("protected").retrieve_all_titles()
-        has_more_captchas = bool(remaining_protected)
-        if has_more_captchas:
-            solve_button = render_button("Solve another CAPTCHA", "primary", {
-                "onclick": "location.href='/captcha'",
-            })
-        else:
-            solve_button = "<b>No more CAPTCHAs</b>"
-        return render_centered_html(f"""
-        <!DOCTYPE html>
-        <html>
-          <body>
-            <h1><img src="{images.logo}" type="image/png" alt="Quasarr logo" class="logo"/>Quasarr</h1>
-            <p>{status}</p>
-            <p>
-                {solve_button}
-            </p>
-            <p>
-                {render_button("Back", "secondary", {"onclick": "location.href='/'"})}
-            </p>
-          </body>
-        </html>""")