Update multipart_downloader.py

.github/FUNDING.yml

@@ -1 +1,3 @@
 github: [Yuvi9587]
+ko_fi: yuvi427183
+buy_me_a_coffee: yuvi9587

LICENSE

@@ -1,11 +1,21 @@
-Custom License - No Commercial Use
+MIT License
 
-Copyright [Yuvi9587] [2025]
+Copyright (c) [2025] [Yuvi9587]
 
-Permission is hereby granted to any person obtaining a copy of this software and associated documentation files (the "Software"), to use, copy, modify, and distribute the Software for **non-commercial purposes only**, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-1. The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
-2. Proper credit must be given to the original author in any public use, distribution, or derivative works.
+copies or substantial portions of the Software.
-3. Commercial use, resale, or sublicensing of the Software or any derivative works is strictly prohibited without explicit written permission.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND...
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/dejavu-sans/DejaVu Fonts License.txt

@@ -0,0 +1,97 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the 
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.

features.md

@@ -1,192 +1,147 @@
-# Kemono Downloader - Feature Guide
+<div>
-This guide provides a comprehensive overview of all user interface elements, input fields, buttons, popups, and functionalities available in the Kemono Downloader.
+    <h1>Kemono Downloader - Comprehensive Feature Guide</h1>
-
+    <p>This guide provides a detailed overview of all user interface elements, input fields, buttons, popups, and functionalities available in the application.</p>
-## 1. Main Interface & Workflow
+    <hr>
-These are the primary controls you'll interact with to initiate and manage downloads.
+    <h2><strong>Main Window: Core Functionality</strong></h2>
-
+    <p>The application is divided into a configuration panel on the left and a status/log panel on the right.</p>
-### 1.1. Core Inputs
+    <h3><strong>Primary Inputs (Top-Left)</strong></h3>
-**🔗 Creator/Post URL Input Field**  
+    <ul>
-- **Purpose**: Paste the URL of the content you want to download.  
+        <li><strong>URL Input Field</strong>: This is the starting point for most downloads. You can paste a URL for a specific post or for an entire creator's feed. The application's behavior adapts based on the URL type.</li>
-- **Supported Sites**: Kemono.su, Coomer.party, Simpcity.su.  
+        <li><strong>🎨 Creator Selection Popup</strong>: This button opens a powerful dialog listing all known creators. From here, you can:
-- **Supported URL Types**:  
+            <ul>
-  - Creator pages (e.g., `https://kemono.su/patreon/user/12345`).  
+                <li><strong>Search and Queue</strong>: Search for creators and check multiple names. Clicking "Add Selected" populates the main input field, preparing a batch download.</li>
-  - Individual posts (e.g., `https://kemono.su/patreon/user/12345/post/98765`).  
+                <li><strong>Check for Updates</strong>: Select a single creator's saved profile. This loads their information and switches the main download button to "Check for Updates" mode, allowing you to download only new content since your last session.</li>
-- **Note**: When ⭐ Favorite Mode is active, this field is disabled. For Simpcity.su URLs, the "Use Cookie" option is mandatory and auto-enabled.
+            </ul>
-
+        </li>
-**🎨 Creator Selection Button**  
+        <li><strong>Download Location</strong>: The primary folder where all content will be saved. The <strong>Browse...</strong> button lets you select this folder from your computer.</li>
-- **Icon**: 🎨 (Artist Palette)  
+        <li><strong>Page Range (Start/End)</strong>: These fields activate only for creator feed URLs. They allow you to download a specific slice of a creator's history (e.g., pages 5 through 10) instead of their entire feed.</li>
-- **Purpose**: Opens the "Creator Selection" dialog to browse and queue downloads from known creators.  
+    </ul>
-- **Dialog Features**:  
+    <hr>
-  - Loads creators from `creators.json`.  
+    <h2><strong>Filtering & Naming (Left Panel)</strong></h2>
-  - **Search Bar**: Filter creators by name.  
+    <p>These features give you precise control over what gets downloaded and how it's named and organized.</p>
-  - **Creator List**: Displays creators with their service (e.g., Patreon, Fanbox).  
+    <ul>
-  - **Selection**: Checkboxes to select one or more creators.  
+        <li><strong>Filter by Character(s)</strong>: A powerful tool to download content featuring specific characters. You can enter multiple names separated by commas.
-  - **Download Scope**: Organize downloads by Characters or Creators.  
+            <ul>
-  - **Add to Queue**: Adds selected creators or their posts to the download queue.
+                <li><strong>Filter: [Scope] Button</strong>: This button changes how the character filter works:
-
+                    <ul>
-**Page Range (Start to End) Input Fields**  
+                        <li><strong>Title</strong>: Downloads posts only if a character's name is in the post title.</li>
-- **Purpose**: Specify a range of pages to fetch for creator URLs.  
+                        <li><strong>Files</strong>: Downloads posts if a character's name is in any of the filenames within the post.</li>
-- **Usage**: Enter the starting and ending page numbers.  
+                        <li><strong>Both</strong>: Combines the "Title" and "Files" logic.</li>
-- **Behavior**:  
+                        <li><strong>Comments (Beta)</strong>: Downloads a post if a character's name is mentioned in the comments section.</li>
-  - If blank, all pages are processed.  
+                    </ul>
-  - Disabled for single post URLs.
+                </li>
-
+            </ul>
-**📁 Download Location Input Field & Browse Button**  
+        </li>
-- **Purpose**: Specify the main directory for downloaded files.  
+        <li><strong>Skip with Words</strong>: A keyword-based filter to avoid unwanted content (e.g., <code>WIP</code>, <code>sketch</code>).
-- **Usage**: Type the path or click "Browse..." to select a folder.  
+            <ul>
-- **Requirement**: Mandatory for all download operations.
+                <li><strong>Scope: [Type] Button</strong>: This button changes how the skip filter works:
-
+                    <ul>
-### 1.2. Action Buttons
+                        <li><strong>Posts</strong>: Skips the entire post if a keyword is found in the title.</li>
-**⬇️ Start Download / 🔗 Extract Links Button**  
+                        <li><strong>Files</strong>: Skips only individual files if a keyword is found in the filename.</li>
-- **Purpose**: Initiates downloading or link extraction.  
+                        <li><strong>Both</strong>: Applies both levels of skipping.</li>
-- **Behavior**:  
+                    </ul>
-  - Shows "🔗 Extract Links" if "Only Links" is selected.  
+                </li>
-  - Otherwise, shows "⬇️ Start Download".  
+            </ul>
-  - Supports single-threaded or multi-threaded downloads based on settings.
+        </li>
-
+        <li><strong>Remove Words from name</strong>: Automatically cleans downloaded filenames by removing any specified words (e.g., "patreon," "HD").</li>
-**🔄 Restore Download Button**  
+    </ul>
-- **Visibility**: Appears if an incomplete session is detected on startup.  
+    <h3><strong>File Type Filter (Radio Buttons)</strong></h3>
-- **Purpose**: Resumes a previously interrupted download session.
+    <p>This section lets you choose the kind of content you want:</p>
-
+    <ul>
-**⏸️ Pause / ▶️ Resume Download Button**  
+        <li><strong>All, Images/GIFs, Videos, 🎧 Only Audio, 📦 Only Archives</strong>: These options filter the downloads to only include the selected file types.</li>
-- **Purpose**: Pause or resume the ongoing download.  
+        <li><strong>🔗 Only Links</strong>: This special mode doesn't download any files. Instead, it scans post descriptions and lists all external links (like Mega, Google Drive) in the log panel.</li>
-- **Behavior**: Toggles between "Pause" and "Resume". Some UI settings can be changed while paused.
+        <li><strong>More</strong>: Opens a dialog for text-only downloads. You can choose to save post <strong>descriptions</strong> or <strong>comments</strong> as formatted <strong>PDF, DOCX, or TXT</strong> files. A key feature here is the <strong>"Single PDF"</strong> option, which compiles the text from all downloaded posts into one continuous, sorted PDF document.</li>
-
+    </ul>
-**❌ Cancel & Reset UI Button**  
+    <hr>
-- **Purpose**: Stops the current operation and performs a "soft" reset.  
+    <h2><strong>Download Options & Advanced Settings (Checkboxes)</strong></h2>
-- **Behavior**: Halts background threads, preserves URL and Download Location inputs, resets other settings.
+    <ul>
-
+        <li><strong>Skip .zip</strong>: A simple toggle to ignore archive files during downloads.</li>
-**🔄 Reset Button (in the log area)**  
+        <li><strong>Download Thumbnails Only</strong>: Downloads only the small preview images instead of the full-resolution files.</li>
-- **Purpose**: Performs a "hard" reset when no operation is active.  
+        <li><strong>Scan Content for Images</strong>: A crucial feature that scans the post's text content for embedded images that may not be listed in the API, ensuring a more complete download.</li>
-- **Behavior**: Clears all inputs, resets options to default, and clears logs.
+        <li><strong>Compress to WebP</strong>: Saves disk space by automatically converting large images into the efficient WebP format.</li>
-
+        <li><strong>Keep Duplicates</strong>: Opens a dialog to control how files with identical content are handled. The default is to skip duplicates, but you can choose to keep all of them or set a specific limit (e.g., "keep up to 2 copies of the same file").</li>
-## 2. Filtering & Content Selection
+        <li><strong>Subfolder per Post</strong>: Organizes downloads by creating a unique folder for each post, named after the post's title.</li>
-These options allow precise control over downloaded content.
+        <li><strong>Date Prefix</strong>: When "Subfolder per Post" is on, this adds the post's date to the beginning of the folder name (e.g., <code>2025-07-25 Post Title</code>).</li>
-
+        <li><strong>Separate Folders by Known.txt</strong>: This enables the automatic folder organization system based on your "Known Names" list.</li>
-### 2.1. Content Filtering
+        <li><strong>Use Cookie</strong>: Allows the application to use browser cookies to access content that might be behind a paywall or login. You can paste a cookie string directly or use <strong>Browse...</strong> to select a <code>cookies.txt</code> file.</li>
-**🎯 Filter by Character(s) Input Field**  
+        <li><strong>Use Multithreading</strong>: Greatly speeds up downloads of creator feeds by processing multiple posts at once. The number of <strong>Threads</strong> can be configured.</li>
-- **Purpose**: Download content related to specific characters or series.  
+        <li><strong>Show External Links in Log</strong>: When checked, a secondary log panel appears at the bottom of the right side, dedicated to listing any external links found.</li>
-- **Usage**: Enter comma-separated character names.  
+    </ul>
-- **Advanced Syntax**:  
+    <hr>
-  - `Nami`: Simple filter.  
+    <h2><strong>Known Names Management (Bottom-Left)</strong></h2>
-  - `(Vivi, Ulti)`: Grouped filter. Matches posts with "Vivi" OR "Ulti". Creates a shared folder like `Vivi Ulti` if subfolders are enabled.  
+    <p>This powerful feature automates the creation of organized, named folders.</p>
-  - `(Boa, Hancock)~`: Aliased filter. Treats "Boa" and "Hancock" as the same entity.
+    <ul>
-
+        <li><strong>Known Shows/Characters List</strong>: Displays all the names and groups you've saved.</li>
-**Filter: [Type] Button (Character Filter Scope)**  
+        <li><strong>Search...</strong>: Filters the list to quickly find a name.</li>
-- **Purpose**: Defines where the character filter is applied. Cycles on click.  
+        <li><strong>Open Known.txt</strong>: Opens the source file in a text editor for advanced manual editing.</li>
-- **Options**:  
+        <li><strong>Add New Name</strong>:
-  - **Filter: Title** (Default): Matches post titles.  
+            <ul>
-  - **Filter: Files**: Matches filenames.  
+                <li><strong>Single Name</strong>: Typing <code>Tifa Lockhart</code> and clicking <strong>➕ Add</strong> creates an entry that will match "Tifa Lockhart".</li>
-  - **Filter: Both**: Checks title first, then filenames.  
+                <li><strong>Group</strong>: Typing <code>(Boa, Hancock, Snake Princess)~</code> and clicking <strong>➕ Add</strong> creates a single entry named "Boa Hancock Snake Princess". The application will then look for "Boa," "Hancock," OR "Snake Princess" in titles/filenames and save any matches into that combined folder.</li>
-  - **Filter: Comments (Beta)**: Checks filenames, then post comments.
+            </ul>
-
+        </li>
-**🚫 Skip with Words Input Field**  
+        <li><strong>⤵️ Add to Filter</strong>: Opens a dialog with your full Known Names list, allowing you to check multiple entries and add them all to the "Filter by Character(s)" field at once.</li>
-- **Purpose**: Exclude posts/files with specified keywords (e.g., `WIP`, `sketch`).
+        <li><strong>🗑️ Delete Selected</strong>: Removes highlighted names from your list.</li>
-
+    </ul>
-**Scope: [Type] Button (Skip Words Scope)**  
+    <hr>
-- **Purpose**: Defines where skip words are applied. Cycles on click.  
+    <h2><strong>Action Buttons & Status Controls</strong></h2>
-- **Options**:  
+    <ul>
-  - **Scope: Posts** (Default): Skips posts if the title contains a skip word.  
+        <li><strong>⬇️ Start Download / 🔗 Extract Links</strong>: The main action button. Its function is dynamic:
-  - **Scope: Files**: Skips files if the filename contains a skip word.  
+            <ul>
-  - **Scope: Both**: Applies both rules.
+                <li><strong>Normal Mode</strong>: Starts the download based on the current settings.</li>
-
+                <li><strong>Update Mode</strong>: After selecting a creator profile, this button changes to <strong>🔄 Check for Updates</strong>.</li>
-**✂️ Remove Words from Name Input Field**  
+                <li><strong>Update Confirmation</strong>: After new posts are found, it changes to <strong>⬇️ Start Download (X new)</strong>.</li>
-- **Purpose**: Remove unwanted text from filenames (e.g., `patreon`, `[HD]`).
+                <li><strong>Link Extraction Mode</strong>: The text changes to <strong>🔗 Extract Links</strong>.</li>
-
+            </ul>
-### 2.2. File Type Filtering
+        </li>
-**Filter Files (Radio Buttons)**  
+        <li><strong>⏸️ Pause / ▶️ Resume Download</strong>: Pauses the ongoing download, allowing you to change certain settings (like filters) on the fly. Click again to resume.</li>
-- **Purpose**: Select file types to download.  
+        <li><strong>❌ Cancel & Reset UI</strong>: Immediately stops all download activity and resets the UI to a clean state, preserving your URL and Download Location inputs.</li>
-- **Options**:  
+        <li><strong>Error Button</strong>: If files fail to download, they are logged. This button opens a dialog listing all failed files and will show a count of errors (e.g., <strong>(5) Error</strong>). From the dialog, you can:
-  - **All**: All file types.  
+            <ul>
-  - **Images/GIFs**: Common image formats.  
+                <li>Select specific files to <strong>Retry</strong> downloading.</li>
-  - **Videos**: Common video formats.  
+                <li><strong>Export</strong> the list of failed URLs to a <code>.txt</code> file.</li>
-  - **🎧 Only Audio**: Common audio formats.  
+            </ul>
-  - **📦 Only Archives**: Only `.zip` and `.rar` files.  
+        </li>
-  - **🔗 Only Links**: Extracts external links without downloading files.
+        <li><strong>🔄 Reset (Top-Right)</strong>: A hard reset that clears all logs and returns every single UI element to its default state.</li>
-
+        <li><strong>⚙️ (Settings)</strong>: Opens the main Settings dialog.</li>
-**Skip .zip / Skip .rar Checkboxes**  
+        <li><strong>📜 (History)</strong>: Opens the Download History dialog.</li>
-- **Purpose**: Skip downloading `.zip` or `.rar` files.  
+        <li><strong>? (Help)</strong>: Opens a helpful guide explaining the application's features.</li>
-- **Behavior**: Disabled when "📦 Only Archives" is active.
+        <li><strong>❤️ Support</strong>: Opens a dialog with information on how to support the developer.</li>
-
+    </ul>
-## 3. Download Customization
+    <hr>
-Options to refine the download process and output.
+    <h2><strong>Specialized Modes & Features</strong></h2>
-
+    <h3><strong>⭐ Favorite Mode</strong></h3>
-- **Download Thumbnails Only**: Downloads small preview images instead of full-resolution files.  
+    <p>Activating this mode transforms the UI for managing saved collections:</p>
-- **Scan Content for Images**: Scans post HTML for `<img>` tags, crucial for images in descriptions.  
+    <ul>
-- **Compress to WebP**: Converts images to WebP format (requires Pillow library).
+        <li>The URL input is disabled.</li>
-- **Keep Duplicates**: Normally, if a post contains multiple files with the same name, only the first is downloaded. Checking this option will download all of them, renaming subsequent unique files with a numeric suffix (e.g., `image_1.jpg`).
+        <li>The main action buttons are replaced with:
-- **🗄️ Custom Folder Name (Single Post Only)**: Specify a custom folder name for a single post's content (appears if subfolders are enabled).
+            <ul>
-
+                <li><strong>🖼️ Favorite Artists</strong>: Opens a dialog to browse and queue downloads from your saved favorite creators.</li>
-## 4. 📖 Manga/Comic Mode
+                <li><strong>📄 Favorite Posts</strong>: Opens a dialog to browse and queue downloads for specific saved favorite posts.</li>
-A mode for downloading creator feeds in chronological order, ideal for sequential content.
+            </ul>
-
+        </li>
-- **Activation**: Active when downloading a creator's entire feed (not a single post).  
+        <li><strong>Scope: [Location] Button</strong>: Toggles where the favorited content is saved:
-- **Core Behavior**: Fetches all posts, processing from oldest to newest.  
+            <ul>
-- **Filename Style Toggle Button (in the log area)**:  
+                <li><strong>Selected Location</strong>: Saves all content directly into the main "Download Location".</li>
-  - **Purpose**: Controls file naming in Manga Mode. Cycles on click.  
+                <li><strong>Artist Folders</strong>: Creates a subfolder for each artist inside the main "Download Location".</li>
-  - **Options**:  
+            </ul>
-    - **Name: Post Title**: First file named after post title; others keep original names.  
+        </li>
-    - **Name: Original File**: Files keep server-provided names, with optional prefix.  
+    </ul>
-    - **Name: Title+G.Num**: Global numbering with post title prefix (e.g., `Chapter 1_001.jpg`).  
+    <h3><strong>📖 Manga/Comic Mode</strong></h3>
-    - **Name: Date Based**: Sequential naming by post date (e.g., `001.jpg`), with optional prefix.  
+    <p>This mode is designed for sequential content and has several effects:</p>
-    - **Name: Post ID**: Files named after post ID to avoid clashes.  
+    <ul>
-    - **Name: Date + Title**: Combines post date and title for filenames.
+        <li><strong>Reverses Download Order</strong>: It fetches and downloads posts from <strong>oldest to newest</strong>.</li>
-
+        <li><strong>Enables Special Naming</strong>: A <strong><code>Name: [Style]</code></strong> button appears, allowing you to choose how files are named to maintain their correct order (e.g., by Post Title, by Date, or simple sequential numbering like <code>001, 002, 003...</code>).</li>
-## 5. Folder Organization & Known.txt
+        <li><strong>Disables Multithreading (for certain styles)</strong>: To guarantee perfect sequential numbering, multithreading for posts is automatically disabled for certain naming styles.</li>
-Controls for structuring downloaded content.
+    </ul>
-
+    <h3><strong>Session & Error Management</strong></h3>
-- **Separate Folders by Name/Title Checkbox**: Enables automatic subfolder creation.  
+    <ul>
-- **Subfolder per Post Checkbox**: Creates subfolders for each post, named after the post title.  
+        <li><strong>Session Restore</strong>: If the application is closed unexpectedly during a download, it will detect the incomplete session on the next launch. The UI will present a <strong>🔄 Restore Download</strong> button to resume exactly where you left off. You can also choose to discard the session.</li>
-- **Date Prefix for Post Subfolders Checkbox**: When used with "Subfolder per Post," this option prefixes the folder name with the post's upload date (e.g., `2025-07-11 Post Title`), allowing for chronological sorting.
+        <li><strong>Update Checking</strong>: By selecting a creator profile via the <strong>🎨 Creator Selection Popup</strong>, you can run an update check. The application compares the posts on the server with your download history for that creator and will prompt you to download only the new content.</li>
-- **Known.txt Management UI (Bottom Left)**:  
+    </ul>
-  - **Purpose**: Manages a local `Known.txt` file for series, characters, or terms used in folder creation.  
+    <h3><strong>Logging & Monitoring</strong></h3>
-  - **List Display**: Shows primary names from `Known.txt`.  
+    <ul>
-  - **➕ Add Button**: Adds names or groups (e.g., `(Character A, Alias B)~`).  
+        <li><strong>Progress Log</strong>: The main log provides real-time feedback on the download process, including status messages, file saves, skips, and errors.</li>
-  - **⤵️ Add to Filter Button**: Select names from `Known.txt` for the character filter.  
+        <li><strong>👁️ Log View Toggle</strong>: Switches the log view between the standard <strong>Progress Log</strong> and a <strong>Missed Character Log</strong>, which shows potential character names from posts that were skipped by your filters, helping you discover new names to add to your list.</li>
-  - **🗑️ Delete Selected Button**: Removes selected names from `Known.txt`.  
+    </ul>
-  - **Open Known.txt Button**: Opens the file in the default text editor.  
+</div>
-  - **❓ Help Button**: Opens this feature guide.  
-  - **📜 History Button**: Views recent download history.
-
-## 6. ⭐ Favorite Mode (Kemono.su Only)
-Download from favorited artists/posts on Kemono.su.
-
-- **Enable Checkbox ("⭐ Favorite Mode")**:  
-  - Switches to Favorite Mode.  
-  - Disables the main URL input.  
-  - Changes action buttons to "Favorite Artists" and "Favorite Posts".  
-  - Requires cookies.  
-- **🖼️ Favorite Artists Button**: Select and download from favorited artists.  
-- **📄 Favorite Posts Button**: Select and download specific favorited posts.  
-- **Favorite Download Scope Button**:  
-  - **Scope: Selected Location**: Downloads favorites to the main directory.  
-  - **Scope: Artist Folders**: Creates subfolders per artist.
-
-## 7. Advanced Settings & Performance
-- **🍪 Cookie Management**:  
-  - **Use Cookie Checkbox**: Enables cookies for restricted content.  
-  - **Cookie Text Field**: Paste cookie string.  
-  - **Browse... Button**: Select a `cookies.txt` file (Netscape format).  
-- **Use Multithreading Checkbox & Threads Input**:  
-  - **Purpose**: Configures simultaneous operations.  
-  - **Behavior**: Sets concurrent post processing (creator feeds) or file downloads (single posts).  
-- **Multi-part Download Toggle Button**:  
-  - **Purpose**: Enables/disables multi-segment downloading for large files.  
-  - **Note**: Best for large files; less efficient for small files.
-
-## 8. Logging, Monitoring & Error Handling
-- **📜 Progress Log Area**: Displays messages, progress, and errors.  
-- **👁️ / 🙈 Log View Toggle Button**: Switches between Progress Log and Missed Character Log (skipped posts).  
-- **Show External Links in Log**: Displays external links (e.g., Mega, Google Drive) in a secondary panel.  
-- **Export Links Button**: Saves extracted links to a `.txt` file in "Only Links" mode.  
-- **Download Extracted Links Button**: Downloads files from supported external links in "Only Links" mode.  
-- **🆘 Error Button & Dialog**:  
-  - **Purpose**: Active if files fail to download. The button will display a live count of failed files (e.g., **(3) Error**).  
-  - **Dialog Features**:  
-    - Lists failed files.  
-    - Retry failed downloads.  
-    - Export failed URLs to a text file.
-
-## 9. Application Settings (⚙️)
-- **Appearance**: Switch between Light and Dark themes.  
-- **Language**: Change UI language (restart required).

readme.md

@@ -41,6 +41,7 @@ Built with PyQt5, this tool is designed for users who want deep filtering capabi
 
 </div>
 
+
 ---
 
 ## Feature Overview
@@ -208,4 +209,9 @@ This project is under the Custom Licence
       </a>
 </table>
 
-👉 See [features.md](features.md) for the full feature list.
+<p align="center">
+  <a href="https://buymeacoffee.com/yuvi9587">
+    <img src="https://img.shields.io/badge/🍺%20Buy%20Me%20a%20Coffee-FFCCCB?style=for-the-badge&logoColor=black&color=FFDD00" alt="Buy Me a Coffee">
+  </a>
+</p>
+

src/config/constants.py

@@ -57,6 +57,9 @@ THEME_KEY = "currentThemeV2"
 SCAN_CONTENT_IMAGES_KEY = "scanContentForImagesV1"
 LANGUAGE_KEY = "currentLanguageV1"
 DOWNLOAD_LOCATION_KEY = "downloadLocationV1"
+RESOLUTION_KEY = "window_resolution"
+UI_SCALE_KEY = "ui_scale_factor"
+SAVE_CREATOR_JSON_KEY = "saveCreatorJsonProfile"
 
 # --- UI Constants and Identifiers ---
 HTML_PREFIX = "<!HTML!>"
@@ -70,7 +73,7 @@ CONFIRM_ADD_ALL_CANCEL_DOWNLOAD = 3
 
 # --- File Type Extensions ---
 IMAGE_EXTENSIONS = {
-    '.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.tif', '.webp',
+    '.jpg', '.jpeg', '.jpe', '.png', '.gif', '.bmp', '.tiff', '.tif', '.webp',
     '.heic', '.heif', '.svg', '.ico', '.jfif', '.pjpeg', '.pjp', '.avif'
 }
 VIDEO_EXTENSIONS = {
@@ -111,3 +114,7 @@ CREATOR_DOWNLOAD_DEFAULT_FOLDER_IGNORE_WORDS = {
     "fri", "friday", "sat", "saturday", "sun", "sunday"
     # add more according to need 
 }
+
+# --- Duplicate Handling Modes ---
+DUPLICATE_HANDLING_HASH = "hash"      
+DUPLICATE_HANDLING_KEEP_ALL = "keep_all"  

src/core/api_client.py

@@ -1,12 +1,8 @@
-# --- Standard Library Imports ---
 import time
 import traceback
 from urllib.parse import urlparse
-
+import json # Ensure json is imported
-# --- Third-Party Library Imports ---
 import requests
-
-# --- Local Application Imports ---
 from ..utils.network_utils import extract_post_info, prepare_cookies_for_request
 from ..config.constants import (
     STYLE_DATE_POST_TITLE
@@ -15,36 +11,21 @@ from ..config.constants import (
 
 def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_event=None, pause_event=None, cookies_dict=None):
     """
-    Fetches a single page of posts from the API with retry logic.
+    Fetches a single page of posts from the API with robust retry logic.
-
+    NEW: Requests only essential fields to keep the response size small and reliable.
-    Args:
-        api_url_base (str): The base URL for the user's posts.
-        headers (dict): The request headers.
-        offset (int): The offset for pagination.
-        logger (callable): Function to log messages.
-        cancellation_event (threading.Event): Event to signal cancellation.
-        pause_event (threading.Event): Event to signal pause.
-        cookies_dict (dict): A dictionary of cookies to include in the request.
-
-    Returns:
-        list: A list of post data dictionaries from the API.
-
-    Raises:
-        RuntimeError: If the fetch fails after all retries or encounters a non-retryable error.
     """
     if cancellation_event and cancellation_event.is_set():
-        logger("   Fetch cancelled before request.")
         raise RuntimeError("Fetch operation cancelled by user.")
     if pause_event and pause_event.is_set():
         logger("   Post fetching paused...")
         while pause_event.is_set():
             if cancellation_event and cancellation_event.is_set():
-                logger("   Post fetching cancelled while paused.")
+                raise RuntimeError("Fetch operation cancelled by user while paused.")
-                raise RuntimeError("Fetch operation cancelled by user.")
             time.sleep(0.5)
         logger("   Post fetching resumed.")
-        
+    fields_to_request = "id,user,service,title,shared_file,added,published,edited,file,attachments,tags"
-    paginated_url = f'{api_url_base}?o={offset}'
+    paginated_url = f'{api_url_base}?o={offset}&fields={fields_to_request}'
+    
     max_retries = 3
     retry_delay = 5
 
@@ -52,22 +33,17 @@ def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_ev
         if cancellation_event and cancellation_event.is_set():
             raise RuntimeError("Fetch operation cancelled by user during retry loop.")
 
-        log_message = f"   Fetching: {paginated_url} (Page approx. {offset // 50 + 1})"
+        log_message = f"   Fetching post list: {api_url_base}?o={offset} (Page approx. {offset // 50 + 1})"
         if attempt > 0:
             log_message += f" (Attempt {attempt + 1}/{max_retries})"
         logger(log_message)
 
         try:
-            response = requests.get(paginated_url, headers=headers, timeout=(15, 90), cookies=cookies_dict)
+            response = requests.get(paginated_url, headers=headers, timeout=(15, 60), cookies=cookies_dict)
             response.raise_for_status()
-
-            if 'application/json' not in response.headers.get('Content-Type', '').lower():
-                logger(f"⚠️ Unexpected content type from API: {response.headers.get('Content-Type')}. Body: {response.text[:200]}")
-                return []
-
             return response.json()
 
-        except (requests.exceptions.Timeout, requests.exceptions.ConnectionError) as e:
+        except requests.exceptions.RequestException as e:
             logger(f"   ⚠️ Retryable network error on page fetch (Attempt {attempt + 1}): {e}")
             if attempt < max_retries - 1:
                 delay = retry_delay * (2 ** attempt)
@@ -76,18 +52,44 @@ def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_ev
                 continue
             else:
                 logger(f"   ❌ Failed to fetch page after {max_retries} attempts.")
-                raise RuntimeError(f"Timeout or connection error fetching offset {offset}")
+                raise RuntimeError(f"Network error fetching offset {offset}")
-        except requests.exceptions.RequestException as e:
+        except json.JSONDecodeError as e:
-            err_msg = f"Error fetching offset {offset}: {e}"
+            logger(f"   ❌ Failed to decode JSON on page fetch (Attempt {attempt + 1}): {e}")
-            if e.response is not None:
+            if attempt < max_retries - 1:
-                err_msg += f" (Status: {e.response.status_code}, Body: {e.response.text[:200]})"
+                delay = retry_delay * (2 ** attempt)
-            raise RuntimeError(err_msg)
+                logger(f"      Retrying in {delay} seconds...")
-        except ValueError as e: # JSON decode error
+                time.sleep(delay)
-            raise RuntimeError(f"Error decoding JSON from offset {offset}: {e}. Response: {response.text[:200]}")
+                continue
+            else:
+                raise RuntimeError(f"JSONDecodeError fetching offset {offset}")
 
     raise RuntimeError(f"Failed to fetch page {paginated_url} after all attempts.")
 
 
+def fetch_single_post_data(api_domain, service, user_id, post_id, headers, logger, cookies_dict=None):
+    """
+    --- NEW FUNCTION ---
+    Fetches the full data, including the 'content' field, for a single post.
+    """
+    post_api_url = f"https://{api_domain}/api/v1/{service}/user/{user_id}/post/{post_id}"
+    logger(f"      Fetching full content for post ID {post_id}...")
+    try:
+        with requests.get(post_api_url, headers=headers, timeout=(15, 300), cookies=cookies_dict, stream=True) as response:
+            response.raise_for_status()
+            response_body = b""
+            for chunk in response.iter_content(chunk_size=8192):
+                response_body += chunk
+            
+            full_post_data = json.loads(response_body)
+            if isinstance(full_post_data, list) and full_post_data:
+                return full_post_data[0]
+            return full_post_data
+            
+    except Exception as e:
+        logger(f"      ❌ Failed to fetch full content for post {post_id}: {e}")
+        return None
+
+        
 def fetch_post_comments(api_domain, service, user_id, post_id, headers, logger, cancellation_event=None, pause_event=None, cookies_dict=None):
     """Fetches all comments for a specific post."""
     if cancellation_event and cancellation_event.is_set():
@@ -105,217 +107,250 @@ def fetch_post_comments(api_domain, service, user_id, post_id, headers, logger,
     except ValueError as e:
         raise RuntimeError(f"Error decoding JSON from comments API for post {post_id}: {e}")
 
-def download_from_api (
+def download_from_api(
-api_url_input ,
+    api_url_input,
-logger =print ,
+    logger=print,
-start_page =None ,
+    start_page=None,
-end_page =None ,
+    end_page=None,
-manga_mode =False ,
+    manga_mode=False,
-cancellation_event =None ,
+    cancellation_event=None,
-pause_event =None ,
+    pause_event=None,
-use_cookie =False ,
+    use_cookie=False,
-cookie_text ="",
+    cookie_text="",
-selected_cookie_file =None ,
+    selected_cookie_file=None,
-app_base_dir =None ,
+    app_base_dir=None,
-manga_filename_style_for_sort_check =None 
+    manga_filename_style_for_sort_check=None,
+    processed_post_ids=None
 ):
-    headers ={
+    headers = {
-    'User-Agent':'Mozilla/5.0',
+        'User-Agent': 'Mozilla/5.0',
-    'Accept':'application/json'
+        'Accept': 'application/json'
     }
+    if processed_post_ids is None:
+        processed_post_ids = set()
+    else:
+        processed_post_ids = set(processed_post_ids)
 
-    service ,user_id ,target_post_id =extract_post_info (api_url_input )
+    service, user_id, target_post_id = extract_post_info(api_url_input)
 
-    if cancellation_event and cancellation_event .is_set ():
+    if cancellation_event and cancellation_event.is_set():
-        logger ("   Download_from_api cancelled at start.")
+        logger("   Download_from_api cancelled at start.")
-        return 
+        return
 
-    parsed_input_url_for_domain =urlparse (api_url_input )
+    parsed_input_url_for_domain = urlparse(api_url_input)
-    api_domain =parsed_input_url_for_domain .netloc 
+    api_domain = parsed_input_url_for_domain.netloc
-    if not any (d in api_domain .lower ()for d in ['kemono.su','kemono.party','coomer.su','coomer.party']):
+    
-        logger (f"⚠️ Unrecognized domain '{api_domain }' from input URL. Defaulting to kemono.su for API calls.")
+    # --- START: MODIFIED LOGIC ---
-        api_domain ="kemono.su"
+    # This list is updated to include the new .cr and .st mirrors for validation.
-    cookies_for_api =None 
+    if not any(d in api_domain.lower() for d in ['kemono.su', 'kemono.party', 'kemono.cr', 'coomer.su', 'coomer.party', 'coomer.st']):
-    if use_cookie and app_base_dir :
+        logger(f"⚠️ Unrecognized domain '{api_domain}' from input URL. Defaulting to kemono.su for API calls.")
-        cookies_for_api =prepare_cookies_for_request (use_cookie ,cookie_text ,selected_cookie_file ,app_base_dir ,logger ,target_domain =api_domain )
+        api_domain = "kemono.su"
-    if target_post_id :
+    # --- END: MODIFIED LOGIC ---
-        direct_post_api_url =f"https://{api_domain }/api/v1/{service }/user/{user_id }/post/{target_post_id }"
+        
-        logger (f"   Attempting direct fetch for target post: {direct_post_api_url }")
+    cookies_for_api = None
-        try :
+    if use_cookie and app_base_dir:
-            direct_response =requests .get (direct_post_api_url ,headers =headers ,timeout =(10 ,30 ),cookies =cookies_for_api )
+        cookies_for_api = prepare_cookies_for_request(use_cookie, cookie_text, selected_cookie_file, app_base_dir, logger, target_domain=api_domain)
-            direct_response .raise_for_status ()
+    if target_post_id:
-            direct_post_data =direct_response .json ()
+        if target_post_id in processed_post_ids:
-            if isinstance (direct_post_data ,list )and direct_post_data :
+            logger(f"   Skipping already processed target post ID: {target_post_id}")
-                direct_post_data =direct_post_data [0 ]
+            return
-            if isinstance (direct_post_data ,dict )and 'post'in direct_post_data and isinstance (direct_post_data ['post'],dict ):
+        direct_post_api_url = f"https://{api_domain}/api/v1/{service}/user/{user_id}/post/{target_post_id}"
-                 direct_post_data =direct_post_data ['post']
+        logger(f"   Attempting direct fetch for target post: {direct_post_api_url}")
-            if isinstance (direct_post_data ,dict )and direct_post_data .get ('id')==target_post_id :
+        try:
-                logger (f"   ✅ Direct fetch successful for post {target_post_id }.")
+            direct_response = requests.get(direct_post_api_url, headers=headers, timeout=(10, 30), cookies=cookies_for_api)
-                yield [direct_post_data ]
+            direct_response.raise_for_status()
-                return 
+            direct_post_data = direct_response.json()
-            else :
+            if isinstance(direct_post_data, list) and direct_post_data:
-                response_type =type (direct_post_data ).__name__ 
+                direct_post_data = direct_post_data[0]
-                response_snippet =str (direct_post_data )[:200 ]
+            if isinstance(direct_post_data, dict) and 'post' in direct_post_data and isinstance(direct_post_data['post'], dict):
-                logger (f"   ⚠️ Direct fetch for post {target_post_id } returned unexpected data (Type: {response_type }, Snippet: '{response_snippet }'). Falling back to pagination.")
+                direct_post_data = direct_post_data['post']
-        except requests .exceptions .RequestException as e :
+            if isinstance(direct_post_data, dict) and direct_post_data.get('id') == target_post_id:
-            logger (f"   ⚠️ Direct fetch failed for post {target_post_id }: {e }. Falling back to pagination.")
+                logger(f"   ✅ Direct fetch successful for post {target_post_id}.")
-        except Exception as e :
+                yield [direct_post_data]
-            logger (f"   ⚠️ Unexpected error during direct fetch for post {target_post_id }: {e }. Falling back to pagination.")
+                return
-    if not service or not user_id :
+            else:
-        logger (f"❌ Invalid URL or could not extract service/user: {api_url_input }")
+                response_type = type(direct_post_data).__name__
-        return 
+                response_snippet = str(direct_post_data)[:200]
-    if target_post_id and (start_page or end_page ):
+                logger(f"   ⚠️ Direct fetch for post {target_post_id} returned unexpected data (Type: {response_type}, Snippet: '{response_snippet}'). Falling back to pagination.")
-        logger ("⚠️ Page range (start/end page) is ignored when a specific post URL is provided (searching all pages for the post).")
+        except requests.exceptions.RequestException as e:
+            logger(f"   ⚠️ Direct fetch failed for post {target_post_id}: {e}. Falling back to pagination.")
+        except Exception as e:
+            logger(f"   ⚠️ Unexpected error during direct fetch for post {target_post_id}: {e}. Falling back to pagination.")
+    if not service or not user_id:
+        logger(f"❌ Invalid URL or could not extract service/user: {api_url_input}")
+        return
+    if target_post_id and (start_page or end_page):
+        logger("⚠️ Page range (start/end page) is ignored when a specific post URL is provided (searching all pages for the post).")
 
-    is_manga_mode_fetch_all_and_sort_oldest_first =manga_mode and (manga_filename_style_for_sort_check !=STYLE_DATE_POST_TITLE )and not target_post_id 
+    is_manga_mode_fetch_all_and_sort_oldest_first = manga_mode and (manga_filename_style_for_sort_check != STYLE_DATE_POST_TITLE) and not target_post_id
-    api_base_url =f"https://{api_domain }/api/v1/{service }/user/{user_id }"
+    api_base_url = f"https://{api_domain}/api/v1/{service}/user/{user_id}"
-    page_size =50 
+    page_size = 50
-    if is_manga_mode_fetch_all_and_sort_oldest_first :
+    if is_manga_mode_fetch_all_and_sort_oldest_first:
-        logger (f"   Manga Mode (Style: {manga_filename_style_for_sort_check if manga_filename_style_for_sort_check else 'Default'} - Oldest First Sort Active): Fetching all posts to sort by date...")
+        logger(f"   Manga Mode (Style: {manga_filename_style_for_sort_check if manga_filename_style_for_sort_check else 'Default'} - Oldest First Sort Active): Fetching all posts to sort by date...")
-        all_posts_for_manga_mode =[]
+        all_posts_for_manga_mode = []
-        current_offset_manga =0 
+        current_offset_manga = 0
-        if start_page and start_page >1 :
+        if start_page and start_page > 1:
-            current_offset_manga =(start_page -1 )*page_size 
+            current_offset_manga = (start_page - 1) * page_size
-            logger (f"   Manga Mode: Starting fetch from page {start_page } (offset {current_offset_manga }).")
+            logger(f"   Manga Mode: Starting fetch from page {start_page} (offset {current_offset_manga}).")
-        elif start_page :
+        elif start_page:
-            logger (f"   Manga Mode: Starting fetch from page 1 (offset 0).")
+            logger(f"   Manga Mode: Starting fetch from page 1 (offset 0).")
-        if end_page :
+        if end_page:
-            logger (f"   Manga Mode: Will fetch up to page {end_page }.")
+            logger(f"   Manga Mode: Will fetch up to page {end_page}.")
-        while True :
+        while True:
-            if pause_event and pause_event .is_set ():
+            if pause_event and pause_event.is_set():
-                logger ("   Manga mode post fetching paused...")
+                logger("   Manga mode post fetching paused...")
-                while pause_event .is_set ():
+                while pause_event.is_set():
-                    if cancellation_event and cancellation_event .is_set ():
+                    if cancellation_event and cancellation_event.is_set():
-                        logger ("   Manga mode post fetching cancelled while paused.")
+                        logger("   Manga mode post fetching cancelled while paused.")
-                        break 
+                        break
-                    time .sleep (0.5 )
+                    time.sleep(0.5)
-                if not (cancellation_event and cancellation_event .is_set ()):logger ("   Manga mode post fetching resumed.")
+                if not (cancellation_event and cancellation_event.is_set()): logger("   Manga mode post fetching resumed.")
-            if cancellation_event and cancellation_event .is_set ():
+            if cancellation_event and cancellation_event.is_set():
-                logger ("   Manga mode post fetching cancelled.")
+                logger("   Manga mode post fetching cancelled.")
-                break 
+                break
-            current_page_num_manga =(current_offset_manga //page_size )+1 
+            current_page_num_manga = (current_offset_manga // page_size) + 1
-            if end_page and current_page_num_manga >end_page :
+            if end_page and current_page_num_manga > end_page:
-                logger (f"   Manga Mode: Reached specified end page ({end_page }). Stopping post fetch.")
+                logger(f"   Manga Mode: Reached specified end page ({end_page}). Stopping post fetch.")
-                break 
+                break
-            try :
+            try:
-                posts_batch_manga =fetch_posts_paginated (api_base_url ,headers ,current_offset_manga ,logger ,cancellation_event ,pause_event ,cookies_dict =cookies_for_api )
+                posts_batch_manga = fetch_posts_paginated(api_base_url, headers, current_offset_manga, logger, cancellation_event, pause_event, cookies_dict=cookies_for_api)
-                if not isinstance (posts_batch_manga ,list ):
+                if not isinstance(posts_batch_manga, list):
-                    logger (f"❌ API Error (Manga Mode): Expected list of posts, got {type (posts_batch_manga )}.")
+                    logger(f"❌ API Error (Manga Mode): Expected list of posts, got {type(posts_batch_manga)}.")
-                    break 
+                    break
-                if not posts_batch_manga :
+                if not posts_batch_manga:
-                    logger ("✅ Reached end of posts (Manga Mode fetch all).")
+                    logger("✅ Reached end of posts (Manga Mode fetch all).")
-                    if start_page and not end_page and current_page_num_manga <start_page :
+                    if start_page and not end_page and current_page_num_manga < start_page:
-                        logger (f"   Manga Mode: No posts found on or after specified start page {start_page }.")
+                        logger(f"   Manga Mode: No posts found on or after specified start page {start_page}.")
-                    elif end_page and current_page_num_manga <=end_page and not all_posts_for_manga_mode :
+                    elif end_page and current_page_num_manga <= end_page and not all_posts_for_manga_mode:
-                        logger (f"   Manga Mode: No posts found within the specified page range ({start_page or 1 }-{end_page }).")
+                        logger(f"   Manga Mode: No posts found within the specified page range ({start_page or 1}-{end_page}).")
-                    break 
+                    break
-                all_posts_for_manga_mode .extend (posts_batch_manga )
+                all_posts_for_manga_mode.extend(posts_batch_manga)
-                current_offset_manga +=page_size 
+                
-                time .sleep (0.6 )
+                logger(f"MANGA_FETCH_PROGRESS:{len(all_posts_for_manga_mode)}:{current_page_num_manga}")
-            except RuntimeError as e :
-                if "cancelled by user"in str (e ).lower ():
-                    logger (f"ℹ️ Manga mode pagination stopped due to cancellation: {e }")
-                else :
-                    logger (f"❌ {e }\n   Aborting manga mode pagination.")
-                break 
-            except Exception as e :
-                logger (f"❌ Unexpected error during manga mode fetch: {e }")
-                traceback .print_exc ()
-                break 
-        if cancellation_event and cancellation_event .is_set ():return 
-        if all_posts_for_manga_mode :
-            logger (f"   Manga Mode: Fetched {len (all_posts_for_manga_mode )} total posts. Sorting by publication date (oldest first)...")
-            def sort_key_tuple (post ):
-                published_date_str =post .get ('published')
-                added_date_str =post .get ('added')
-                post_id_str =post .get ('id',"0")
-                primary_sort_val ="0000-00-00T00:00:00"
-                if published_date_str :
-                    primary_sort_val =published_date_str 
-                elif added_date_str :
-                    logger (f"    ⚠️ Post ID {post_id_str } missing 'published' date, using 'added' date '{added_date_str }' for primary sorting.")
-                    primary_sort_val =added_date_str 
-                else :
-                    logger (f"    ⚠️ Post ID {post_id_str } missing both 'published' and 'added' dates. Placing at start of sort (using default earliest date).")
-                secondary_sort_val =0 
-                try :
-                    secondary_sort_val =int (post_id_str )
-                except ValueError :
-                    logger (f"    ⚠️ Post ID '{post_id_str }' is not a valid integer for secondary sorting, using 0.")
-                return (primary_sort_val ,secondary_sort_val )
-            all_posts_for_manga_mode .sort (key =sort_key_tuple )
-            for i in range (0 ,len (all_posts_for_manga_mode ),page_size ):
-                if cancellation_event and cancellation_event .is_set ():
-                    logger ("   Manga mode post yielding cancelled.")
-                    break 
-                yield all_posts_for_manga_mode [i :i +page_size ]
-        return 
 
+                current_offset_manga += page_size
+                time.sleep(0.6)
+            except RuntimeError as e:
+                if "cancelled by user" in str(e).lower():
+                    logger(f"ℹ️ Manga mode pagination stopped due to cancellation: {e}")
+                else:
+                    logger(f"❌ {e}\n   Aborting manga mode pagination.")
+                break
+            except Exception as e:
+                logger(f"❌ Unexpected error during manga mode fetch: {e}")
+                traceback.print_exc()
+                break
+        
+        if cancellation_event and cancellation_event.is_set(): return
+        
+        if all_posts_for_manga_mode:
+            logger(f"MANGA_FETCH_COMPLETE:{len(all_posts_for_manga_mode)}")
 
+        if all_posts_for_manga_mode:
+            if processed_post_ids:
+                original_count = len(all_posts_for_manga_mode)
+                all_posts_for_manga_mode = [post for post in all_posts_for_manga_mode if post.get('id') not in processed_post_ids]
+                skipped_count = original_count - len(all_posts_for_manga_mode)
+                if skipped_count > 0:
+                    logger(f"   Manga Mode: Skipped {skipped_count} already processed post(s) before sorting.")
 
-    if manga_mode and not target_post_id and (manga_filename_style_for_sort_check ==STYLE_DATE_POST_TITLE ):
+            logger(f"   Manga Mode: Fetched {len(all_posts_for_manga_mode)} total posts. Sorting by publication date (oldest first)...")
-        logger (f"   Manga Mode (Style: {STYLE_DATE_POST_TITLE }): Processing posts in default API order (newest first).")
+            def sort_key_tuple(post):
+                published_date_str = post.get('published')
+                added_date_str = post.get('added')
+                post_id_str = post.get('id', "0")
+                primary_sort_val = "0000-00-00T00:00:00"
+                if published_date_str:
+                    primary_sort_val = published_date_str
+                elif added_date_str:
+                    logger(f"    ⚠️ Post ID {post_id_str} missing 'published' date, using 'added' date '{added_date_str}' for primary sorting.")
+                    primary_sort_val = added_date_str
+                else:
+                    logger(f"    ⚠️ Post ID {post_id_str} missing both 'published' and 'added' dates. Placing at start of sort (using default earliest date).")
+                secondary_sort_val = 0
+                try:
+                    secondary_sort_val = int(post_id_str)
+                except ValueError:
+                    logger(f"    ⚠️ Post ID '{post_id_str}' is not a valid integer for secondary sorting, using 0.")
+                return (primary_sort_val, secondary_sort_val)
+            all_posts_for_manga_mode.sort(key=sort_key_tuple)
+            for i in range(0, len(all_posts_for_manga_mode), page_size):
+                if cancellation_event and cancellation_event.is_set():
+                    logger("   Manga mode post yielding cancelled.")
+                    break
+                yield all_posts_for_manga_mode[i:i + page_size]
+        return
 
-    current_page_num =1 
+    if manga_mode and not target_post_id and (manga_filename_style_for_sort_check == STYLE_DATE_POST_TITLE):
-    current_offset =0 
+        logger(f"   Manga Mode (Style: {STYLE_DATE_POST_TITLE}): Processing posts in default API order (newest first).")
-    processed_target_post_flag =False 
+
-    if start_page and start_page >1 and not target_post_id :
+    current_page_num = 1
-        current_offset =(start_page -1 )*page_size 
+    current_offset = 0
-        current_page_num =start_page 
+    processed_target_post_flag = False
-        logger (f"   Starting from page {current_page_num } (calculated offset {current_offset }).")
+    if start_page and start_page > 1 and not target_post_id:
-    while True :
+        current_offset = (start_page - 1) * page_size
-        if pause_event and pause_event .is_set ():
+        current_page_num = start_page
-            logger ("   Post fetching loop paused...")
+        logger(f"   Starting from page {current_page_num} (calculated offset {current_offset}).")
-            while pause_event .is_set ():
+    while True:
-                if cancellation_event and cancellation_event .is_set ():
+        if pause_event and pause_event.is_set():
-                    logger ("   Post fetching loop cancelled while paused.")
+            logger("   Post fetching loop paused...")
-                    break 
+            while pause_event.is_set():
-                time .sleep (0.5 )
+                if cancellation_event and cancellation_event.is_set():
-            if not (cancellation_event and cancellation_event .is_set ()):logger ("   Post fetching loop resumed.")
+                    logger("   Post fetching loop cancelled while paused.")
-        if cancellation_event and cancellation_event .is_set ():
+                    break
-            logger ("   Post fetching loop cancelled.")
+                time.sleep(0.5)
-            break 
+            if not (cancellation_event and cancellation_event.is_set()): logger("   Post fetching loop resumed.")
-        if target_post_id and processed_target_post_flag :
+        if cancellation_event and cancellation_event.is_set():
-            break 
+            logger("   Post fetching loop cancelled.")
-        if not target_post_id and end_page and current_page_num >end_page :
+            break
-            logger (f"✅ Reached specified end page ({end_page }) for creator feed. Stopping.")
+        if target_post_id and processed_target_post_flag:
-            break 
+            break
-        try :
+        if not target_post_id and end_page and current_page_num > end_page:
-            posts_batch =fetch_posts_paginated (api_base_url ,headers ,current_offset ,logger ,cancellation_event ,pause_event ,cookies_dict =cookies_for_api )
+            logger(f"✅ Reached specified end page ({end_page}) for creator feed. Stopping.")
-            if not isinstance (posts_batch ,list ):
+            break
-                logger (f"❌ API Error: Expected list of posts, got {type (posts_batch )} at page {current_page_num } (offset {current_offset }).")
+        try:
-                break 
+            posts_batch = fetch_posts_paginated(api_base_url, headers, current_offset, logger, cancellation_event, pause_event, cookies_dict=cookies_for_api)
-        except RuntimeError as e :
+            if not isinstance(posts_batch, list):
-            if "cancelled by user"in str (e ).lower ():
+                logger(f"❌ API Error: Expected list of posts, got {type(posts_batch)} at page {current_page_num} (offset {current_offset}).")
-                 logger (f"ℹ️ Pagination stopped due to cancellation: {e }")
+                break
-            else :
+        except RuntimeError as e:
-                logger (f"❌ {e }\n   Aborting pagination at page {current_page_num } (offset {current_offset }).")
+            if "cancelled by user" in str(e).lower():
-            break 
+                logger(f"ℹ️ Pagination stopped due to cancellation: {e}")
-        except Exception as e :
+            else:
-            logger (f"❌ Unexpected error fetching page {current_page_num } (offset {current_offset }): {e }")
+                logger(f"❌ {e}\n   Aborting pagination at page {current_page_num} (offset {current_offset}).")
-            traceback .print_exc ()
+            break
-            break 
+        except Exception as e:
-        if not posts_batch :
+            logger(f"❌ Unexpected error fetching page {current_page_num} (offset {current_offset}): {e}")
-            if target_post_id and not processed_target_post_flag :
+            traceback.print_exc()
-                logger (f"❌ Target post {target_post_id } not found after checking all available pages (API returned no more posts at offset {current_offset }).")
+            break
-            elif not target_post_id :
+        if processed_post_ids:
-                if current_page_num ==(start_page or 1 ):
+            original_count = len(posts_batch)
-                     logger (f"😕 No posts found on the first page checked (page {current_page_num }, offset {current_offset }).")
+            posts_batch = [post for post in posts_batch if post.get('id') not in processed_post_ids]
-                else :
+            skipped_count = original_count - len(posts_batch)
-                     logger (f"✅ Reached end of posts (no more content from API at offset {current_offset }).")
+            if skipped_count > 0:
-            break 
+                logger(f"   Skipped {skipped_count} already processed post(s) from page {current_page_num}.")
-        if target_post_id and not processed_target_post_flag :
+        
-            matching_post =next ((p for p in posts_batch if str (p .get ('id'))==str (target_post_id )),None )
+        if not posts_batch:
-            if matching_post :
+            if target_post_id and not processed_target_post_flag:
-                logger (f"🎯 Found target post {target_post_id } on page {current_page_num } (offset {current_offset }).")
+                logger(f"❌ Target post {target_post_id} not found after checking all available pages (API returned no more posts at offset {current_offset}).")
-                yield [matching_post ]
+            elif not target_post_id:
-                processed_target_post_flag =True 
+                if current_page_num == (start_page or 1):
-        elif not target_post_id :
+                    logger(f"😕 No posts found on the first page checked (page {current_page_num}, offset {current_offset}).")
-            yield posts_batch 
+                else:
-        if processed_target_post_flag :
+                    logger(f"✅ Reached end of posts (no more content from API at offset {current_offset}).")
-            break 
+            break
-        current_offset +=page_size 
+        if target_post_id and not processed_target_post_flag:
-        current_page_num +=1 
+            matching_post = next((p for p in posts_batch if str(p.get('id')) == str(target_post_id)), None)
-        time .sleep (0.6 )
+            if matching_post:
-    if target_post_id and not processed_target_post_flag and not (cancellation_event and cancellation_event .is_set ()):
+                logger(f"🎯 Found target post {target_post_id} on page {current_page_num} (offset {current_offset}).")
-        logger (f"❌ Target post {target_post_id } could not be found after checking all relevant pages (final check after loop).")
+                yield [matching_post]
+                processed_target_post_flag = True
+        elif not target_post_id:
+            yield posts_batch
+        if processed_target_post_flag:
+            break
+        current_offset += page_size
+        current_page_num += 1
+        time.sleep(0.6)
+    if target_post_id and not processed_target_post_flag and not (cancellation_event and cancellation_event.is_set()):
+        logger(f"❌ Target post {target_post_id} could not be found after checking all relevant pages (final check after loop).")

src/core/manager.py

@@ -1,19 +1,14 @@
-# --- Standard Library Imports ---
 import threading
 import time
 import os
 import json
 import traceback
 from concurrent.futures import ThreadPoolExecutor, as_completed, Future
-
-# --- Local Application Imports ---
-# These imports reflect the new, organized project structure.
 from .api_client import download_from_api
-from .workers import PostProcessorWorker, DownloadThread
+from .workers import PostProcessorWorker
 from ..config.constants import (
     STYLE_DATE_BASED, STYLE_POST_TITLE_GLOBAL_NUMBERING,
-    MAX_THREADS, POST_WORKER_BATCH_THRESHOLD, POST_WORKER_NUM_BATCHES,
+    MAX_THREADS
-    POST_WORKER_BATCH_DELAY_SECONDS
 )
 from ..utils.file_utils import clean_folder_name
 
@@ -36,8 +31,6 @@ class DownloadManager:
         self.progress_queue = progress_queue
         self.thread_pool = None
         self.active_futures = []
-
-        # --- Session State ---
         self.cancellation_event = threading.Event()
         self.pause_event = threading.Event()
         self.is_running = False
@@ -47,6 +40,10 @@ class DownloadManager:
         self.total_downloads = 0
         self.total_skips = 0
         self.all_kept_original_filenames = []
+        self.creator_profiles_dir = None
+        self.current_creator_name_for_profile = None
+        self.current_creator_profile_path = None
+        self.session_file_path = None
 
     def _log(self, message):
         """Puts a progress message into the queue for the UI."""
@@ -65,7 +62,16 @@ class DownloadManager:
             self._log("❌ Cannot start a new session: A session is already in progress.")
             return
 
-        # --- Reset state for the new session ---
+        self.session_file_path = config.get('session_file_path')
+        creator_profile_data = self._setup_creator_profile(config)
+        
+        # Save settings to profile at the start of the session
+        if self.current_creator_profile_path:
+            creator_profile_data['settings'] = config
+            creator_profile_data.setdefault('processed_post_ids', [])
+            self._save_creator_profile(creator_profile_data)
+            self._log(f"✅ Loaded/created profile for '{self.current_creator_name_for_profile}'. Settings saved.")
+
         self.is_running = True
         self.cancellation_event.clear()
         self.pause_event.clear()
@@ -75,121 +81,122 @@ class DownloadManager:
         self.total_downloads = 0
         self.total_skips = 0
         self.all_kept_original_filenames = []
-
+        
-        # --- Decide execution strategy (multi-threaded vs. single-threaded) ---
         is_single_post = bool(config.get('target_post_id_from_initial_url'))
         use_multithreading = config.get('use_multithreading', True)
         is_manga_sequential = config.get('manga_mode_active') and config.get('manga_filename_style') in [STYLE_DATE_BASED, STYLE_POST_TITLE_GLOBAL_NUMBERING]
 
         should_use_multithreading_for_posts = use_multithreading and not is_single_post and not is_manga_sequential
-
+        
         if should_use_multithreading_for_posts:
-            # Start a separate thread to manage fetching and queuing to the thread pool
             fetcher_thread = threading.Thread(
                 target=self._fetch_and_queue_posts_for_pool,
-                args=(config, restore_data),
+                args=(config, restore_data, creator_profile_data),
                 daemon=True
             )
             fetcher_thread.start()
         else:
-            # For single posts or sequential manga mode, use a single worker thread
+            # Single-threaded mode does not use the manager's complex logic
-            # which is simpler and ensures order.
+            self._log("ℹ️ Manager is handing off to a single-threaded worker...")
-            self._start_single_threaded_session(config)
+            # The single-threaded worker will manage its own lifecycle and signals.
+            # The manager's role for this session is effectively over.
+            self.is_running = False # Allow another session to start if needed
+            self.progress_queue.put({'type': 'handoff_to_single_thread', 'payload': (config,)})
 
-    def _start_single_threaded_session(self, config):
-        """Handles downloads that are best processed by a single worker thread."""
-        self._log("ℹ️ Initializing single-threaded download process...")
-        
-        # The original DownloadThread is now a pure Python thread, not a QThread.
-        # We run its `run` method in a standard Python thread.
-        self.worker_thread = threading.Thread(
-            target=self._run_single_worker,
-            args=(config,),
-            daemon=True
-        )
-        self.worker_thread.start()
 
-    def _run_single_worker(self, config):
+    def _fetch_and_queue_posts_for_pool(self, config, restore_data, creator_profile_data):
-        """Target function for the single-worker thread."""
-        try:
-            # Pass the queue directly to the worker for it to send updates
-            worker = DownloadThread(config, self.progress_queue)
-            worker.run() # This is the main blocking call for this thread
-        except Exception as e:
-            self._log(f"❌ CRITICAL ERROR in single-worker thread: {e}")
-            self._log(traceback.format_exc())
-        finally:
-            self.is_running = False
-
-    def _fetch_and_queue_posts_for_pool(self, config, restore_data):
         """
-        Fetches all posts from the API and submits them as tasks to a thread pool.
+        Fetches posts from the API in batches and submits them as tasks to a thread pool.
-        This method runs in its own dedicated thread to avoid blocking.
+        This method runs in its own dedicated thread to avoid blocking the UI.
+        It provides immediate feedback as soon as the first batch of posts is found.
         """
         try:
             num_workers = min(config.get('num_threads', 4), MAX_THREADS)
             self.thread_pool = ThreadPoolExecutor(max_workers=num_workers, thread_name_prefix='PostWorker_')
-            
+
-            # Fetch posts
+            session_processed_ids = set(restore_data.get('processed_post_ids', [])) if restore_data else set()
-            # In a real implementation, this would call `api_client.download_from_api`
+            profile_processed_ids = set(creator_profile_data.get('processed_post_ids', []))
-            if restore_data:
+            processed_ids = session_processed_ids.union(profile_processed_ids)
+
+            if restore_data and 'all_posts_data' in restore_data:
+                # This logic for session restore remains as it relies on a pre-fetched list
                 all_posts = restore_data['all_posts_data']
-                processed_ids = set(restore_data['processed_post_ids'])
                 posts_to_process = [p for p in all_posts if p.get('id') not in processed_ids]
                 self.total_posts = len(all_posts)
                 self.processed_posts = len(processed_ids)
                 self._log(f"🔄 Restoring session. {len(posts_to_process)} posts remaining.")
+                self.progress_queue.put({'type': 'overall_progress', 'payload': (self.total_posts, self.processed_posts)})
+                
+                if not posts_to_process:
+                    self._log("✅ No new posts to process from restored session.")
+                    return
+
+                for post_data in posts_to_process:
+                    if self.cancellation_event.is_set(): break
+                    worker = PostProcessorWorker(post_data, config, self.progress_queue)
+                    future = self.thread_pool.submit(worker.process)
+                    future.add_done_callback(self._handle_future_result)
+                    self.active_futures.append(future)
             else:
-                posts_to_process = self._get_all_posts(config)
+                # --- START: REFACTORED STREAMING LOGIC ---
-                self.total_posts = len(posts_to_process)
+                post_generator = download_from_api(
+                    api_url_input=config['api_url'],
+                    logger=self._log,
+                    start_page=config.get('start_page'),
+                    end_page=config.get('end_page'),
+                    manga_mode=config.get('manga_mode_active', False),
+                    cancellation_event=self.cancellation_event,
+                    pause_event=self.pause_event,
+                    use_cookie=config.get('use_cookie', False),
+                    cookie_text=config.get('cookie_text', ''),
+                    selected_cookie_file=config.get('selected_cookie_file'),
+                    app_base_dir=config.get('app_base_dir'),
+                    manga_filename_style_for_sort_check=config.get('manga_filename_style'),
+                    processed_post_ids=list(processed_ids)
+                )
+
+                self.total_posts = 0
                 self.processed_posts = 0
 
-            self.progress_queue.put({'type': 'overall_progress', 'payload': (self.total_posts, self.processed_posts)})
+                # Process posts in batches as they are yielded by the API client
-            
+                for batch in post_generator:
-            if not posts_to_process:
+                    if self.cancellation_event.is_set():
-                self._log("✅ No new posts to process.")
+                        self._log("   Post fetching cancelled.")
-                return
+                        break
+                    
+                    # Filter out any posts that might have been processed since the start
+                    posts_in_batch_to_process = [p for p in batch if p.get('id') not in processed_ids]
+                    
+                    if not posts_in_batch_to_process:
+                        continue
+
+                    # Update total count and immediately inform the UI
+                    self.total_posts += len(posts_in_batch_to_process)
+                    self.progress_queue.put({'type': 'overall_progress', 'payload': (self.total_posts, self.processed_posts)})
+
+                    for post_data in posts_in_batch_to_process:
+                        if self.cancellation_event.is_set(): break
+                        worker = PostProcessorWorker(post_data, config, self.progress_queue)
+                        future = self.thread_pool.submit(worker.process)
+                        future.add_done_callback(self._handle_future_result)
+                        self.active_futures.append(future)
+
+                if self.total_posts == 0 and not self.cancellation_event.is_set():
+                     self._log("✅ No new posts found to process.")
 
-            # Submit tasks to the pool
-            for post_data in posts_to_process:
-                if self.cancellation_event.is_set():
-                    break
-                # Each PostProcessorWorker gets the queue to send its own updates
-                worker = PostProcessorWorker(post_data, config, self.progress_queue)
-                future = self.thread_pool.submit(worker.process)
-                future.add_done_callback(self._handle_future_result)
-                self.active_futures.append(future)
-        
         except Exception as e:
             self._log(f"❌ CRITICAL ERROR in post fetcher thread: {e}")
             self._log(traceback.format_exc())
         finally:
-            # Wait for all submitted tasks to complete before shutting down
             if self.thread_pool:
                 self.thread_pool.shutdown(wait=True)
             self.is_running = False
-            self._log("🏁 All processing tasks have completed.")
+            self._log("🏁 All processing tasks have completed or been cancelled.") 
-            # Emit final signal
             self.progress_queue.put({
                 'type': 'finished',
                 'payload': (self.total_downloads, self.total_skips, self.cancellation_event.is_set(), self.all_kept_original_filenames)
             })
 
-    def _get_all_posts(self, config):
-        """Helper to fetch all posts using the API client."""
-        all_posts = []
-        # This generator yields batches of posts
-        post_generator = download_from_api(
-            api_url_input=config['api_url'],
-            logger=self._log,
-            # ... pass other relevant config keys ...
-            cancellation_event=self.cancellation_event,
-            pause_event=self.pause_event
-        )
-        for batch in post_generator:
-            all_posts.extend(batch)
-        return all_posts
-
     def _handle_future_result(self, future: Future):
         """Callback executed when a worker task completes."""
         if self.cancellation_event.is_set():
@@ -203,39 +210,76 @@ class DownloadManager:
                     self.total_skips += 1
                 else:
                     result = future.result()
-                    # Unpack result tuple from the worker
                     (dl_count, skip_count, kept_originals, 
                      retryable, permanent, history) = result
                     self.total_downloads += dl_count
                     self.total_skips += skip_count
                     self.all_kept_original_filenames.extend(kept_originals)
-                    
-                    # Queue up results for UI to handle
                     if retryable:
                         self.progress_queue.put({'type': 'retryable_failure', 'payload': (retryable,)})
                     if permanent:
                         self.progress_queue.put({'type': 'permanent_failure', 'payload': (permanent,)})
                     if history:
                         self.progress_queue.put({'type': 'post_processed_history', 'payload': (history,)})
+                        post_id = history.get('post_id')
+                        if post_id and self.current_creator_profile_path:
+                            profile_data = self._setup_creator_profile({'creator_name_for_profile': self.current_creator_name_for_profile, 'session_file_path': self.session_file_path})
+                            if post_id not in profile_data.get('processed_post_ids', []):
+                                profile_data.setdefault('processed_post_ids', []).append(post_id)
+                                self._save_creator_profile(profile_data)
 
             except Exception as e:
                 self._log(f"❌ Worker task resulted in an exception: {e}")
                 self.total_skips += 1 # Count errored posts as skipped
-
-            # Update overall progress
             self.progress_queue.put({'type': 'overall_progress', 'payload': (self.total_posts, self.processed_posts)})
 
+    def _setup_creator_profile(self, config):
+        """Prepares the path and loads data for the current creator's profile."""
+        self.current_creator_name_for_profile = config.get('creator_name_for_profile')
+        if not self.current_creator_name_for_profile:
+            self._log("⚠️ Cannot create creator profile: Name not provided in config.")
+            return {}
+
+        appdata_dir = os.path.dirname(config.get('session_file_path', '.'))
+        self.creator_profiles_dir = os.path.join(appdata_dir, "creator_profiles")
+        os.makedirs(self.creator_profiles_dir, exist_ok=True)
+
+        safe_filename = clean_folder_name(self.current_creator_name_for_profile) + ".json"
+        self.current_creator_profile_path = os.path.join(self.creator_profiles_dir, safe_filename)
+
+        if os.path.exists(self.current_creator_profile_path):
+            try:
+                with open(self.current_creator_profile_path, 'r', encoding='utf-8') as f:
+                    return json.load(f)
+            except (json.JSONDecodeError, OSError) as e:
+                self._log(f"❌ Error loading creator profile '{safe_filename}': {e}. Starting fresh.")
+        return {}
+
+    def _save_creator_profile(self, data):
+        """Saves the provided data to the current creator's profile file."""
+        if not self.current_creator_profile_path:
+            return
+        try:
+            temp_path = self.current_creator_profile_path + ".tmp"
+            with open(temp_path, 'w', encoding='utf-8') as f:
+                json.dump(data, f, indent=2)
+            os.replace(temp_path, self.current_creator_profile_path)
+        except OSError as e:
+            self._log(f"❌ Error saving creator profile to '{self.current_creator_profile_path}': {e}")
+
     def cancel_session(self):
         """Cancels the current running session."""
         if not self.is_running:
             return
+        
+        if self.cancellation_event.is_set():
+            self._log("ℹ️ Cancellation already in progress.")
+            return
+
         self._log("⚠️ Cancellation requested by user...")
         self.cancellation_event.set()
-        
+
-        # For single thread mode, the worker checks the event
-        # For multi-thread mode, shut down the pool
         if self.thread_pool:
-            # Don't wait, just cancel pending futures and let the fetcher thread exit
+            self._log("   Signaling all worker threads to stop and shutting down pool...")
-            self.thread_pool.shutdown(wait=False, cancel_futures=True)
+            self.thread_pool.shutdown(wait=False)
-            
+
-        self.is_running = False

src/services/drive_downloader.py

@@ -3,33 +3,35 @@ import os
 import re
 import traceback
 import json
+import base64
+import time
 from urllib.parse import urlparse, urlunparse, parse_qs, urlencode
 
 # --- Third-Party Library Imports ---
+# Make sure to install these: pip install requests pycryptodome gdown
 import requests
+
 try:
-    from mega import Mega
+    from Crypto.Cipher import AES
-    MEGA_AVAILABLE = True
+    PYCRYPTODOME_AVAILABLE = True
 except ImportError:
-    MEGA_AVAILABLE = False
+    PYCRYPTODOME_AVAILABLE = False
 
 try:
     import gdown
-    GDOWN_AVAILABLE = True
+    GDRIVE_AVAILABLE = True
 except ImportError:
-    GDOWN_AVAILABLE = False
+    GDRIVE_AVAILABLE = False
 
-# --- Helper Functions ---
+# --- Constants ---
+MEGA_API_URL = "https://g.api.mega.co.nz"
+
+# --- Helper Functions (Original and New) ---
 
 def _get_filename_from_headers(headers):
     """
     Extracts a filename from the Content-Disposition header.
-
+    (This is from your original file and is kept for Dropbox downloads)
-    Args:
-        headers (dict): A dictionary of HTTP response headers.
-
-    Returns:
-        str or None: The extracted filename, or None if not found.
     """
     cd = headers.get('content-disposition')
     if not cd:
@@ -37,97 +39,205 @@ def _get_filename_from_headers(headers):
     
     fname_match = re.findall('filename="?([^"]+)"?', cd)
     if fname_match:
-        # Sanitize the filename to prevent directory traversal issues
-        # and remove invalid characters for most filesystems.
         sanitized_name = re.sub(r'[<>:"/\\|?*]', '_', fname_match[0].strip())
         return sanitized_name
         
     return None
 
-# --- Main Service Downloader Functions ---
+# --- NEW: Helper functions for Mega decryption ---
 
-def download_mega_file(mega_link, download_path=".", logger_func=print):
+def urlb64_to_b64(s):
-    """
+    """Converts a URL-safe base64 string to a standard base64 string."""
-    Downloads a file from a public Mega.nz link.
+    s = s.replace('-', '+').replace('_', '/')
+    s += '=' * (-len(s) % 4)
+    return s
 
-    Args:
+def b64_to_bytes(s):
-        mega_link (str): The public Mega.nz link to the file.
+    """Decodes a URL-safe base64 string to bytes."""
-        download_path (str): The directory to save the downloaded file.
+    return base64.b64decode(urlb64_to_b64(s))
-        logger_func (callable): Function to use for logging.
-    """
-    if not MEGA_AVAILABLE:
-        logger_func("❌ Error: mega.py library is not installed. Cannot download from Mega.")
-        logger_func("   Please install it: pip install mega.py")
-        raise ImportError("mega.py library not found.")
 
-    logger_func(f"   [Mega] Initializing Mega client...")
+def bytes_to_hex(b):
+    """Converts bytes to a hex string."""
+    return b.hex()
+
+def hex_to_bytes(h):
+    """Converts a hex string to bytes."""
+    return bytes.fromhex(h)
+
+def hrk2hk(hex_raw_key):
+    """Derives the final AES key from the raw key components for Mega."""
+    key_part1 = int(hex_raw_key[0:16], 16)
+    key_part2 = int(hex_raw_key[16:32], 16)
+    key_part3 = int(hex_raw_key[32:48], 16)
+    key_part4 = int(hex_raw_key[48:64], 16)
+    
+    final_key_part1 = key_part1 ^ key_part3
+    final_key_part2 = key_part2 ^ key_part4
+    
+    return f'{final_key_part1:016x}{final_key_part2:016x}'
+
+def decrypt_at(at_b64, key_bytes):
+    """Decrypts the 'at' attribute to get file metadata."""
+    at_bytes = b64_to_bytes(at_b64)
+    iv = b'\0' * 16
+    cipher = AES.new(key_bytes, AES.MODE_CBC, iv)
+    decrypted_at = cipher.decrypt(at_bytes)
+    return decrypted_at.decode('utf-8').strip('\0').replace('MEGA', '')
+
+# --- NEW: Core Logic for Mega Downloads ---
+
+def get_mega_file_info(file_id, file_key, session, logger_func):
+    """Fetches file metadata and the temporary download URL from the Mega API."""
     try:
-        mega_client = Mega()
+        hex_raw_key = bytes_to_hex(b64_to_bytes(file_key))
-        m = mega_client.login()
+        hex_key = hrk2hk(hex_raw_key)
-        logger_func(f"   [Mega] Attempting to download from: {mega_link}")
+        key_bytes = hex_to_bytes(hex_key)
-        
+
-        if not os.path.exists(download_path):
+        # Request file attributes
-            os.makedirs(download_path, exist_ok=True)
+        payload = [{"a": "g", "p": file_id}]
-            logger_func(f"   [Mega] Created download directory: {download_path}")
+        response = session.post(f"{MEGA_API_URL}/cs", json=payload, timeout=20)
+        response.raise_for_status()
+        res_json = response.json()
+
+        if isinstance(res_json, list) and isinstance(res_json[0], int) and res_json[0] < 0:
+            logger_func(f"   [Mega] ❌ API Error: {res_json[0]}. The link may be invalid or removed.")
+            return None
+
+        file_size = res_json[0]['s']
+        at_b64 = res_json[0]['at']
+
+        # Decrypt attributes to get the file name
+        at_dec_json_str = decrypt_at(at_b64, key_bytes)
+        at_dec_json = json.loads(at_dec_json_str)
+        file_name = at_dec_json['n']
+
+        # Request the temporary download URL
+        payload = [{"a": "g", "g": 1, "p": file_id}]
+        response = session.post(f"{MEGA_API_URL}/cs", json=payload, timeout=20)
+        response.raise_for_status()
+        res_json = response.json()
+        dl_temp_url = res_json[0]['g']
+
+        return {
+            'file_name': file_name,
+            'file_size': file_size,
+            'dl_url': dl_temp_url,
+            'hex_raw_key': hex_raw_key
+        }
+    except (requests.RequestException, json.JSONDecodeError, KeyError, ValueError) as e:
+        logger_func(f"   [Mega] ❌ Failed to get file info: {e}")
+        return None
+
+def download_and_decrypt_mega_file(info, download_path, logger_func):
+    """Downloads the file and decrypts it chunk by chunk, reporting progress."""
+    file_name = info['file_name']
+    file_size = info['file_size']
+    dl_url = info['dl_url']
+    hex_raw_key = info['hex_raw_key']
+
+    final_path = os.path.join(download_path, file_name)
+
+    if os.path.exists(final_path) and os.path.getsize(final_path) == file_size:
+        logger_func(f"   [Mega] ℹ️ File '{file_name}' already exists with the correct size. Skipping.")
+        return
+
+    # Prepare for decryption
+    key = hex_to_bytes(hrk2hk(hex_raw_key))
+    iv_hex = hex_raw_key[32:48] + '0000000000000000'
+    iv_bytes = hex_to_bytes(iv_hex)
+    cipher = AES.new(key, AES.MODE_CTR, initial_value=iv_bytes, nonce=b'')
+
+    try:
+        with requests.get(dl_url, stream=True, timeout=(15, 300)) as r:
+            r.raise_for_status()
+            downloaded_bytes = 0
+            last_log_time = time.time()
             
-        # The download_url method handles file info fetching and saving internally.
+            with open(final_path, 'wb') as f:
-        downloaded_file_path = m.download_url(mega_link, dest_path=download_path)
+                for chunk in r.iter_content(chunk_size=8192):
-
+                    if not chunk:
-        if downloaded_file_path and os.path.exists(downloaded_file_path):
+                        continue
-            logger_func(f"   [Mega] ✅ File downloaded successfully! Saved as: {downloaded_file_path}")
+                    decrypted_chunk = cipher.decrypt(chunk)
-        else:
+                    f.write(decrypted_chunk)
-            raise Exception(f"Mega download failed or file not found. Returned: {downloaded_file_path}")
+                    downloaded_bytes += len(chunk)
-
+                    
+                    # Log progress every second
+                    current_time = time.time()
+                    if current_time - last_log_time > 1:
+                        progress_percent = (downloaded_bytes / file_size) * 100 if file_size > 0 else 0
+                        logger_func(f"   [Mega] Downloading '{file_name}': {downloaded_bytes/1024/1024:.2f}MB / {file_size/1024/1024:.2f}MB ({progress_percent:.1f}%)")
+                        last_log_time = current_time
+        
+        logger_func(f"   [Mega] ✅ Successfully downloaded '{file_name}' to '{download_path}'")
+    except requests.RequestException as e:
+        logger_func(f"   [Mega] ❌ Download failed for '{file_name}': {e}")
+    except IOError as e:
+        logger_func(f"   [Mega] ❌ Could not write to file '{final_path}': {e}")
     except Exception as e:
-        logger_func(f"   [Mega] ❌ An unexpected error occurred during Mega download: {e}")
+        logger_func(f"   [Mega] ❌ An unexpected error occurred during download/decryption: {e}")
-        traceback.print_exc(limit=2)
-        raise  # Re-raise the exception to be handled by the calling worker
 
-def download_gdrive_file(gdrive_link, download_path=".", logger_func=print):
+
+# --- REPLACEMENT Main Service Downloader Function for Mega ---
+
+def download_mega_file(mega_url, download_path, logger_func=print):
     """
-    Downloads a file from a public Google Drive link using the gdown library.
+    Downloads a file from a Mega.nz URL using direct requests and decryption.
-
+    This replaces the old mega.py implementation.
-    Args:
-        gdrive_link (str): The public Google Drive link to the file.
-        download_path (str): The directory to save the downloaded file.
-        logger_func (callable): Function to use for logging.
     """
-    if not GDOWN_AVAILABLE:
+    if not PYCRYPTODOME_AVAILABLE:
-        logger_func("❌ Error: gdown library is not installed. Cannot download from Google Drive.")
+        logger_func("❌ Mega download failed: 'pycryptodome' library is not installed. Please run: pip install pycryptodome")
-        logger_func("   Please install it: pip install gdown")
+        return
-        raise ImportError("gdown library not found.")
 
-    logger_func(f"   [GDrive] Attempting to download: {gdrive_link}")
+    logger_func(f"   [Mega] Initializing download for: {mega_url}")
+    
+    # Regex to capture file ID and key from both old and new URL formats
+    match = re.search(r'mega(?:\.co)?\.nz/(?:file/|#!)?([a-zA-Z0-9]+)(?:#|!)([a-zA-Z0-9_.-]+)', mega_url)
+    if not match:
+        logger_func(f"   [Mega] ❌ Error: Invalid Mega URL format.")
+        return
+        
+    file_id = match.group(1)
+    file_key = match.group(2)
+
+    session = requests.Session()
+    session.headers.update({'User-Agent': 'Kemono-Downloader-PyQt/1.0'})
+    
+    file_info = get_mega_file_info(file_id, file_key, session, logger_func)
+    if not file_info:
+        logger_func(f"   [Mega] ❌ Failed to get file info. The link may be invalid or expired. Aborting.")
+        return
+
+    logger_func(f"   [Mega] File found: '{file_info['file_name']}' (Size: {file_info['file_size'] / 1024 / 1024:.2f} MB)")
+    
+    download_and_decrypt_mega_file(file_info, download_path, logger_func)
+
+
+# --- ORIGINAL Functions for Google Drive and Dropbox (Unchanged) ---
+
+def download_gdrive_file(url, download_path, logger_func=print):
+    """Downloads a file from a Google Drive link."""
+    if not GDRIVE_AVAILABLE:
+        logger_func("❌ Google Drive download failed: 'gdown' library is not installed.")
+        return
     try:
-        if not os.path.exists(download_path):
+        logger_func(f"   [G-Drive] Starting download for: {url}")
-            os.makedirs(download_path, exist_ok=True)
+        logger_func("   [G-Drive] Download in progress... This may take some time. Please wait.")
-            logger_func(f"   [GDrive] Created download directory: {download_path}")
+        
-
+        output_path = gdown.download(url, output=download_path, quiet=True, fuzzy=True)
-        # gdown handles finding the file ID and downloading. 'fuzzy=True' helps with various URL formats.
+        
-        output_file_path = gdown.download(gdrive_link, output=download_path, quiet=False, fuzzy=True)
+        if output_path and os.path.exists(output_path):
-
+            logger_func(f"   [G-Drive] ✅ Successfully downloaded to '{output_path}'")
-        if output_file_path and os.path.exists(output_file_path):
-            logger_func(f"   [GDrive] ✅ Google Drive file downloaded successfully: {output_file_path}")
         else:
-            raise Exception(f"gdown download failed or file not found. Returned: {output_file_path}")
+            logger_func(f"   [G-Drive] ❌ Download failed. The file may have been moved, deleted, or is otherwise inaccessible.")
-
     except Exception as e:
-        logger_func(f"   [GDrive] ❌ An error occurred during Google Drive download: {e}")
+        logger_func(f"   [G-Drive] ❌ An unexpected error occurred: {e}")
-        traceback.print_exc(limit=2)
-        raise
 
 def download_dropbox_file(dropbox_link, download_path=".", logger_func=print):
     """
     Downloads a file from a public Dropbox link by modifying the URL for direct download.
-
-    Args:
-        dropbox_link (str): The public Dropbox link to the file.
-        download_path (str): The directory to save the downloaded file.
-        logger_func (callable): Function to use for logging.
     """
     logger_func(f"   [Dropbox] Attempting to download: {dropbox_link}")
     
-    # Modify the Dropbox URL to force a direct download instead of showing the preview page.
     parsed_url = urlparse(dropbox_link)
     query_params = parse_qs(parsed_url.query)
     query_params['dl'] = ['1']
@@ -144,13 +254,11 @@ def download_dropbox_file(dropbox_link, download_path=".", logger_func=print):
         with requests.get(direct_download_url, stream=True, allow_redirects=True, timeout=(10, 300)) as r:
             r.raise_for_status()
             
-            # Determine filename from headers or URL
             filename = _get_filename_from_headers(r.headers) or os.path.basename(parsed_url.path) or "dropbox_file"
             full_save_path = os.path.join(download_path, filename)
             
             logger_func(f"   [Dropbox] Starting download of '{filename}'...")
             
-            # Write file to disk in chunks
             with open(full_save_path, 'wb') as f:
                 for chunk in r.iter_content(chunk_size=8192):
                     f.write(chunk)

src/services/multipart_downloader.py

@@ -1,4 +1,5 @@
 # --- Standard Library Imports ---
+# --- Standard Library Imports ---
 import os
 import time
 import hashlib
@@ -10,28 +11,49 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 
 # --- Third-Party Library Imports ---
 import requests
+MULTIPART_DOWNLOADER_AVAILABLE = True
 
 # --- Module Constants ---
 CHUNK_DOWNLOAD_RETRY_DELAY = 2
 MAX_CHUNK_DOWNLOAD_RETRIES = 1
 DOWNLOAD_CHUNK_SIZE_ITER = 1024 * 256  # 256 KB per iteration chunk
 
-# Flag to indicate if this module and its dependencies are available.
-# This was missing and caused the ImportError.
-MULTIPART_DOWNLOADER_AVAILABLE = True
-
 
 def _download_individual_chunk(
-    chunk_url, temp_file_path, start_byte, end_byte, headers,
+    chunk_url, chunk_temp_file_path, start_byte, end_byte, headers,
     part_num, total_parts, progress_data, cancellation_event,
     skip_event, pause_event, global_emit_time_ref, cookies_for_chunk,
     logger_func, emitter=None, api_original_filename=None
 ):
     """
-    Downloads a single segment (chunk) of a larger file. This function is
+    Downloads a single segment (chunk) of a larger file to its own unique part file.
-    intended to be run in a separate thread by a ThreadPoolExecutor.
+    This function is intended to be run in a separate thread by a ThreadPoolExecutor.
 
-    It handles retries, pauses, and cancellations for its specific chunk.
+    It handles retries, pauses, and cancellations for its specific chunk. If a
+    download fails, the partial chunk file is removed, allowing a clean retry later.
+
+    Args:
+        chunk_url (str): The URL to download the file from.
+        chunk_temp_file_path (str): The unique path to save this specific chunk
+                                    (e.g., 'my_video.mp4.part0').
+        start_byte (int): The starting byte for the Range header.
+        end_byte (int): The ending byte for the Range header.
+        headers (dict): The HTTP headers to use for the request.
+        part_num (int): The index of this chunk (e.g., 0 for the first part).
+        total_parts (int): The total number of chunks for the entire file.
+        progress_data (dict): A thread-safe dictionary for sharing progress.
+        cancellation_event (threading.Event): Event to signal cancellation.
+        skip_event (threading.Event): Event to signal skipping the file.
+        pause_event (threading.Event): Event to signal pausing the download.
+        global_emit_time_ref (list): A mutable list with one element (a timestamp)
+                                     to rate-limit UI updates.
+        cookies_for_chunk (dict): Cookies to use for the request.
+        logger_func (function): A function to log messages.
+        emitter (queue.Queue or QObject): Emitter for sending progress to the UI.
+        api_original_filename (str): The original filename for UI display.
+
+    Returns:
+        tuple: A tuple containing (bytes_downloaded, success_flag).
     """
     # --- Pre-download checks for control events ---
     if cancellation_event and cancellation_event.is_set():
@@ -49,103 +71,135 @@ def _download_individual_chunk(
             time.sleep(0.2)
         logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Download resumed.")
 
-    # Prepare headers for the specific byte range of this chunk
+    # Set this chunk's status to 'active' before starting the download.
-    chunk_headers = headers.copy()
+    with progress_data['lock']:
-    if end_byte != -1:
+        progress_data['chunks_status'][part_num]['active'] = True
-        chunk_headers['Range'] = f"bytes={start_byte}-{end_byte}"
-    
-    bytes_this_chunk = 0
-    last_speed_calc_time = time.time()
-    bytes_at_last_speed_calc = 0
 
-    # --- Retry Loop ---
+    try:
-    for attempt in range(MAX_CHUNK_DOWNLOAD_RETRIES + 1):
+        # Prepare headers for the specific byte range of this chunk
-        if cancellation_event and cancellation_event.is_set():
+        chunk_headers = headers.copy()
-            return bytes_this_chunk, False
+        if end_byte != -1:
+            chunk_headers['Range'] = f"bytes={start_byte}-{end_byte}"
 
-        try:
+        bytes_this_chunk = 0
-            if attempt > 0:
+        last_speed_calc_time = time.time()
-                logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Retrying (Attempt {attempt + 1}/{MAX_CHUNK_DOWNLOAD_RETRIES + 1})...")
+        bytes_at_last_speed_calc = 0
-                time.sleep(CHUNK_DOWNLOAD_RETRY_DELAY * (2 ** (attempt - 1)))
-                last_speed_calc_time = time.time()
-                bytes_at_last_speed_calc = bytes_this_chunk
 
-            logger_func(f"   🚀 [Chunk {part_num + 1}/{total_parts}] Starting download: bytes {start_byte}-{end_byte if end_byte != -1 else 'EOF'}")
+        # --- Retry Loop ---
-            
+        for attempt in range(MAX_CHUNK_DOWNLOAD_RETRIES + 1):
-            response = requests.get(chunk_url, headers=chunk_headers, timeout=(10, 120), stream=True, cookies=cookies_for_chunk)
+            if cancellation_event and cancellation_event.is_set():
-            response.raise_for_status()
+                return bytes_this_chunk, False
 
-            # --- Data Writing Loop ---
+            try:
-            with open(temp_file_path, 'r+b') as f:
+                if attempt > 0:
-                f.seek(start_byte)
+                    logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Retrying (Attempt {attempt + 1}/{MAX_CHUNK_DOWNLOAD_RETRIES + 1})...")
-                for data_segment in response.iter_content(chunk_size=DOWNLOAD_CHUNK_SIZE_ITER):
+                    time.sleep(CHUNK_DOWNLOAD_RETRY_DELAY * (2 ** (attempt - 1)))
-                    if cancellation_event and cancellation_event.is_set():
+                    last_speed_calc_time = time.time()
-                        return bytes_this_chunk, False
+                    bytes_at_last_speed_calc = bytes_this_chunk
-                    if pause_event and pause_event.is_set():
-                        # Handle pausing during the download stream
-                        logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Paused...")
-                        while pause_event.is_set():
-                            if cancellation_event and cancellation_event.is_set(): return bytes_this_chunk, False
-                            time.sleep(0.2)
-                        logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Resumed.")
 
-                    if data_segment:
+                logger_func(f"   🚀 [Chunk {part_num + 1}/{total_parts}] Starting download: bytes {start_byte}-{end_byte if end_byte != -1 else 'EOF'}")
-                        f.write(data_segment)
-                        bytes_this_chunk += len(data_segment)
-                        
-                        # Update shared progress data structure
-                        with progress_data['lock']:
-                            progress_data['total_downloaded_so_far'] += len(data_segment)
-                            progress_data['chunks_status'][part_num]['downloaded'] = bytes_this_chunk
-                            
-                            # Calculate and update speed for this chunk
-                            current_time = time.time()
-                            time_delta = current_time - last_speed_calc_time
-                            if time_delta > 0.5:
-                                bytes_delta = bytes_this_chunk - bytes_at_last_speed_calc
-                                current_speed_bps = (bytes_delta * 8) / time_delta if time_delta > 0 else 0
-                                progress_data['chunks_status'][part_num]['speed_bps'] = current_speed_bps
-                                last_speed_calc_time = current_time
-                                bytes_at_last_speed_calc = bytes_this_chunk
-                            
-                            # Emit progress signal to the UI via the queue
-                            if emitter and (current_time - global_emit_time_ref[0] > 0.25):
-                                global_emit_time_ref[0] = current_time
-                                status_list_copy = [dict(s) for s in progress_data['chunks_status']]
-                                if isinstance(emitter, queue.Queue):
-                                    emitter.put({'type': 'file_progress', 'payload': (api_original_filename, status_list_copy)})
-                                elif hasattr(emitter, 'file_progress_signal'):
-                                    emitter.file_progress_signal.emit(api_original_filename, status_list_copy)
-            
-            # If we reach here, the download for this chunk was successful
-            return bytes_this_chunk, True
 
-        except (requests.exceptions.ConnectionError, requests.exceptions.Timeout, http.client.IncompleteRead) as e:
+                response = requests.get(chunk_url, headers=chunk_headers, timeout=(10, 120), stream=True, cookies=cookies_for_chunk)
-            logger_func(f"   ❌ [Chunk {part_num + 1}/{total_parts}] Retryable error: {e}")
+                response.raise_for_status()
-        except requests.exceptions.RequestException as e:
-            logger_func(f"   ❌ [Chunk {part_num + 1}/{total_parts}] Non-retryable error: {e}")
-            return bytes_this_chunk, False # Break loop on non-retryable errors
-        except Exception as e:
-            logger_func(f"   ❌ [Chunk {part_num + 1}/{total_parts}] Unexpected error: {e}\n{traceback.format_exc(limit=1)}")
-            return bytes_this_chunk, False
 
-    return bytes_this_chunk, False
+                # --- Data Writing Loop ---
+                # We open the unique chunk file in write-binary ('wb') mode.
+                # No more seeking is required.
+                with open(chunk_temp_file_path, 'wb') as f:
+                    for data_segment in response.iter_content(chunk_size=DOWNLOAD_CHUNK_SIZE_ITER):
+                        if cancellation_event and cancellation_event.is_set():
+                            return bytes_this_chunk, False
+                        if pause_event and pause_event.is_set():
+                            # Handle pausing during the download stream
+                            logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Paused...")
+                            while pause_event.is_set():
+                                if cancellation_event and cancellation_event.is_set(): return bytes_this_chunk, False
+                                time.sleep(0.2)
+                            logger_func(f"   [Chunk {part_num + 1}/{total_parts}] Resumed.")
+
+                        if data_segment:
+                            f.write(data_segment)
+                            bytes_this_chunk += len(data_segment)
+
+                            # Update shared progress data structure
+                            with progress_data['lock']:
+                                progress_data['total_downloaded_so_far'] += len(data_segment)
+                                progress_data['chunks_status'][part_num]['downloaded'] = bytes_this_chunk
+
+                                # Calculate and update speed for this chunk
+                                current_time = time.time()
+                                time_delta = current_time - last_speed_calc_time
+                                if time_delta > 0.5:
+                                    bytes_delta = bytes_this_chunk - bytes_at_last_speed_calc
+                                    current_speed_bps = (bytes_delta * 8) / time_delta if time_delta > 0 else 0
+                                    progress_data['chunks_status'][part_num]['speed_bps'] = current_speed_bps
+                                    last_speed_calc_time = current_time
+                                    bytes_at_last_speed_calc = bytes_this_chunk
+
+                                # Emit progress signal to the UI via the queue
+                                if emitter and (current_time - global_emit_time_ref[0] > 0.25):
+                                    global_emit_time_ref[0] = current_time
+                                    status_list_copy = [dict(s) for s in progress_data['chunks_status']]
+                                    if isinstance(emitter, queue.Queue):
+                                        emitter.put({'type': 'file_progress', 'payload': (api_original_filename, status_list_copy)})
+                                    elif hasattr(emitter, 'file_progress_signal'):
+                                        emitter.file_progress_signal.emit(api_original_filename, status_list_copy)
+
+                # If we get here, the download for this chunk is successful
+                return bytes_this_chunk, True
+
+            except (requests.exceptions.ConnectionError, requests.exceptions.Timeout, http.client.IncompleteRead) as e:
+                logger_func(f"   ❌ [Chunk {part_num + 1}/{total_parts}] Retryable error: {e}")
+            except requests.exceptions.RequestException as e:
+                logger_func(f"   ❌ [Chunk {part_num + 1}/{total_parts}] Non-retryable error: {e}")
+                return bytes_this_chunk, False # Break loop on non-retryable errors
+            except Exception as e:
+                logger_func(f"   ❌ [Chunk {part_num + 1}/{total_parts}] Unexpected error: {e}\n{traceback.format_exc(limit=1)}")
+                return bytes_this_chunk, False
+
+        # If the retry loop finishes without a successful download
+        return bytes_this_chunk, False
+    finally:
+        # This block runs whether the download succeeded or failed
+        with progress_data['lock']:
+            progress_data['chunks_status'][part_num]['active'] = False
+            progress_data['chunks_status'][part_num]['speed_bps'] = 0.0
 
 
 def download_file_in_parts(file_url, save_path, total_size, num_parts, headers, api_original_filename,
                            emitter_for_multipart, cookies_for_chunk_session,
                            cancellation_event, skip_event, logger_func, pause_event):
-    logger_func(f"⬇️ Initializing Multi-part Download ({num_parts} parts) for: '{api_original_filename}' (Size: {total_size / (1024*1024):.2f} MB)")
+    """
-    temp_file_path = save_path + ".part"
+    Manages a resilient, multipart file download by saving each chunk to a separate file.
 
-    try:
+    This function orchestrates the download process by:
-        with open(temp_file_path, 'wb') as f_temp:
+    1. Checking for already completed chunk files to resume a previous download.
-            if total_size > 0:
+    2. Submitting only the missing chunks to a thread pool for parallel download.
-                f_temp.truncate(total_size)
+    3. Assembling the final file from the individual chunks upon successful completion.
-    except IOError as e:
+    4. Cleaning up temporary chunk files after assembly.
-        logger_func(f"   ❌ Error creating/truncating temp file '{temp_file_path}': {e}")
+    5. Leaving completed chunks on disk if the download fails, allowing for a future resume.
-        return False, 0, None, None
 
+    Args:
+        file_url (str): The URL of the file to download.
+        save_path (str): The final desired path for the downloaded file (e.g., 'my_video.mp4').
+        total_size (int): The total size of the file in bytes.
+        num_parts (int): The number of parts to split the download into.
+        headers (dict): HTTP headers for the download requests.
+        api_original_filename (str): The original filename for UI progress display.
+        emitter_for_multipart (queue.Queue or QObject): Emitter for UI signals.
+        cookies_for_chunk_session (dict): Cookies for the download requests.
+        cancellation_event (threading.Event): Event to signal cancellation.
+        skip_event (threading.Event): Event to signal skipping the file.
+        logger_func (function): A function for logging messages.
+        pause_event (threading.Event): Event to signal pausing the download.
+
+    Returns:
+        tuple: A tuple containing (success_flag, total_bytes_downloaded, md5_hash, file_handle).
+               The file_handle will be for the final assembled file if successful, otherwise None.
+    """
+    logger_func(f"⬇️ Initializing Resumable Multi-part Download ({num_parts} parts) for: '{api_original_filename}' (Size: {total_size / (1024*1024):.2f} MB)")
+
+    # Calculate the byte range for each chunk
     chunk_size_calc = total_size // num_parts
     chunks_ranges = []
     for i in range(num_parts):
@@ -153,76 +207,119 @@ def download_file_in_parts(file_url, save_path, total_size, num_parts, headers,
         end = start + chunk_size_calc - 1 if i < num_parts - 1 else total_size - 1
         if start <= end:
             chunks_ranges.append((start, end))
-        elif total_size == 0 and i == 0:
+        elif total_size == 0 and i == 0: # Handle zero-byte files
             chunks_ranges.append((0, -1))
 
+    # Calculate the expected size of each chunk
     chunk_actual_sizes = []
     for start, end in chunks_ranges:
-        if end == -1 and start == 0:
+        chunk_actual_sizes.append(end - start + 1 if end != -1 else 0)
-            chunk_actual_sizes.append(0)
-        else:
-            chunk_actual_sizes.append(end - start + 1)
 
     if not chunks_ranges and total_size > 0:
-        logger_func(f"   ⚠️ No valid chunk ranges for multipart download of '{api_original_filename}'. Aborting multipart.")
+        logger_func(f"   ⚠️ No valid chunk ranges for multipart download of '{api_original_filename}'. Aborting.")
-        if os.path.exists(temp_file_path): os.remove(temp_file_path)
         return False, 0, None, None
 
+    # --- Resumption Logic: Check for existing complete chunks ---
+    chunks_to_download = []
+    total_bytes_resumed = 0
+    for i, (start, end) in enumerate(chunks_ranges):
+        chunk_part_path = f"{save_path}.part{i}"
+        expected_chunk_size = chunk_actual_sizes[i]
+
+        if os.path.exists(chunk_part_path) and os.path.getsize(chunk_part_path) == expected_chunk_size:
+            logger_func(f"   [Chunk {i + 1}/{num_parts}] Resuming with existing complete chunk file.")
+            total_bytes_resumed += expected_chunk_size
+        else:
+            chunks_to_download.append({'index': i, 'start': start, 'end': end})
+
+    # Setup the shared progress data structure
     progress_data = {
         'total_file_size': total_size,
-        'total_downloaded_so_far': 0,
+        'total_downloaded_so_far': total_bytes_resumed,
-        'chunks_status': [
+        'chunks_status': [],
-            {'id': i, 'downloaded': 0, 'total': chunk_actual_sizes[i] if i < len(chunk_actual_sizes) else 0, 'active': False, 'speed_bps': 0.0}
-            for i in range(num_parts)
-        ],
         'lock': threading.Lock(),
         'last_global_emit_time': [time.time()]
     }
+    for i in range(num_parts):
+        is_resumed = not any(c['index'] == i for c in chunks_to_download)
+        progress_data['chunks_status'].append({
+            'id': i,
+            'downloaded': chunk_actual_sizes[i] if is_resumed else 0,
+            'total': chunk_actual_sizes[i],
+            'active': False,
+            'speed_bps': 0.0
+        })
 
+    # --- Download Phase ---
     chunk_futures = []
     all_chunks_successful = True
-    total_bytes_from_chunks = 0
+    total_bytes_from_threads = 0
 
     with ThreadPoolExecutor(max_workers=num_parts, thread_name_prefix=f"MPChunk_{api_original_filename[:10]}_") as chunk_pool:
-        for i, (start, end) in enumerate(chunks_ranges):
+        for chunk_info in chunks_to_download:
-            if cancellation_event and cancellation_event.is_set(): all_chunks_successful = False; break
+            if cancellation_event and cancellation_event.is_set():
-            chunk_futures.append(chunk_pool.submit(
+                all_chunks_successful = False
-                _download_individual_chunk, chunk_url=file_url, temp_file_path=temp_file_path,
+                break
+            
+            i, start, end = chunk_info['index'], chunk_info['start'], chunk_info['end']
+            chunk_part_path = f"{save_path}.part{i}"
+            
+            future = chunk_pool.submit(
+                _download_individual_chunk,
+                chunk_url=file_url,
+                chunk_temp_file_path=chunk_part_path,
                 start_byte=start, end_byte=end, headers=headers, part_num=i, total_parts=num_parts,
-                progress_data=progress_data, cancellation_event=cancellation_event, skip_event=skip_event, global_emit_time_ref=progress_data['last_global_emit_time'],
+                progress_data=progress_data, cancellation_event=cancellation_event,
-                pause_event=pause_event, cookies_for_chunk=cookies_for_chunk_session, logger_func=logger_func, emitter=emitter_for_multipart,
+                skip_event=skip_event, global_emit_time_ref=progress_data['last_global_emit_time'],
+                pause_event=pause_event, cookies_for_chunk=cookies_for_chunk_session,
+                logger_func=logger_func, emitter=emitter_for_multipart,
                 api_original_filename=api_original_filename
-            ))
+            )
+            chunk_futures.append(future)
 
         for future in as_completed(chunk_futures):
-            if cancellation_event and cancellation_event.is_set(): all_chunks_successful = False; break
+            if cancellation_event and cancellation_event.is_set():
-            bytes_downloaded_this_chunk, success_this_chunk = future.result()
-            total_bytes_from_chunks += bytes_downloaded_this_chunk
-            if not success_this_chunk:
                 all_chunks_successful = False
+            bytes_downloaded, success = future.result()
+            total_bytes_from_threads += bytes_downloaded
+            if not success:
+                all_chunks_successful = False
+
+    total_bytes_final = total_bytes_resumed + total_bytes_from_threads
 
     if cancellation_event and cancellation_event.is_set():
         logger_func(f"   Multi-part download for '{api_original_filename}' cancelled by main event.")
         all_chunks_successful = False
-    if emitter_for_multipart:
-        with progress_data['lock']:
-            status_list_copy = [dict(s) for s in progress_data['chunks_status']]
-            if isinstance(emitter_for_multipart, queue.Queue):
-                emitter_for_multipart.put({'type': 'file_progress', 'payload': (api_original_filename, status_list_copy)})
-            elif hasattr(emitter_for_multipart, 'file_progress_signal'):
-                emitter_for_multipart.file_progress_signal.emit(api_original_filename, status_list_copy)
 
-    if all_chunks_successful and (total_bytes_from_chunks == total_size or total_size == 0):
+    # --- Assembly and Cleanup Phase ---
-        logger_func(f"   ✅ Multi-part download successful for '{api_original_filename}'. Total bytes: {total_bytes_from_chunks}")
+    if all_chunks_successful and (total_bytes_final == total_size or total_size == 0):
+        logger_func(f"   ✅ All {num_parts} chunks complete. Assembling final file...")
         md5_hasher = hashlib.md5()
-        with open(temp_file_path, 'rb') as f_hash:
+        try:
-            for buf in iter(lambda: f_hash.read(4096*10), b''):
+            with open(save_path, 'wb') as final_file:
-                md5_hasher.update(buf)
+                for i in range(num_parts):
-        calculated_hash = md5_hasher.hexdigest()
+                    chunk_part_path = f"{save_path}.part{i}"
-        return True, total_bytes_from_chunks, calculated_hash, open(temp_file_path, 'rb')
+                    with open(chunk_part_path, 'rb') as chunk_file:
+                        content = chunk_file.read()
+                        final_file.write(content)
+                        md5_hasher.update(content)
+            
+            calculated_hash = md5_hasher.hexdigest()
+            logger_func(f"   ✅ Assembly successful for '{api_original_filename}'. Total bytes: {total_bytes_final}")
+            return True, total_bytes_final, calculated_hash, open(save_path, 'rb')
+        except Exception as e:
+            logger_func(f"   ❌ Critical error during file assembly: {e}. Cleaning up.")
+            return False, total_bytes_final, None, None
+        finally:
+            # Cleanup all individual chunk files after successful assembly
+            for i in range(num_parts):
+                chunk_part_path = f"{save_path}.part{i}"
+                if os.path.exists(chunk_part_path):
+                    try:
+                        os.remove(chunk_part_path)
+                    except OSError as e:
+                        logger_func(f"    ⚠️ Failed to remove temp part file '{chunk_part_path}': {e}")
     else:
-        logger_func(f"   ❌ Multi-part download failed for '{api_original_filename}'. Success: {all_chunks_successful}, Bytes: {total_bytes_from_chunks}/{total_size}. Cleaning up.")
+        # If download failed, we do NOT clean up, allowing for resumption later
-        if os.path.exists(temp_file_path):
+        logger_func(f"   ❌ Multi-part download failed for '{api_original_filename}'. Success: {all_chunks_successful}, Bytes: {total_bytes_final}/{total_size}. Partial chunks saved for future resumption.")
-            try: os.remove(temp_file_path)
+        return False, total_bytes_final, None, None
-            except OSError as e: logger_func(f"    Failed to remove temp part file '{temp_file_path}': {e}")
-        return False, total_bytes_from_chunks, None, None

src/ui/assets.py

@@ -1,13 +1,7 @@
-# --- Standard Library Imports ---
 import os
 import sys
-
-# --- PyQt5 Imports ---
 from PyQt5.QtGui import QIcon
 
-# --- Asset Management ---
-
-# This global variable will cache the icon so we don't have to load it from disk every time.
 _app_icon_cache = None
 
 def get_app_icon_object():
@@ -22,17 +16,11 @@ def get_app_icon_object():
     if _app_icon_cache and not _app_icon_cache.isNull():
         return _app_icon_cache
 
-    # Declare a single variable to hold the base directory path.
     app_base_dir = ""
     
-    # Determine the project's base directory, whether running from source or as a bundled app
     if getattr(sys, 'frozen', False):
-        # The application is frozen (e.g., with PyInstaller).
-        # The base directory is the one containing the executable.
         app_base_dir = os.path.dirname(sys.executable)
     else:
-        # The application is running from a .py file.
-        # This path navigates up from src/ui/assets.py to the project root.
         app_base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
 
     icon_path = os.path.join(app_base_dir, 'assets', 'Kemono.ico')
@@ -40,7 +28,6 @@ def get_app_icon_object():
     if os.path.exists(icon_path):
         _app_icon_cache = QIcon(icon_path)
     else:
-        # If the icon isn't found, especially in a frozen app, check the _MEIPASS directory as a fallback.
         if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
             fallback_icon_path = os.path.join(sys._MEIPASS, 'assets', 'Kemono.ico')
             if os.path.exists(fallback_icon_path):

src/ui/dialogs/ConfirmAddAllDialog.py

@@ -1,18 +1,10 @@
-# --- PyQt5 Imports ---
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QListWidget, QListWidgetItem,
     QPushButton, QVBoxLayout
 )
-
-# --- Local Application Imports ---
-# This assumes the new project structure is in place.
 from ...i18n.translator import get_translation
-# get_app_icon_object is defined in the main window module in this refactoring plan.
 from ..main_window import get_app_icon_object
-
-# --- Constants for Dialog Choices ---
-# These were moved from main.py to be self-contained within this module's context.
 CONFIRM_ADD_ALL_ACCEPTED = 1
 CONFIRM_ADD_ALL_SKIP_ADDING = 2
 CONFIRM_ADD_ALL_CANCEL_DOWNLOAD = 3
@@ -38,23 +30,16 @@ class ConfirmAddAllDialog(QDialog):
         self.parent_app = parent_app
         self.setModal(True)
         self.new_filter_objects_list = new_filter_objects_list
-        # Default choice if the dialog is closed without a button press
         self.user_choice = CONFIRM_ADD_ALL_CANCEL_DOWNLOAD
-
-        # --- Basic Window Setup ---
         app_icon = get_app_icon_object()
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
-        
-        # Set window size dynamically
         screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 768
         scale_factor = screen_height / 768.0
         base_min_w, base_min_h = 480, 350
         scaled_min_w = int(base_min_w * scale_factor)
         scaled_min_h = int(base_min_h * scale_factor)
         self.setMinimumSize(scaled_min_w, scaled_min_h)
-
-        # --- Initialize UI and Apply Theming ---
         self._init_ui()
         self._retranslate_ui()
         self._apply_theme()
@@ -70,8 +55,6 @@ class ConfirmAddAllDialog(QDialog):
         self.names_list_widget = QListWidget()
         self._populate_list()
         main_layout.addWidget(self.names_list_widget)
-
-        # --- Selection Buttons ---
         selection_buttons_layout = QHBoxLayout()
         self.select_all_button = QPushButton()
         self.select_all_button.clicked.connect(self._select_all_items)
@@ -82,8 +65,6 @@ class ConfirmAddAllDialog(QDialog):
         selection_buttons_layout.addWidget(self.deselect_all_button)
         selection_buttons_layout.addStretch()
         main_layout.addLayout(selection_buttons_layout)
-
-        # --- Action Buttons ---
         buttons_layout = QHBoxLayout()
         self.add_selected_button = QPushButton()
         self.add_selected_button.clicked.connect(self._accept_add_selected)
@@ -171,7 +152,6 @@ class ConfirmAddAllDialog(QDialog):
         sensible default if no items are selected but the "Add" button is clicked.
         """
         super().exec_()
-        # If the user clicked "Add Selected" but didn't select any items, treat it as skipping.
         if isinstance(self.user_choice, list) and not self.user_choice:
             return CONFIRM_ADD_ALL_SKIP_ADDING
         return self.user_choice

src/ui/dialogs/CookieHelpDialog.py

@@ -8,7 +8,7 @@ from PyQt5.QtWidgets import (
 # --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
-
+from ...utils.resolution import get_dark_theme
 
 class CookieHelpDialog(QDialog):
     """

src/ui/dialogs/DownloadExtractedLinksDialog.py

@@ -1,27 +1,18 @@
-# --- Standard Library Imports ---
 from collections import defaultdict
-
-# --- PyQt5 Imports ---
 from PyQt5.QtCore import pyqtSignal, Qt
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QListWidget, QListWidgetItem,
     QMessageBox, QPushButton, QVBoxLayout, QAbstractItemView
 )
-
-# --- Local Application Imports ---
-# This assumes the new project structure is in place.
 from ...i18n.translator import get_translation
-# get_app_icon_object is defined in the main window module in this refactoring plan.
 from ..main_window import get_app_icon_object
-
+from ...utils.resolution import get_dark_theme
 
 class DownloadExtractedLinksDialog(QDialog):
     """
     A dialog to select and initiate the download for extracted, supported links
     from external cloud services like Mega, Google Drive, and Dropbox.
     """
-
-    # Signal emitted with a list of selected link information dictionaries
     download_requested = pyqtSignal(list)
 
     def __init__(self, links_data, parent_app, parent=None):
@@ -36,29 +27,13 @@ class DownloadExtractedLinksDialog(QDialog):
         super().__init__(parent)
         self.links_data = links_data
         self.parent_app = parent_app
-
-        # --- Basic Window Setup ---
         app_icon = get_app_icon_object()
         if not app_icon.isNull():
             self.setWindowIcon(app_icon)
-
+        scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
-        # Set window size dynamically based on the parent window's size
+        base_width, base_height = 600, 450
-        if parent:
+        self.setMinimumSize(int(base_width * scale_factor), int(base_height * scale_factor))
-            parent_width = parent.width()
+        self.resize(int(base_width * scale_factor * 1.1), int(base_height * scale_factor * 1.1))
-            parent_height = parent.height()
-            # Use a scaling factor for different screen resolutions
-            screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 768
-            scale_factor = screen_height / 768.0
-
-            base_min_w, base_min_h = 500, 400
-            scaled_min_w = int(base_min_w * scale_factor)
-            scaled_min_h = int(base_min_h * scale_factor)
-
-            self.setMinimumSize(scaled_min_w, scaled_min_h)
-            self.resize(max(int(parent_width * 0.6 * scale_factor), scaled_min_w),
-                        max(int(parent_height * 0.7 * scale_factor), scaled_min_h))
-
-        # --- Initialize UI and Apply Theming ---
         self._init_ui()
         self._retranslate_ui()
         self._apply_theme()
@@ -76,8 +51,6 @@ class DownloadExtractedLinksDialog(QDialog):
         self.links_list_widget.setSelectionMode(QAbstractItemView.NoSelection)
         self._populate_list()
         layout.addWidget(self.links_list_widget)
-
-        # --- Control Buttons ---
         button_layout = QHBoxLayout()
         self.select_all_button = QPushButton()
         self.select_all_button.clicked.connect(lambda: self._set_all_items_checked(Qt.Checked))
@@ -108,7 +81,6 @@ class DownloadExtractedLinksDialog(QDialog):
         sorted_post_titles = sorted(grouped_links.keys(), key=lambda x: x.lower())
 
         for post_title_key in sorted_post_titles:
-            # Add a non-selectable header for each post
             header_item = QListWidgetItem(f"{post_title_key}")
             header_item.setFlags(Qt.NoItemFlags)
             font = header_item.font()
@@ -116,8 +88,6 @@ class DownloadExtractedLinksDialog(QDialog):
             font.setPointSize(font.pointSize() + 1)
             header_item.setFont(font)
             self.links_list_widget.addItem(header_item)
-
-            # Add checkable items for each link within that post
             for link_info_data in grouped_links[post_title_key]:
                 platform_display = link_info_data.get('platform', 'unknown').upper()
                 display_text = f"  [{platform_display}] {link_info_data['link_text']} ({link_info_data['url']})"
@@ -141,19 +111,19 @@ class DownloadExtractedLinksDialog(QDialog):
         self.deselect_all_button.setText(self._tr("deselect_all_button_text", "Deselect All"))
         self.download_button.setText(self._tr("download_selected_button_text", "Download Selected"))
         self.cancel_button.setText(self._tr("fav_posts_cancel_button", "Cancel"))
-
+    
     def _apply_theme(self):
         """Applies the current theme from the parent application."""
-        is_dark_theme = self.parent() and hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark"
+        is_dark_theme = self.parent_app and self.parent_app.current_theme == "dark"
 
-        if is_dark_theme and hasattr(self.parent_app, 'get_dark_theme'):
+        if is_dark_theme:
-            self.setStyleSheet(self.parent_app.get_dark_theme())
+            scale = getattr(self.parent_app, 'scale_factor', 1)
-        
+            self.setStyleSheet(get_dark_theme(scale))
-        # Set header text color based on theme
+        else:
+            self.setStyleSheet("")
         header_color = Qt.cyan if is_dark_theme else Qt.blue
         for i in range(self.links_list_widget.count()):
             item = self.links_list_widget.item(i)
-            # Headers are not checkable
             if not item.flags() & Qt.ItemIsUserCheckable:
                 item.setForeground(header_color)
 
@@ -180,4 +150,4 @@ class DownloadExtractedLinksDialog(QDialog):
                 self,
                 self._tr("no_selection_title", "No Selection"),
                 self._tr("no_selection_message_links", "Please select at least one link to download.")
-            )
+            )

src/ui/dialogs/DownloadHistoryDialog.py

@@ -1,18 +1,15 @@
-# --- Standard Library Imports ---
 import os
 import time
 import json
-# --- PyQt5 Imports ---
 from PyQt5.QtCore import Qt, QStandardPaths, QTimer
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QScrollArea,
     QPushButton, QVBoxLayout, QSplitter, QWidget, QGroupBox,
     QFileDialog, QMessageBox
 )
-
-# --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
+from ...utils.resolution import get_dark_theme
 
 
 class DownloadHistoryDialog (QDialog ):
@@ -23,18 +20,15 @@ class DownloadHistoryDialog (QDialog ):
         self .last_3_downloaded_entries =last_3_downloaded_entries 
         self .first_processed_entries =first_processed_entries 
         self .setModal (True )
-
+        self._apply_theme()
-        # Patch missing creator_display_name and creator_name using parent_app.creator_name_cache if available
         creator_name_cache = getattr(parent_app, 'creator_name_cache', None)
         if creator_name_cache:
-            # Patch left pane (files)
             for entry in self.last_3_downloaded_entries:
                 if not entry.get('creator_display_name'):
                     service = entry.get('service', '').lower()
                     user_id = str(entry.get('user_id', ''))
                     key = (service, user_id)
                     entry['creator_display_name'] = creator_name_cache.get(key, entry.get('folder_context_name', 'Unknown Creator/Series'))
-            # Patch right pane (posts)
             for entry in self.first_processed_entries:
                 if not entry.get('creator_name'):
                     service = entry.get('service', '').lower()
@@ -158,6 +152,14 @@ class DownloadHistoryDialog (QDialog ):
             return get_translation (self .parent_app .current_selected_language ,key ,default_text )
         return default_text 
 
+    def _apply_theme(self):
+        """Applies the current theme from the parent application."""
+        if self.parent_app and self.parent_app.current_theme == "dark":
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            self.setStyleSheet("QDialog { background-color: #f0f0f0; }")
+
     def _save_history_to_txt (self ):
         if not self .last_3_downloaded_entries and not self .first_processed_entries :
             QMessageBox .information (self ,self ._tr ("no_download_history_header","No Downloads Yet"),

src/ui/dialogs/EmptyPopupDialog.py

@@ -13,7 +13,7 @@ from PyQt5.QtCore import pyqtSignal, QCoreApplication, QSize, QThread, QTimer, Q
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QLineEdit, QListWidget,
     QListWidgetItem, QMessageBox, QPushButton, QVBoxLayout, QAbstractItemView,
-    QSplitter, QProgressBar, QWidget
+    QSplitter, QProgressBar, QWidget, QFileDialog  
 )
 
 # --- Local Application Imports ---
@@ -21,6 +21,7 @@ from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
 from ...core.api_client import download_from_api
 from ...utils.network_utils import extract_post_info, prepare_cookies_for_request
+from ...utils.resolution import get_dark_theme
 
 
 class PostsFetcherThread (QThread ):
@@ -129,6 +130,7 @@ class PostsFetcherThread (QThread ):
             self .status_update .emit (self .parent_dialog ._tr ("post_fetch_finished_status","Finished fetching posts for selected creators."))
         self .finished_signal .emit ()
 
+
 class EmptyPopupDialog (QDialog ):
     """A simple empty popup dialog."""
     SCOPE_CHARACTERS ="Characters"
@@ -138,18 +140,19 @@ class EmptyPopupDialog (QDialog ):
 
     def __init__ (self ,app_base_dir ,parent_app_ref ,parent =None ):
         super ().__init__ (parent )
-        self .setMinimumSize (400 ,300 )
+        self.parent_app = parent_app_ref
-        screen_height =QApplication .primaryScreen ().availableGeometry ().height ()if QApplication .primaryScreen ()else 768 
-        scale_factor =screen_height /768.0 
-        self .setMinimumSize (int (400 *scale_factor ),int (300 *scale_factor ))
 
-        self .parent_app =parent_app_ref 
+        scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
-        self .current_scope_mode =self .SCOPE_CHARACTERS 
+        
+        self.setMinimumSize(int(400 * scale_factor), int(300 * scale_factor))
+        self.current_scope_mode = self.SCOPE_CREATORS
         self .app_base_dir =app_base_dir 
 
         app_icon =get_app_icon_object ()
         if app_icon and not app_icon .isNull ():
             self .setWindowIcon (app_icon )
+        self.update_profile_data = None
+        self.update_creator_name = None
         self .selected_creators_for_queue =[]
         self .globally_selected_creators ={}
         self .fetched_posts_data ={}
@@ -204,6 +207,9 @@ class EmptyPopupDialog (QDialog ):
         self .scope_button .clicked .connect (self ._toggle_scope_mode )
         left_bottom_buttons_layout .addWidget (self .scope_button )
         left_pane_layout .addLayout (left_bottom_buttons_layout )
+        self.update_button = QPushButton()
+        self.update_button.clicked.connect(self._handle_update_check) 
+        left_bottom_buttons_layout.addWidget(self.update_button)
 
 
         self .right_pane_widget =QWidget ()
@@ -289,9 +295,14 @@ class EmptyPopupDialog (QDialog ):
 
         self ._retranslate_ui ()
 
-        if self .parent_app and hasattr (self .parent_app ,'get_dark_theme')and self .parent_app .current_theme =="dark":
+        if self.parent_app and self.parent_app.current_theme == "dark":
-            self .setStyleSheet (self .parent_app .get_dark_theme ())
+            # Get the scale factor from the parent app
-
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            # Call the imported function with the correct scale
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            # Explicitly set a blank stylesheet for light mode
+            self.setStyleSheet("")
 
         self .resize (int ((self .original_size .width ()+50 )*scale_factor ),int ((self .original_size .height ()+100 )*scale_factor ))
 
@@ -309,6 +320,31 @@ class EmptyPopupDialog (QDialog ):
             except AttributeError :
                 pass 
 
+    def _handle_update_check(self):
+        """Opens a dialog to select a creator profile and loads it for an update session."""
+        appdata_dir = os.path.join(self.app_base_dir, "appdata")
+        profiles_dir = os.path.join(appdata_dir, "creator_profiles")
+        
+        if not os.path.isdir(profiles_dir):
+            QMessageBox.warning(self, "Directory Not Found", f"The creator profiles directory does not exist yet.\n\nPath: {profiles_dir}")
+            return
+
+        filepath, _ = QFileDialog.getOpenFileName(self, "Select Creator Profile for Update", profiles_dir, "JSON Files (*.json)")
+
+        if filepath:
+            try:
+                with open(filepath, 'r', encoding='utf-8') as f:
+                    data = json.load(f)
+                
+                if 'creator_url' not in data or 'processed_post_ids' not in data:
+                    raise ValueError("Invalid profile format.")
+
+                self.update_profile_data = data
+                self.update_creator_name = os.path.basename(filepath).replace('.json', '')
+                self.accept() # Close the dialog and signal success
+            except Exception as e:
+                QMessageBox.critical(self, "Error Loading Profile", f"Could not load or parse the selected profile file:\n\n{e}")
+
     def _handle_fetch_posts_click (self ):
         selected_creators =list (self .globally_selected_creators .values ())
         print(f"[DEBUG] Selected creators for fetch: {selected_creators}")
@@ -364,6 +400,7 @@ class EmptyPopupDialog (QDialog ):
         self .add_selected_button .setText (self ._tr ("creator_popup_add_selected_button","Add Selected"))
         self .fetch_posts_button .setText (self ._tr ("fetch_posts_button_text","Fetch Posts"))
         self ._update_scope_button_text_and_tooltip ()
+        self.update_button.setText(self._tr("check_for_updates_button", "Check for Updates"))
 
         self .posts_search_input .setPlaceholderText (self ._tr ("creator_popup_posts_search_placeholder","Search fetched posts by title..."))
 
@@ -923,15 +960,19 @@ class EmptyPopupDialog (QDialog ):
 
                 self .parent_app .log_signal .emit (f"ℹ️ Added {num_just_added_posts } selected posts to the download queue. Total in queue: {total_in_queue }.")
 
+                # --- START: MODIFIED LOGIC ---
+                # Removed the blockSignals(True/False) calls to allow the main window's UI to update correctly.
                 if self .parent_app .link_input :
-                    self .parent_app .link_input .blockSignals (True )
                     self .parent_app .link_input .setText (
                     self .parent_app ._tr ("popup_posts_selected_text","Posts - {count} selected").format (count =num_just_added_posts )
                     )
-                    self .parent_app .link_input .blockSignals (False )
                     self .parent_app .link_input .setPlaceholderText (
                     self .parent_app ._tr ("items_in_queue_placeholder","{count} items in queue from popup.").format (count =total_in_queue )
                     )
+                # --- END: MODIFIED LOGIC ---
+            
+            self.selected_creators_for_queue.clear()
+            
             self .accept ()
         else :
             QMessageBox .information (self ,self ._tr ("no_selection_title","No Selection"),
@@ -949,9 +990,6 @@ class EmptyPopupDialog (QDialog ):
         self .add_selected_button .setEnabled (True )
         self .setWindowTitle (self ._tr ("creator_popup_title","Creator Selection"))
 
-
-
-
     def _get_domain_for_service (self ,service_name ):
         """Determines the base domain for a given service."""
         service_lower =service_name .lower ()

src/ui/dialogs/ErrorFilesDialog.py

@@ -10,7 +10,7 @@ from ...i18n.translator import get_translation
 from ..assets import get_app_icon_object
 # Corrected Import: The filename uses PascalCase.
 from .ExportOptionsDialog import ExportOptionsDialog
-
+from ...utils.resolution import get_dark_theme
 
 class ErrorFilesDialog(QDialog):
     """
@@ -42,13 +42,15 @@ class ErrorFilesDialog(QDialog):
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
 
-        # Set window size dynamically
+        # --- START OF FIX ---
-        screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 768
+        # Get the user-defined scale factor from the parent application.
-        scale_factor = screen_height / 1080.0
+        scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
-        base_min_w, base_min_h = 500, 300
+
-        scaled_min_w = int(base_min_w * scale_factor)
+        # Define base dimensions and apply the correct scale factor.
-        scaled_min_h = int(base_min_h * scale_factor)
+        base_width, base_height = 550, 400
-        self.setMinimumSize(scaled_min_w, scaled_min_h)
+        self.setMinimumSize(int(base_width * scale_factor), int(base_height * scale_factor))
+        self.resize(int(base_width * scale_factor * 1.1), int(base_height * scale_factor * 1.1))
+        # --- END OF FIX ---
 
         # --- Initialize UI and Apply Theming ---
         self._init_ui()
@@ -132,9 +134,14 @@ class ErrorFilesDialog(QDialog):
 
     def _apply_theme(self):
         """Applies the current theme from the parent application."""
-        if self.parent_app and hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark":
+        if self.parent_app and self.parent_app.current_theme == "dark":
-            if hasattr(self.parent_app, 'get_dark_theme'):
+            # Get the scale factor from the parent app
-                self.setStyleSheet(self.parent_app.get_dark_theme())
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            # Call the imported function with the correct scale
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            # Explicitly set a blank stylesheet for light mode
+            self.setStyleSheet("")
 
     def _select_all_items(self):
         """Checks all items in the list."""
@@ -227,4 +234,4 @@ class ErrorFilesDialog(QDialog):
                     self,
                     self._tr("error_files_export_error_title", "Export Error"),
                     self._tr("error_files_export_error_message", "Could not export...").format(error=str(e))
-                )
+                )

src/ui/dialogs/ExportOptionsDialog.py

@@ -10,7 +10,7 @@ from PyQt5.QtWidgets import (
 from ...i18n.translator import get_translation
 # get_app_icon_object is defined in the main window module in this refactoring plan.
 from ..main_window import get_app_icon_object
-
+from ...utils.resolution import get_dark_theme
 
 class ExportOptionsDialog(QDialog):
     """

src/ui/dialogs/FavoriteArtistsDialog.py

@@ -16,7 +16,7 @@ from ...i18n.translator import get_translation
 from ..assets import get_app_icon_object 
 from ...utils.network_utils import prepare_cookies_for_request
 from .CookieHelpDialog import CookieHelpDialog
-
+from ...utils.resolution import get_dark_theme
 
 class FavoriteArtistsDialog (QDialog ):
     """Dialog to display and select favorite artists."""
@@ -37,13 +37,13 @@ class FavoriteArtistsDialog (QDialog ):
         self ._init_ui ()
         self ._fetch_favorite_artists ()
 
-    def _get_domain_for_service (self ,service_name ):
+    def _get_domain_for_service(self, service_name):
-        service_lower =service_name .lower ()
+        service_lower = service_name.lower()
-        coomer_primary_services ={'onlyfans','fansly','manyvids','candfans'}
+        coomer_primary_services = {'onlyfans', 'fansly', 'manyvids', 'candfans'}
-        if service_lower in coomer_primary_services :
+        if service_lower in coomer_primary_services:
-            return "coomer.su"
+            return "coomer.st"  # Use the new domain
-        else :
+        else:
-            return "kemono.su"
+            return "kemono.cr"   # Use the new domain
 
     def _tr (self ,key ,default_text =""):
         """Helper to get translation based on current app language."""
@@ -126,6 +126,41 @@ class FavoriteArtistsDialog (QDialog ):
         self .artist_list_widget .setVisible (show )
 
     def _fetch_favorite_artists (self ):
+
+        if self.cookies_config['use_cookie']:
+            # --- Kemono Check with Fallback ---
+            kemono_cookies = prepare_cookies_for_request(
+                True, self.cookies_config['cookie_text'], self.cookies_config['selected_cookie_file'],
+                self.cookies_config['app_base_dir'], self._logger, target_domain="kemono.cr"
+            )
+            if not kemono_cookies:
+                self._logger("No cookies for kemono.cr, trying fallback kemono.su...")
+                kemono_cookies = prepare_cookies_for_request(
+                    True, self.cookies_config['cookie_text'], self.cookies_config['selected_cookie_file'],
+                    self.cookies_config['app_base_dir'], self._logger, target_domain="kemono.su"
+                )
+
+            # --- Coomer Check with Fallback ---
+            coomer_cookies = prepare_cookies_for_request(
+                True, self.cookies_config['cookie_text'], self.cookies_config['selected_cookie_file'],
+                self.cookies_config['app_base_dir'], self._logger, target_domain="coomer.st"
+            )
+            if not coomer_cookies:
+                self._logger("No cookies for coomer.st, trying fallback coomer.su...")
+                coomer_cookies = prepare_cookies_for_request(
+                    True, self.cookies_config['cookie_text'], self.cookies_config['selected_cookie_file'],
+                    self.cookies_config['app_base_dir'], self._logger, target_domain="coomer.su"
+                )
+
+            if not kemono_cookies and not coomer_cookies:
+                # If cookies are enabled but none could be loaded, show help and stop.
+                self.status_label.setText(self._tr("fav_artists_cookies_required_status", "Error: Cookies enabled but could not be loaded for any source."))
+                self._logger("Error: Cookies enabled but no valid cookies were loaded. Showing help dialog.")
+                cookie_help_dialog = CookieHelpDialog(self.parent_app, self)
+                cookie_help_dialog.exec_()
+                self.download_button.setEnabled(False)
+                return  # Stop further execution
+
         kemono_fav_url ="https://kemono.su/api/v1/account/favorites?type=artist"
         coomer_fav_url ="https://coomer.su/api/v1/account/favorites?type=artist"
 
@@ -134,9 +169,12 @@ class FavoriteArtistsDialog (QDialog ):
         errors_occurred =[]
         any_cookies_loaded_successfully_for_any_source =False 
 
-        api_sources =[
+        kemono_cr_fav_url = "https://kemono.cr/api/v1/account/favorites?type=artist"
-        {"name":"Kemono.su","url":kemono_fav_url ,"domain":"kemono.su"},
+        coomer_st_fav_url = "https://coomer.st/api/v1/account/favorites?type=artist"
-        {"name":"Coomer.su","url":coomer_fav_url ,"domain":"coomer.su"}
+
+        api_sources = [
+            {"name": "Kemono.cr", "url": kemono_cr_fav_url, "domain": "kemono.cr"},
+            {"name": "Coomer.st", "url": coomer_st_fav_url, "domain": "coomer.st"}
         ]
 
         for source in api_sources :
@@ -144,20 +182,41 @@ class FavoriteArtistsDialog (QDialog ):
             self .status_label .setText (self ._tr ("fav_artists_loading_from_source_status","⏳ Loading favorites from {source_name}...").format (source_name =source ['name']))
             QCoreApplication .processEvents ()
 
-            cookies_dict_for_source =None 
+            cookies_dict_for_source = None
-            if self .cookies_config ['use_cookie']:
+            if self.cookies_config['use_cookie']:
-                cookies_dict_for_source =prepare_cookies_for_request (
+                primary_domain = source['domain']
-                True ,
+                fallback_domain = None
-                self .cookies_config ['cookie_text'],
+                if primary_domain == "kemono.cr":
-                self .cookies_config ['selected_cookie_file'],
+                    fallback_domain = "kemono.su"
-                self .cookies_config ['app_base_dir'],
+                elif primary_domain == "coomer.st":
-                self ._logger ,
+                    fallback_domain = "coomer.su"
-                target_domain =source ['domain']
+
+                # First, try the primary domain
+                cookies_dict_for_source = prepare_cookies_for_request(
+                    True,
+                    self.cookies_config['cookie_text'],
+                    self.cookies_config['selected_cookie_file'],
+                    self.cookies_config['app_base_dir'],
+                    self._logger,
+                    target_domain=primary_domain
                 )
-                if cookies_dict_for_source :
+
-                    any_cookies_loaded_successfully_for_any_source =True 
+                # If no cookies found, try the fallback domain
-                else :
+                if not cookies_dict_for_source and fallback_domain:
-                    self ._logger (f"Warning ({source ['name']}): Cookies enabled but could not be loaded for this domain. Fetch might fail if cookies are required.")
+                    self._logger(f"Warning ({source['name']}): No cookies found for '{primary_domain}'. Trying fallback '{fallback_domain}'...")
+                    cookies_dict_for_source = prepare_cookies_for_request(
+                        True,
+                        self.cookies_config['cookie_text'],
+                        self.cookies_config['selected_cookie_file'],
+                        self.cookies_config['app_base_dir'],
+                        self._logger,
+                        target_domain=fallback_domain
+                    )
+                
+                if cookies_dict_for_source:
+                    any_cookies_loaded_successfully_for_any_source = True
+                else:
+                    self._logger(f"Warning ({source['name']}): Cookies enabled but could not be loaded for this source (including fallbacks). Fetch might fail.")
             try :
                 headers ={'User-Agent':'Mozilla/5.0'}
                 response =requests .get (source ['url'],headers =headers ,cookies =cookies_dict_for_source ,timeout =20 )
@@ -208,7 +267,7 @@ class FavoriteArtistsDialog (QDialog ):
         if self .cookies_config ['use_cookie']and not any_cookies_loaded_successfully_for_any_source :
             self .status_label .setText (self ._tr ("fav_artists_cookies_required_status","Error: Cookies enabled but could not be loaded for any source."))
             self ._logger ("Error: Cookies enabled but no cookies loaded for any source. Showing help dialog.")
-            cookie_help_dialog =CookieHelpDialog (self )
+            cookie_help_dialog = CookieHelpDialog(self.parent_app, self)
             cookie_help_dialog .exec_ ()
             self .download_button .setEnabled (False )
             if not fetched_any_successfully :

src/ui/dialogs/FavoritePostsDialog.py

@@ -1,4 +1,3 @@
-# --- Standard Library Imports ---
 import html
 import os
 import sys
@@ -8,8 +7,6 @@ import traceback
 import json
 import re
 from collections import defaultdict
-
-# --- Third-Party Library Imports ---
 import requests
 from PyQt5.QtCore import QCoreApplication, Qt, pyqtSignal, QThread
 from PyQt5.QtWidgets import (
@@ -17,15 +14,12 @@ from PyQt5.QtWidgets import (
     QListWidgetItem, QMessageBox, QPushButton, QVBoxLayout, QProgressBar,
     QWidget, QCheckBox
 )
-
-# --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..assets import get_app_icon_object
 from ...utils.network_utils import prepare_cookies_for_request
-# Corrected Import: Import CookieHelpDialog directly from its own module
 from .CookieHelpDialog import CookieHelpDialog
 from ...core.api_client import download_from_api
-
+from ...utils.resolution import get_dark_theme
 
 class FavoritePostsFetcherThread (QThread ):
     """Worker thread to fetch favorite posts and creator names."""
@@ -40,28 +34,30 @@ class FavoritePostsFetcherThread (QThread ):
         self .target_domain_preference =target_domain_preference 
         self .cancellation_event =threading .Event ()
         self .error_key_map ={
-        "Kemono.su":"kemono_su",
+        "kemono.cr":"kemono_su",
-        "Coomer.su":"coomer_su"
+        "coomer.st":"coomer_su"
         }
 
     def _logger (self ,message ):
         self .parent_logger_func (f"[FavPostsFetcherThread] {message }")
 
-    def run (self ):
+    def run(self):
-        kemono_fav_posts_url ="https://kemono.su/api/v1/account/favorites?type=post"
+        kemono_su_fav_posts_url = "https://kemono.su/api/v1/account/favorites?type=post"
-        coomer_fav_posts_url ="https://coomer.su/api/v1/account/favorites?type=post"
+        coomer_su_fav_posts_url = "https://coomer.su/api/v1/account/favorites?type=post"
+        kemono_cr_fav_posts_url = "https://kemono.cr/api/v1/account/favorites?type=post"
+        coomer_st_fav_posts_url = "https://coomer.st/api/v1/account/favorites?type=post"
 
-        all_fetched_posts_temp =[]
+        all_fetched_posts_temp = []
-        error_messages_for_summary =[]
+        error_messages_for_summary = []
-        fetched_any_successfully =False 
+        fetched_any_successfully = False
-        any_cookies_loaded_successfully_for_any_source =False 
+        any_cookies_loaded_successfully_for_any_source = False
 
-        self .status_update .emit ("key_fetching_fav_post_list_init")
+        self.status_update.emit("key_fetching_fav_post_list_init")
-        self .progress_bar_update .emit (0 ,0 )
+        self.progress_bar_update.emit(0, 0)
 
-        api_sources =[
+        api_sources = [
-        {"name":"Kemono.su","url":kemono_fav_posts_url ,"domain":"kemono.su"},
+            {"name": "Kemono.cr", "url": kemono_cr_fav_posts_url, "domain": "kemono.cr"},
-        {"name":"Coomer.su","url":coomer_fav_posts_url ,"domain":"coomer.su"}
+            {"name": "Coomer.st", "url": coomer_st_fav_posts_url, "domain": "coomer.st"}
         ]
 
         api_sources_to_try =[]
@@ -82,20 +78,41 @@ class FavoritePostsFetcherThread (QThread ):
             if self .cancellation_event .is_set ():
                 self .finished .emit ([],"KEY_FETCH_CANCELLED_DURING")
                 return 
-            cookies_dict_for_source =None 
+            cookies_dict_for_source = None
-            if self .cookies_config ['use_cookie']:
+            if self.cookies_config['use_cookie']:
-                cookies_dict_for_source =prepare_cookies_for_request (
+                primary_domain = source['domain']
-                True ,
+                fallback_domain = None
-                self .cookies_config ['cookie_text'],
+                if primary_domain == "kemono.cr":
-                self .cookies_config ['selected_cookie_file'],
+                    fallback_domain = "kemono.su"
-                self .cookies_config ['app_base_dir'],
+                elif primary_domain == "coomer.st":
-                self ._logger ,
+                    fallback_domain = "coomer.su"
-                target_domain =source ['domain']
+
+                # First, try the primary domain
+                cookies_dict_for_source = prepare_cookies_for_request(
+                    True,
+                    self.cookies_config['cookie_text'],
+                    self.cookies_config['selected_cookie_file'],
+                    self.cookies_config['app_base_dir'],
+                    self._logger,
+                    target_domain=primary_domain
                 )
-                if cookies_dict_for_source :
+
-                    any_cookies_loaded_successfully_for_any_source =True 
+                # If no cookies found, try the fallback domain
-                else :
+                if not cookies_dict_for_source and fallback_domain:
-                    self ._logger (f"Warning ({source ['name']}): Cookies enabled but could not be loaded for this domain. Fetch might fail if cookies are required.")
+                    self._logger(f"Warning ({source['name']}): No cookies found for '{primary_domain}'. Trying fallback '{fallback_domain}'...")
+                    cookies_dict_for_source = prepare_cookies_for_request(
+                        True,
+                        self.cookies_config['cookie_text'],
+                        self.cookies_config['selected_cookie_file'],
+                        self.cookies_config['app_base_dir'],
+                        self._logger,
+                        target_domain=fallback_domain
+                    )
+
+                if cookies_dict_for_source:
+                    any_cookies_loaded_successfully_for_any_source = True
+                else:
+                    self._logger(f"Warning ({source['name']}): Cookies enabled but could not be loaded for this domain. Fetch might fail if cookies are required.")
 
             self ._logger (f"Attempting to fetch favorite posts from: {source ['name']} ({source ['url']})")
             source_key_part =self .error_key_map .get (source ['name'],source ['name'].lower ().replace ('.','_'))
@@ -415,14 +432,14 @@ class FavoritePostsDialog (QDialog ):
             if status_key .startswith ("KEY_COOKIES_REQUIRED_BUT_NOT_FOUND_FOR_DOMAIN_")or status_key =="KEY_COOKIES_REQUIRED_BUT_NOT_FOUND_GENERIC":
                 status_label_text_key ="fav_posts_cookies_required_error"
                 self ._logger (f"Cookie error: {status_key }. Showing help dialog.")
-                cookie_help_dialog =CookieHelpDialog (self )
+                cookie_help_dialog = CookieHelpDialog(self.parent_app, self)
                 cookie_help_dialog .exec_ ()
             elif status_key =="KEY_AUTH_FAILED":
                 status_label_text_key ="fav_posts_auth_failed_title"
                 self ._logger (f"Auth error: {status_key }. Showing help dialog.")
                 QMessageBox .warning (self ,self ._tr ("fav_posts_auth_failed_title","Authorization Failed (Posts)"),
                 self ._tr ("fav_posts_auth_failed_message_generic","...").format (domain_specific_part =specific_domain_msg_part ))
-                cookie_help_dialog =CookieHelpDialog (self )
+                cookie_help_dialog = CookieHelpDialog(self.parent_app, self)
                 cookie_help_dialog .exec_ ()
             elif status_key =="KEY_NO_FAVORITES_FOUND_ALL_PLATFORMS":
                 status_label_text_key ="fav_posts_no_posts_found_status"

src/ui/dialogs/FutureSettingsDialog.py

@@ -1,171 +1,272 @@
 # --- Standard Library Imports ---
 import os
+import json
 
 # --- PyQt5 Imports ---
 from PyQt5.QtCore import Qt, QStandardPaths
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
-    QGroupBox, QComboBox, QMessageBox
+    QGroupBox, QComboBox, QMessageBox, QGridLayout, QCheckBox
 )
 
 # --- Local Application Imports ---
-# This assumes the new project structure is in place.
 from ...i18n.translator import get_translation
+from ...utils.resolution import get_dark_theme
 from ..main_window import get_app_icon_object
 from ...config.constants import (
-    THEME_KEY, LANGUAGE_KEY, DOWNLOAD_LOCATION_KEY
+    THEME_KEY, LANGUAGE_KEY, DOWNLOAD_LOCATION_KEY,
+    RESOLUTION_KEY, UI_SCALE_KEY, SAVE_CREATOR_JSON_KEY,
+    COOKIE_TEXT_KEY, USE_COOKIE_KEY
 )
 
 
 class FutureSettingsDialog(QDialog):
     """
     A dialog for managing application-wide settings like theme, language,
-    and saving the default download path.
+    and display options, with an organized layout.
     """
     def __init__(self, parent_app_ref, parent=None):
-        """
-        Initializes the dialog.
-
-        Args:
-            parent_app_ref (DownloaderApp): A reference to the main application window.
-            parent (QWidget, optional): The parent widget. Defaults to None.
-        """
         super().__init__(parent)
         self.parent_app = parent_app_ref
         self.setModal(True)
 
-        # --- Basic Window Setup ---
         app_icon = get_app_icon_object()
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
-        
+
-        # Set window size dynamically
+        screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 800
-        screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 768
+        scale_factor = screen_height / 800.0
-        scale_factor = screen_height / 768.0
+        base_min_w, base_min_h = 420, 360 # Adjusted height for new layout
-        base_min_w, base_min_h = 380, 250
         scaled_min_w = int(base_min_w * scale_factor)
         scaled_min_h = int(base_min_h * scale_factor)
         self.setMinimumSize(scaled_min_w, scaled_min_h)
 
-        # --- Initialize UI and Apply Theming ---
         self._init_ui()
         self._retranslate_ui()
         self._apply_theme()
 
     def _init_ui(self):
         """Initializes all UI components and layouts for the dialog."""
-        layout = QVBoxLayout(self)
+        main_layout = QVBoxLayout(self)
 
-        # --- Appearance Settings ---
+        # --- Group 1: Interface Settings ---
-        self.appearance_group_box = QGroupBox()
+        self.interface_group_box = QGroupBox()
-        appearance_layout = QVBoxLayout(self.appearance_group_box)
+        interface_layout = QGridLayout(self.interface_group_box)
+
+        # Theme
+        self.theme_label = QLabel()
         self.theme_toggle_button = QPushButton()
         self.theme_toggle_button.clicked.connect(self._toggle_theme)
-        appearance_layout.addWidget(self.theme_toggle_button)
+        interface_layout.addWidget(self.theme_label, 0, 0)
-        layout.addWidget(self.appearance_group_box)
+        interface_layout.addWidget(self.theme_toggle_button, 0, 1)
 
-        # --- Language Settings ---
+        # UI Scale
-        self.language_group_box = QGroupBox()
+        self.ui_scale_label = QLabel()
-        language_group_layout = QVBoxLayout(self.language_group_box)
+        self.ui_scale_combo_box = QComboBox()
-        self.language_selection_layout = QHBoxLayout()
+        self.ui_scale_combo_box.currentIndexChanged.connect(self._display_setting_changed)
+        interface_layout.addWidget(self.ui_scale_label, 1, 0)
+        interface_layout.addWidget(self.ui_scale_combo_box, 1, 1)
+        
+        # Language
         self.language_label = QLabel()
-        self.language_selection_layout.addWidget(self.language_label)
         self.language_combo_box = QComboBox()
         self.language_combo_box.currentIndexChanged.connect(self._language_selection_changed)
-        self.language_selection_layout.addWidget(self.language_combo_box, 1)
+        interface_layout.addWidget(self.language_label, 2, 0)
-        language_group_layout.addLayout(self.language_selection_layout)
+        interface_layout.addWidget(self.language_combo_box, 2, 1)
-        layout.addWidget(self.language_group_box)
-        
-        # --- Download Settings ---
-        self.download_settings_group_box = QGroupBox()
-        download_settings_layout = QVBoxLayout(self.download_settings_group_box)
-        self.save_path_button = QPushButton()
-        self.save_path_button.clicked.connect(self._save_download_path)
-        download_settings_layout.addWidget(self.save_path_button)
-        layout.addWidget(self.download_settings_group_box)
 
-        layout.addStretch(1)
+        main_layout.addWidget(self.interface_group_box)
+
+        # --- Group 2: Download & Window Settings ---
+        self.download_window_group_box = QGroupBox()
+        download_window_layout = QGridLayout(self.download_window_group_box)
+
+        # Window Size (Resolution)
+        self.window_size_label = QLabel()
+        self.resolution_combo_box = QComboBox()
+        self.resolution_combo_box.currentIndexChanged.connect(self._display_setting_changed)
+        download_window_layout.addWidget(self.window_size_label, 0, 0)
+        download_window_layout.addWidget(self.resolution_combo_box, 0, 1)
+
+        # Default Path
+        self.default_path_label = QLabel()
+        self.save_path_button = QPushButton()
+        # --- START: MODIFIED LOGIC ---
+        self.save_path_button.clicked.connect(self._save_cookie_and_path)
+        # --- END: MODIFIED LOGIC ---
+        download_window_layout.addWidget(self.default_path_label, 1, 0)
+        download_window_layout.addWidget(self.save_path_button, 1, 1)
+
+        # Save Creator.json Checkbox
+        self.save_creator_json_checkbox = QCheckBox()
+        self.save_creator_json_checkbox.stateChanged.connect(self._creator_json_setting_changed) 
+        download_window_layout.addWidget(self.save_creator_json_checkbox, 2, 0, 1, 2)
+
+        main_layout.addWidget(self.download_window_group_box)
+
+        main_layout.addStretch(1)
 
         # --- OK Button ---
         self.ok_button = QPushButton()
         self.ok_button.clicked.connect(self.accept)
-        layout.addWidget(self.ok_button, 0, Qt.AlignRight | Qt.AlignBottom)
+        main_layout.addWidget(self.ok_button, 0, Qt.AlignRight | Qt.AlignBottom)
+
+    def _load_checkbox_states(self):
+        """Loads the initial state for all checkboxes from settings."""
+        self.save_creator_json_checkbox.blockSignals(True)
+        # Default to True so the feature is on by default for users
+        should_save = self.parent_app.settings.value(SAVE_CREATOR_JSON_KEY, True, type=bool)
+        self.save_creator_json_checkbox.setChecked(should_save)
+        self.save_creator_json_checkbox.blockSignals(False)
+
+    def _creator_json_setting_changed(self, state):
+        """Saves the state of the 'Save Creator.json' checkbox."""
+        is_checked = state == Qt.Checked
+        self.parent_app.settings.setValue(SAVE_CREATOR_JSON_KEY, is_checked)
+        self.parent_app.settings.sync()
 
     def _tr(self, key, default_text=""):
-        """Helper to get translation based on the main application's current language."""
         if callable(get_translation) and self.parent_app:
             return get_translation(self.parent_app.current_selected_language, key, default_text)
         return default_text
 
     def _retranslate_ui(self):
-        """Sets the text for all translatable UI elements."""
         self.setWindowTitle(self._tr("settings_dialog_title", "Settings"))
-        self.appearance_group_box.setTitle(self._tr("appearance_group_title", "Appearance"))
-        self.language_group_box.setTitle(self._tr("language_group_title", "Language Settings"))
-        self.download_settings_group_box.setTitle(self._tr("settings_download_group_title", "Download Settings"))
-        self.language_label.setText(self._tr("language_label", "Language:"))
-        self._update_theme_toggle_button_text()
-        self._populate_language_combo_box()
         
-        self.save_path_button.setText(self._tr("settings_save_path_button", "Save Current Download Path"))
+        # Group Box Titles
-        self.save_path_button.setToolTip(self._tr("settings_save_path_tooltip", "Save the current 'Download Location' for future sessions."))
+        self.interface_group_box.setTitle(self._tr("interface_group_title", "Interface Settings"))
+        self.download_window_group_box.setTitle(self._tr("download_window_group_title", "Download & Window Settings"))
+
+        # Interface Group Labels
+        self.theme_label.setText(self._tr("theme_label", "Theme:"))
+        self.ui_scale_label.setText(self._tr("ui_scale_label", "UI Scale:"))
+        self.language_label.setText(self._tr("language_label", "Language:"))
+        
+        # Download & Window Group Labels
+        self.window_size_label.setText(self._tr("window_size_label", "Window Size:"))
+        self.default_path_label.setText(self._tr("default_path_label", "Default Path:"))
+        self.save_creator_json_checkbox.setText(self._tr("save_creator_json_label", "Save Creator.json file"))
+        
+        # --- START: MODIFIED LOGIC ---
+        # Buttons and Controls
+        self._update_theme_toggle_button_text()
+        self.save_path_button.setText(self._tr("settings_save_cookie_path_button", "Save Cookie + Download Path"))
+        self.save_path_button.setToolTip(self._tr("settings_save_cookie_path_tooltip", "Save the current 'Download Location' and Cookie settings for future sessions."))
         self.ok_button.setText(self._tr("ok_button", "OK"))
+        # --- END: MODIFIED LOGIC ---
+
+        # Populate dropdowns
+        self._populate_display_combo_boxes()
+        self._populate_language_combo_box()
+        self._load_checkbox_states()
 
     def _apply_theme(self):
-        """Applies the current theme from the parent application."""
+        if self.parent_app and self.parent_app.current_theme == "dark":
-        if self.parent_app.current_theme == "dark":
+            scale = getattr(self.parent_app, 'scale_factor', 1)
-            self.setStyleSheet(self.parent_app.get_dark_theme())
+            self.setStyleSheet(get_dark_theme(scale))
         else:
             self.setStyleSheet("")
 
     def _update_theme_toggle_button_text(self):
-        """Updates the theme button text and tooltip based on the current theme."""
         if self.parent_app.current_theme == "dark":
             self.theme_toggle_button.setText(self._tr("theme_toggle_light", "Switch to Light Mode"))
-            self.theme_toggle_button.setToolTip(self._tr("theme_tooltip_light", "Change the application appearance to light."))
         else:
             self.theme_toggle_button.setText(self._tr("theme_toggle_dark", "Switch to Dark Mode"))
-            self.theme_toggle_button.setToolTip(self._tr("theme_tooltip_dark", "Change the application appearance to dark."))
 
     def _toggle_theme(self):
-        """Toggles the application theme and updates the UI."""
         new_theme = "light" if self.parent_app.current_theme == "dark" else "dark"
-        self.parent_app.apply_theme(new_theme)
+        self.parent_app.settings.setValue(THEME_KEY, new_theme)
-        self._retranslate_ui()
+        self.parent_app.settings.sync()
+        self.parent_app.current_theme = new_theme
         self._apply_theme()
+        if hasattr(self.parent_app, '_apply_theme_and_restart_prompt'):
+            self.parent_app._apply_theme_and_restart_prompt()
+
+    def _populate_display_combo_boxes(self):
+        self.resolution_combo_box.blockSignals(True)
+        self.resolution_combo_box.clear()
+        resolutions = [
+            ("Auto", self._tr("auto_resolution", "Auto (System Default)")),
+            ("1280x720", "1280 x 720"),
+            ("1600x900", "1600 x 900"),
+            ("1920x1080", "1920 x 1080 (Full HD)"),
+            ("2560x1440", "2560 x 1440 (2K)"),
+            ("3840x2160", "3840 x 2160 (4K)")
+        ]
+        current_res = self.parent_app.settings.value(RESOLUTION_KEY, "Auto")
+        for res_key, res_name in resolutions:
+            self.resolution_combo_box.addItem(res_name, res_key)
+            if current_res == res_key:
+                self.resolution_combo_box.setCurrentIndex(self.resolution_combo_box.count() - 1)
+        self.resolution_combo_box.blockSignals(False)
+
+        self.ui_scale_combo_box.blockSignals(True)
+        self.ui_scale_combo_box.clear()
+        scales = [
+            (0.5, "50%"),
+            (0.7, "70%"),
+            (0.9, "90%"),
+            (1.0, "100% (Default)"),
+            (1.25, "125%"),
+            (1.50, "150%"),
+            (1.75, "175%"),
+            (2.0, "200%")
+        ]
+
+        current_scale = float(self.parent_app.settings.value(UI_SCALE_KEY, 1.0))
+        for scale_val, scale_name in scales:
+            self.ui_scale_combo_box.addItem(scale_name, scale_val)
+            if abs(current_scale - scale_val) < 0.01:
+                self.ui_scale_combo_box.setCurrentIndex(self.ui_scale_combo_box.count() - 1)
+        self.ui_scale_combo_box.blockSignals(False)
+
+    def _display_setting_changed(self):
+        selected_res = self.resolution_combo_box.currentData()
+        selected_scale = self.ui_scale_combo_box.currentData()
+
+        self.parent_app.settings.setValue(RESOLUTION_KEY, selected_res)
+        self.parent_app.settings.setValue(UI_SCALE_KEY, selected_scale)
+        self.parent_app.settings.sync()
+
+        msg_box = QMessageBox(self)
+        msg_box.setIcon(QMessageBox.Information)
+        msg_box.setWindowTitle(self._tr("display_change_title", "Display Settings Changed"))
+        msg_box.setText(self._tr("language_change_message", "A restart is required for these changes to take effect."))
+        msg_box.setInformativeText(self._tr("language_change_informative", "Would you like to restart now?"))
+        restart_button = msg_box.addButton(self._tr("restart_now_button", "Restart Now"), QMessageBox.ApplyRole)
+        ok_button = msg_box.addButton(self._tr("ok_button", "OK"), QMessageBox.AcceptRole)
+        msg_box.setDefaultButton(ok_button)
+        msg_box.exec_()
+
+        if msg_box.clickedButton() == restart_button:
+            self.parent_app._request_restart_application()
 
     def _populate_language_combo_box(self):
-        """Populates the language dropdown with available languages."""
         self.language_combo_box.blockSignals(True)
         self.language_combo_box.clear()
         languages = [
-        ("en","English"),
+            ("en", "English"), ("ja", "日本語 (Japanese)"), ("fr", "Français (French)"),
-        ("ja","日本語 (Japanese)"),
+            ("de", "Deutsch (German)"), ("es", "Español (Spanish)"), ("pt", "Português (Portuguese)"),
-        ("fr","Français (French)"),
+            ("ru", "Русский (Russian)"), ("zh_CN", "简体中文 (Simplified Chinese)"),
-        ("de","Deutsch (German)"),
+            ("zh_TW", "繁體中文 (Traditional Chinese)"), ("ko", "한국어 (Korean)")
-        ("es","Español (Spanish)"),
-        ("pt","Português (Portuguese)"),
-        ("ru","Русский (Russian)"),
-        ("zh_CN","简体中文 (Simplified Chinese)"),
-        ("zh_TW","繁體中文 (Traditional Chinese)"),
-        ("ko","한국어 (Korean)")
         ]
+        current_lang = self.parent_app.current_selected_language
         for lang_code, lang_name in languages:
             self.language_combo_box.addItem(lang_name, lang_code)
-            if self.parent_app.current_selected_language == lang_code:
+            if current_lang == lang_code:
                 self.language_combo_box.setCurrentIndex(self.language_combo_box.count() - 1)
         self.language_combo_box.blockSignals(False)
 
     def _language_selection_changed(self, index):
-        """Handles the user selecting a new language."""
         selected_lang_code = self.language_combo_box.itemData(index)
         if selected_lang_code and selected_lang_code != self.parent_app.current_selected_language:
-            self.parent_app.current_selected_language = selected_lang_code
             self.parent_app.settings.setValue(LANGUAGE_KEY, selected_lang_code)
             self.parent_app.settings.sync()
+            self.parent_app.current_selected_language = selected_lang_code
             
             self._retranslate_ui()
-
+            if hasattr(self.parent_app, '_retranslate_main_ui'):
+                 self.parent_app._retranslate_main_ui()
+            
             msg_box = QMessageBox(self)
             msg_box.setIcon(QMessageBox.Information)
             msg_box.setWindowTitle(self._tr("language_change_title", "Language Changed"))
@@ -179,24 +280,43 @@ class FutureSettingsDialog(QDialog):
             if msg_box.clickedButton() == restart_button:
                 self.parent_app._request_restart_application()
 
-    def _save_download_path(self):
+    def _save_cookie_and_path(self):
-        """Saves the current download path from the main window to settings."""
+        """Saves the current download path and/or cookie settings from the main window."""
+        path_saved = False
+        cookie_saved = False
+        
+        # --- Save Download Path Logic ---
         if hasattr(self.parent_app, 'dir_input') and self.parent_app.dir_input:
             current_path = self.parent_app.dir_input.text().strip()
-            if current_path:
+            if current_path and os.path.isdir(current_path):
-                if os.path.isdir(current_path):
+                self.parent_app.settings.setValue(DOWNLOAD_LOCATION_KEY, current_path)
-                    self.parent_app.settings.setValue(DOWNLOAD_LOCATION_KEY, current_path)
+                path_saved = True
-                    self.parent_app.settings.sync()
+        
-                    QMessageBox.information(self,
+        # --- Save Cookie Logic ---
-                        self._tr("settings_save_path_success_title", "Path Saved"),
+        if hasattr(self.parent_app, 'use_cookie_checkbox'):
-                        self._tr("settings_save_path_success_message", "Download location '{path}' saved.").format(path=current_path))
+            use_cookie = self.parent_app.use_cookie_checkbox.isChecked()
-                else:
+            cookie_content = self.parent_app.cookie_text_input.text().strip()
-                    QMessageBox.warning(self,
+            
-                        self._tr("settings_save_path_invalid_title", "Invalid Path"),
+            if use_cookie and cookie_content:
-                        self._tr("settings_save_path_invalid_message", "The path '{path}' is not a valid directory.").format(path=current_path))
+                self.parent_app.settings.setValue(USE_COOKIE_KEY, True)
-            else:
+                self.parent_app.settings.setValue(COOKIE_TEXT_KEY, cookie_content)
-                QMessageBox.warning(self,
+                cookie_saved = True
-                    self._tr("settings_save_path_empty_title", "Empty Path"),
+            else: # Also save the 'off' state
-                    self._tr("settings_save_path_empty_message", "Download location cannot be empty."))
+                self.parent_app.settings.setValue(USE_COOKIE_KEY, False)
+                self.parent_app.settings.setValue(COOKIE_TEXT_KEY, "")
+
+        self.parent_app.settings.sync()
+
+        # --- User Feedback ---
+        if path_saved and cookie_saved:
+            message = self._tr("settings_save_both_success", "Download location and cookie settings saved.")
+        elif path_saved:
+            message = self._tr("settings_save_path_only_success", "Download location saved. No cookie settings were active to save.")
+        elif cookie_saved:
+            message = self._tr("settings_save_cookie_only_success", "Cookie settings saved. Download location was not set.")
         else:
-            QMessageBox.critical(self, "Error", "Could not access download path input from main application.")
+            QMessageBox.warning(self, self._tr("settings_save_nothing_title", "Nothing to Save"),
+                                self._tr("settings_save_nothing_message", "The download location is not a valid directory and no cookie was active."))
+            return
+
+        QMessageBox.information(self, self._tr("settings_save_success_title", "Settings Saved"), message)

src/ui/dialogs/HelpGuideDialog.py

@@ -1,36 +1,34 @@
-# --- Standard Library Imports ---
 import os
 import sys
-
-# --- PyQt5 Imports ---
 from PyQt5.QtCore import QUrl, QSize, Qt
 from PyQt5.QtGui import QIcon, QDesktopServices
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
-    QStackedWidget, QScrollArea, QFrame, QWidget
+    QStackedWidget, QListWidget, QFrame, QWidget, QScrollArea
 )
-
-# --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
-
+from ...utils.resolution import get_dark_theme
 
 class TourStepWidget(QWidget):
     """
     A custom widget representing a single step or page in the feature guide.
     It neatly formats a title and its corresponding content.
     """
-    def __init__(self, title_text, content_text, parent=None):
+    def __init__(self, title_text, content_text, parent=None, scale=1.0):
         super().__init__(parent)
         layout = QVBoxLayout(self)
         layout.setContentsMargins(20, 20, 20, 20)
         layout.setSpacing(10)
 
+        title_font_size = int(14 * scale)
+        content_font_size = int(11 * scale)
+
         title_label = QLabel(title_text)
         title_label.setAlignment(Qt.AlignCenter)
-        title_label.setStyleSheet("font-size: 18px; font-weight: bold; color: #E0E0E0; padding-bottom: 15px;")
+        title_label.setStyleSheet(f"font-size: {title_font_size}pt; font-weight: bold; color: #E0E0E0; padding-bottom: 15px;")
         layout.addWidget(title_label)
-
+        
         scroll_area = QScrollArea()
         scroll_area.setWidgetResizable(True)
         scroll_area.setFrameShape(QFrame.NoFrame)
@@ -42,151 +40,153 @@ class TourStepWidget(QWidget):
         content_label.setWordWrap(True)
         content_label.setAlignment(Qt.AlignLeft | Qt.AlignTop)
         content_label.setTextFormat(Qt.RichText)
-        content_label.setOpenExternalLinks(True) # Allow opening links in the content
+        content_label.setOpenExternalLinks(True)
-        content_label.setStyleSheet("font-size: 11pt; color: #C8C8C8; line-height: 1.8;")
+        content_label.setStyleSheet(f"font-size: {content_font_size}pt; color: #C8C8C8; line-height: 1.8;")
         scroll_area.setWidget(content_label)
         layout.addWidget(scroll_area, 1)
 
 
-class HelpGuideDialog (QDialog ):
+class HelpGuideDialog(QDialog):
-    """A multi-page dialog for displaying the feature guide."""
+    """A multi-page dialog for displaying the feature guide with a navigation list."""
-    def __init__ (self ,steps_data ,parent_app ,parent =None ):
+    def __init__(self, steps_data, parent_app, parent=None):
-        super ().__init__ (parent )
+        super().__init__(parent)
-        self .current_step =0 
+        self.steps_data = steps_data
-        self .steps_data =steps_data 
+        self.parent_app = parent_app
-        self .parent_app =parent_app 
 
-        app_icon =get_app_icon_object ()
+        scale = self.parent_app.scale_factor if hasattr(self.parent_app, 'scale_factor') else 1.0
+
+        app_icon = get_app_icon_object()
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
 
-        self .setModal (True )
+        self.setModal(True)
-        self .setFixedSize (650 ,600 )
+        self.resize(int(800 * scale), int(650 * scale))
 
+        dialog_font_size = int(11 * scale)
+        
+        current_theme_style = ""
+        if hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark":
+            current_theme_style = get_dark_theme(scale)
+        else:
+            # Basic light theme fallback
+            current_theme_style = f"""
+                QDialog {{ background-color: #F0F0F0; border: 1px solid #B0B0B0; }}
+                QLabel {{ color: #1E1E1E; }}
+                QPushButton {{ 
+                    background-color: #E1E1E1; 
+                    color: #1E1E1E; 
+                    border: 1px solid #ADADAD; 
+                    padding: {int(8*scale)}px {int(15*scale)}px; 
+                    border-radius: 4px; 
+                    min-height: {int(25*scale)}px; 
+                    font-size: {dialog_font_size}pt; 
+                }}
+                QPushButton:hover {{ background-color: #CACACA; }}
+                QPushButton:pressed {{ background-color: #B0B0B0; }}
+            """
 
-        current_theme_style =""
+        self.setStyleSheet(current_theme_style)
-        if hasattr (self .parent_app ,'current_theme')and self .parent_app .current_theme =="dark":
+        self._init_ui()
-            if hasattr (self .parent_app ,'get_dark_theme'):
+        if self.parent_app:
-                current_theme_style =self .parent_app .get_dark_theme ()
+            self.move(self.parent_app.geometry().center() - self.rect().center())
 
-
+    def _tr(self, key, default_text=""):
-        self .setStyleSheet (current_theme_style if current_theme_style else """
-            QDialog { background-color: #2E2E2E; border: 1px solid #5A5A5A; }
-            QLabel { color: #E0E0E0; }
-            QPushButton { background-color: #555; color: #F0F0F0; border: 1px solid #6A6A6A; padding: 8px 15px; border-radius: 4px; min-height: 25px; font-size: 11pt; }
-            QPushButton:hover { background-color: #656565; }
-            QPushButton:pressed { background-color: #4A4A4A; }
-        """)
-        self ._init_ui ()
-        if self .parent_app :
-            self .move (self .parent_app .geometry ().center ()-self .rect ().center ())
-
-    def _tr (self ,key ,default_text =""):
         """Helper to get translation based on current app language."""
-        if callable (get_translation )and self .parent_app :
+        if callable(get_translation) and self.parent_app:
-            return get_translation (self .parent_app .current_selected_language ,key ,default_text )
+            return get_translation(self.parent_app.current_selected_language, key, default_text)
-        return default_text 
+        return default_text
 
+    def _init_ui(self):
+        main_layout = QVBoxLayout(self)
+        main_layout.setContentsMargins(15, 15, 15, 15)
+        main_layout.setSpacing(10)
 
-    def _init_ui (self ):
+        # Title
-        main_layout =QVBoxLayout (self )
+        title_label = QLabel(self._tr("help_guide_dialog_title", "Kemono Downloader - Feature Guide"))
-        main_layout .setContentsMargins (0 ,0 ,0 ,0 )
+        scale = getattr(self.parent_app, 'scale_factor', 1.0)
-        main_layout .setSpacing (0 )
+        title_font_size = int(16 * scale)
+        title_label.setStyleSheet(f"font-size: {title_font_size}pt; font-weight: bold; color: #E0E0E0;")
+        title_label.setAlignment(Qt.AlignCenter)
+        main_layout.addWidget(title_label)
 
-        self .stacked_widget =QStackedWidget ()
+        # Content Layout (Navigation + Stacked Pages)
-        main_layout .addWidget (self .stacked_widget ,1 )
+        content_layout = QHBoxLayout()
+        main_layout.addLayout(content_layout, 1)
 
-        self .tour_steps_widgets =[]
+        self.nav_list = QListWidget()
-        for title ,content in self .steps_data :
+        self.nav_list.setFixedWidth(int(220 * scale))
-            step_widget =TourStepWidget (title ,content )
+        self.nav_list.setStyleSheet(f"""
-            self .tour_steps_widgets .append (step_widget )
+            QListWidget {{
-            self .stacked_widget .addWidget (step_widget )
+                background-color: #2E2E2E;
+                border: 1px solid #4A4A4A;
+                border-radius: 4px;
+                font-size: {int(11 * scale)}pt;
+            }}
+            QListWidget::item {{
+                padding: 10px;
+                border-bottom: 1px solid #4A4A4A;
+            }}
+            QListWidget::item:selected {{
+                background-color: #87CEEB;
+                color: #2E2E2E;
+                font-weight: bold;
+            }}
+        """)
+        content_layout.addWidget(self.nav_list)
 
-        self .setWindowTitle (self ._tr ("help_guide_dialog_title","Kemono Downloader - Feature Guide"))
+        self.stacked_widget = QStackedWidget()
+        content_layout.addWidget(self.stacked_widget)
 
-        buttons_layout =QHBoxLayout ()
+        for title_key, content_key in self.steps_data:
-        buttons_layout .setContentsMargins (15 ,10 ,15 ,15 )
+            title = self._tr(title_key, title_key)
-        buttons_layout .setSpacing (10 )
+            content = self._tr(content_key, f"Content for {content_key} not found.")
+            
+            self.nav_list.addItem(title)
+            
+            step_widget = TourStepWidget(title, content, scale=scale)
+            self.stacked_widget.addWidget(step_widget)
 
-        self .back_button =QPushButton (self ._tr ("tour_dialog_back_button","Back"))
+        self.nav_list.currentRowChanged.connect(self.stacked_widget.setCurrentIndex)
-        self .back_button .clicked .connect (self ._previous_step )
+        if self.nav_list.count() > 0:
-        self .back_button .setEnabled (False )
+            self.nav_list.setCurrentRow(0)
 
-        if getattr (sys ,'frozen',False )and hasattr (sys ,'_MEIPASS'):
+        # Footer Layout (Social links and Close button)
-            assets_base_dir =sys ._MEIPASS 
+        footer_layout = QHBoxLayout()
-        else :
+        footer_layout.setContentsMargins(0, 10, 0, 0)
-            # Go up three levels from this file's directory (src/ui/dialogs) to the project root
+        
-            assets_base_dir =os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))
+        # Social Media Icons
+        if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+            assets_base_dir = sys._MEIPASS
+        else:
+            assets_base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))
 
-        github_icon_path =os .path .join (assets_base_dir ,"assets","github.png")
+        github_icon_path = os.path.join(assets_base_dir, "assets", "github.png")
-        instagram_icon_path =os .path .join (assets_base_dir ,"assets","instagram.png")
+        instagram_icon_path = os.path.join(assets_base_dir, "assets", "instagram.png")
-        discord_icon_path =os .path .join (assets_base_dir ,"assets","discord.png")
+        discord_icon_path = os.path.join(assets_base_dir, "assets", "discord.png")
 
-        self .github_button =QPushButton (QIcon (github_icon_path ),"")
+        self.github_button = QPushButton(QIcon(github_icon_path), "")
-        self .instagram_button =QPushButton (QIcon (instagram_icon_path ),"")
+        self.instagram_button = QPushButton(QIcon(instagram_icon_path), "")
-        self .Discord_button =QPushButton (QIcon (discord_icon_path ),"")
+        self.discord_button = QPushButton(QIcon(discord_icon_path), "")
 
-        icon_size =QSize (24 ,24 )
+        icon_dim = int(24 * scale)
-        self .github_button .setIconSize (icon_size )
+        icon_size = QSize(icon_dim, icon_dim)
-        self .instagram_button .setIconSize (icon_size )
+        
-        self .Discord_button .setIconSize (icon_size )
+        for button, tooltip_key, url in [
+            (self.github_button, "help_guide_github_tooltip", "https://github.com/Yuvi9587"),
+            (self.instagram_button, "help_guide_instagram_tooltip", "https://www.instagram.com/uvi.arts/"),
+            (self.discord_button, "help_guide_discord_tooltip", "https://discord.gg/BqP64XTdJN")
+        ]:
+            button.setIconSize(icon_size)
+            button.setToolTip(self._tr(tooltip_key))
+            button.setFixedSize(icon_size.width() + 8, icon_size.height() + 8)
+            button.setStyleSheet("background-color: transparent; border: none;")
+            button.clicked.connect(lambda _, u=url: QDesktopServices.openUrl(QUrl(u)))
+            footer_layout.addWidget(button)
 
-        self .next_button =QPushButton (self ._tr ("tour_dialog_next_button","Next"))
+        footer_layout.addStretch(1)
-        self .next_button .clicked .connect (self ._next_step_action )
-        self .next_button .setDefault (True )
-        self .github_button .clicked .connect (self ._open_github_link )
-        self .instagram_button .clicked .connect (self ._open_instagram_link )
-        self .Discord_button .clicked .connect (self ._open_Discord_link )
-        self .github_button .setToolTip (self ._tr ("help_guide_github_tooltip","Visit project's GitHub page (Opens in browser)"))
-        self .instagram_button .setToolTip (self ._tr ("help_guide_instagram_tooltip","Visit our Instagram page (Opens in browser)"))
-        self .Discord_button .setToolTip (self ._tr ("help_guide_discord_tooltip","Visit our Discord community (Opens in browser)"))
 
+        self.finish_button = QPushButton(self._tr("tour_dialog_finish_button", "Finish"))
+        self.finish_button.clicked.connect(self.accept)
+        footer_layout.addWidget(self.finish_button)
 
-        social_layout =QHBoxLayout ()
+        main_layout.addLayout(footer_layout)
-        social_layout .setSpacing (10 )
-        social_layout .addWidget (self .github_button )
-        social_layout .addWidget (self .instagram_button )
-        social_layout .addWidget (self .Discord_button )
-
-        while buttons_layout .count ():
-            item =buttons_layout .takeAt (0 )
-            if item .widget ():
-                item .widget ().setParent (None )
-            elif item .layout ():
-                pass 
-        buttons_layout .addLayout (social_layout )
-        buttons_layout .addStretch (1 )
-        buttons_layout .addWidget (self .back_button )
-        buttons_layout .addWidget (self .next_button )
-        main_layout .addLayout (buttons_layout )
-        self ._update_button_states ()
-
-    def _next_step_action (self ):
-        if self .current_step <len (self .tour_steps_widgets )-1 :
-            self .current_step +=1 
-            self .stacked_widget .setCurrentIndex (self .current_step )
-        else :
-            self .accept ()
-        self ._update_button_states ()
-
-    def _previous_step (self ):
-        if self .current_step >0 :
-            self .current_step -=1 
-            self .stacked_widget .setCurrentIndex (self .current_step )
-        self ._update_button_states ()
-
-    def _update_button_states (self ):
-        if self .current_step ==len (self .tour_steps_widgets )-1 :
-            self .next_button .setText (self ._tr ("tour_dialog_finish_button","Finish"))
-        else :
-            self .next_button .setText (self ._tr ("tour_dialog_next_button","Next"))
-        self .back_button .setEnabled (self .current_step >0 )
-
-    def _open_github_link (self ):
-        QDesktopServices .openUrl (QUrl ("https://github.com/Yuvi9587"))
-
-    def _open_instagram_link (self ):
-        QDesktopServices .openUrl (QUrl ("https://www.instagram.com/uvi.arts/"))
-
-    def _open_Discord_link (self ):
-        QDesktopServices .openUrl (QUrl ("https://discord.gg/BqP64XTdJN"))

src/ui/dialogs/KeepDuplicatesDialog.py

@@ -0,0 +1,107 @@
+from PyQt5.QtWidgets import (
+    QDialog, QVBoxLayout, QGroupBox, QRadioButton,
+    QPushButton, QHBoxLayout, QButtonGroup, QLabel, QLineEdit
+)
+from PyQt5.QtGui import QIntValidator
+from ...i18n.translator import get_translation
+from ...config.constants import DUPLICATE_HANDLING_HASH, DUPLICATE_HANDLING_KEEP_ALL
+
+class KeepDuplicatesDialog(QDialog):
+    """A dialog to choose the duplicate handling method, with a limit option."""
+
+    def __init__(self, current_mode, current_limit, parent=None):
+        super().__init__(parent)
+        self.parent_app = parent
+        self.selected_mode = current_mode
+        self.limit = current_limit
+
+        self._init_ui()
+        self._retranslate_ui()
+
+        if self.parent_app and hasattr(self.parent_app, '_apply_theme_to_widget'):
+            self.parent_app._apply_theme_to_widget(self)
+        if current_mode == DUPLICATE_HANDLING_KEEP_ALL:
+            self.radio_keep_everything.setChecked(True)
+            self.limit_input.setText(str(current_limit) if current_limit > 0 else "")
+        else:
+            self.radio_skip_by_hash.setChecked(True)
+            self.limit_input.setEnabled(False)
+
+    def _init_ui(self):
+        """Initializes the UI components."""
+        main_layout = QVBoxLayout(self)
+        info_label = QLabel()
+        info_label.setWordWrap(True)
+        main_layout.addWidget(info_label)
+
+        options_group = QGroupBox()
+        options_layout = QVBoxLayout(options_group)
+        self.button_group = QButtonGroup(self)
+        self.radio_skip_by_hash = QRadioButton()
+        self.button_group.addButton(self.radio_skip_by_hash)
+        options_layout.addWidget(self.radio_skip_by_hash)
+        keep_everything_layout = QHBoxLayout()
+        self.radio_keep_everything = QRadioButton()
+        self.button_group.addButton(self.radio_keep_everything)
+        keep_everything_layout.addWidget(self.radio_keep_everything)
+        keep_everything_layout.addStretch(1)
+
+        self.limit_label = QLabel()
+        self.limit_input = QLineEdit()
+        self.limit_input.setValidator(QIntValidator(0, 99))
+        self.limit_input.setFixedWidth(50)
+        keep_everything_layout.addWidget(self.limit_label)
+        keep_everything_layout.addWidget(self.limit_input)
+        options_layout.addLayout(keep_everything_layout)
+
+        main_layout.addWidget(options_group)
+        button_layout = QHBoxLayout()
+        self.ok_button = QPushButton()
+        self.cancel_button = QPushButton()
+        button_layout.addStretch(1)
+        button_layout.addWidget(self.ok_button)
+        button_layout.addWidget(self.cancel_button)
+        main_layout.addLayout(button_layout)
+        self.ok_button.clicked.connect(self.accept)
+        self.cancel_button.clicked.connect(self.reject)
+        self.radio_keep_everything.toggled.connect(self.limit_input.setEnabled)
+
+    def _tr(self, key, default_text=""):
+        if self.parent_app and callable(get_translation):
+            return get_translation(self.parent_app.current_selected_language, key, default_text)
+        return default_text
+
+    def _retranslate_ui(self):
+        """Sets the text for UI elements."""
+        self.setWindowTitle(self._tr("duplicates_dialog_title", "Duplicate Handling Options"))
+        self.findChild(QLabel).setText(self._tr("duplicates_dialog_info",
+            "Choose how to handle files that have identical content to already downloaded files."))
+        self.findChild(QGroupBox).setTitle(self._tr("duplicates_dialog_group_title", "Mode"))
+
+        self.radio_skip_by_hash.setText(self._tr("duplicates_dialog_skip_hash", "Skip by Hash (Recommended)"))
+        self.radio_keep_everything.setText(self._tr("duplicates_dialog_keep_all", "Keep Everything"))
+
+        self.limit_label.setText(self._tr("duplicates_limit_label", "Limit:"))
+        self.limit_input.setPlaceholderText(self._tr("duplicates_limit_placeholder", "0=all"))
+        self.limit_input.setToolTip(self._tr("duplicates_limit_tooltip",
+            "Set a limit for identical files to keep. 0 means no limit."))
+
+        self.ok_button.setText(self._tr("ok_button", "OK"))
+        self.cancel_button.setText(self._tr("cancel_button_text_simple", "Cancel"))
+
+    def accept(self):
+        """Sets the selected mode and limit when OK is clicked."""
+        if self.radio_keep_everything.isChecked():
+            self.selected_mode = DUPLICATE_HANDLING_KEEP_ALL
+            try:
+                self.limit = int(self.limit_input.text()) if self.limit_input.text() else 0
+            except ValueError:
+                self.limit = 0
+        else:
+            self.selected_mode = DUPLICATE_HANDLING_HASH
+            self.limit = 0
+        super().accept()
+
+    def get_selected_options(self):
+        """Returns the chosen mode and limit as a dictionary."""
+        return {"mode": self.selected_mode, "limit": self.limit}

src/ui/dialogs/KnownNamesFilterDialog.py

@@ -8,13 +8,12 @@ from PyQt5.QtWidgets import (
 # --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
-
+from ...utils.resolution import get_dark_theme
 
 class KnownNamesFilterDialog(QDialog):
     """
     A dialog to select names from the Known.txt list to add to the main
     character filter input field. This provides a convenient way for users
-
     to reuse their saved names and groups for filtering downloads.
     """
 
@@ -38,13 +37,16 @@ class KnownNamesFilterDialog(QDialog):
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
 
-        # Set window size dynamically
+        # --- START OF FIX ---
-        screen_geometry = QApplication.primaryScreen().availableGeometry()
+        # Get the user-defined scale factor from the parent application
+        # instead of calculating an independent one.
+        scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
+
+        # Define base size and apply the correct scale factor
         base_width, base_height = 460, 450
-        scale_factor_h = screen_geometry.height() / 1080.0
+        self.setMinimumSize(int(base_width * scale_factor), int(base_height * scale_factor))
-        effective_scale_factor = max(0.75, min(scale_factor_h, 1.5))
+        self.resize(int(base_width * scale_factor * 1.1), int(base_height * scale_factor * 1.1))
-        self.setMinimumSize(int(base_width * effective_scale_factor), int(base_height * effective_scale_factor))
+        # --- END OF FIX ---
-        self.resize(int(base_width * effective_scale_factor * 1.1), int(base_height * effective_scale_factor * 1.1))
 
         # --- Initialize UI and Apply Theming ---
         self._init_ui()
@@ -102,8 +104,14 @@ class KnownNamesFilterDialog(QDialog):
 
     def _apply_theme(self):
         """Applies the current theme from the parent application."""
-        if self.parent_app and hasattr(self.parent_app, 'get_dark_theme') and self.parent_app.current_theme == "dark":
+        if self.parent_app and self.parent_app.current_theme == "dark":
-            self.setStyleSheet(self.parent_app.get_dark_theme())
+            # Get the scale factor from the parent app
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            # Call the imported function with the correct scale
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            # Explicitly set a blank stylesheet for light mode
+            self.setStyleSheet("")
 
     def _populate_list_widget(self):
         """Populates the list widget with the known names."""
@@ -147,4 +155,4 @@ class KnownNamesFilterDialog(QDialog):
 
     def get_selected_entries(self):
         """Returns the list of known name entries selected by the user."""
-        return self.selected_entries_to_return
+        return self.selected_entries_to_return

src/ui/dialogs/MoreOptionsDialog.py

@@ -0,0 +1,96 @@
+from PyQt5.QtWidgets import (
+    QDialog, QVBoxLayout, QRadioButton, QDialogButtonBox, QButtonGroup, QLabel, QComboBox, QHBoxLayout, QCheckBox
+)
+from PyQt5.QtCore import Qt
+from ...utils.resolution import get_dark_theme
+
+class MoreOptionsDialog(QDialog):
+    """
+    A dialog for selecting a scope, export format, and single PDF option.
+    """
+    SCOPE_CONTENT = "content"
+    SCOPE_COMMENTS = "comments"
+
+    def __init__(self, parent=None, current_scope=None, current_format=None, single_pdf_checked=False):
+        super().__init__(parent)
+        self.parent_app = parent
+        self.setWindowTitle("More Options")
+        self.setMinimumWidth(350)
+
+        # ... (Layout and other widgets remain the same) ...
+
+        layout = QVBoxLayout(self)
+        self.description_label = QLabel("Please choose the scope for the action:")
+        layout.addWidget(self.description_label)
+        self.radio_button_group = QButtonGroup(self)
+        self.radio_content = QRadioButton("Description/Content")
+        self.radio_comments = QRadioButton("Comments")
+        self.radio_button_group.addButton(self.radio_content)
+        self.radio_button_group.addButton(self.radio_comments)
+        layout.addWidget(self.radio_content)
+        layout.addWidget(self.radio_comments)
+
+        if current_scope == self.SCOPE_COMMENTS:
+            self.radio_comments.setChecked(True)
+        else:
+            self.radio_content.setChecked(True)
+
+        export_layout = QHBoxLayout()
+        export_label = QLabel("Export as:")
+        self.format_combo = QComboBox()
+        self.format_combo.addItems(["PDF", "DOCX", "TXT"])
+
+        if current_format and current_format.upper() in ["PDF", "DOCX", "TXT"]:
+            self.format_combo.setCurrentText(current_format.upper())
+        else:
+            self.format_combo.setCurrentText("PDF")
+
+        export_layout.addWidget(export_label)
+        export_layout.addWidget(self.format_combo)
+        export_layout.addStretch()
+        layout.addLayout(export_layout)
+
+        # --- UPDATED: Single PDF Checkbox ---
+        self.single_pdf_checkbox = QCheckBox("Single PDF")
+        self.single_pdf_checkbox.setToolTip("If checked, all text from matching posts will be compiled into one single PDF file.")
+        self.single_pdf_checkbox.setChecked(single_pdf_checked)
+        layout.addWidget(self.single_pdf_checkbox)
+
+        self.format_combo.currentTextChanged.connect(self.update_single_pdf_checkbox_state)
+        self.update_single_pdf_checkbox_state(self.format_combo.currentText())
+
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        self.button_box.accepted.connect(self.accept)
+        self.button_box.rejected.connect(self.reject)
+        layout.addWidget(self.button_box)
+        self.setLayout(layout)
+        self._apply_theme()
+    def update_single_pdf_checkbox_state(self, text):
+        """Enable the Single PDF checkbox only if the format is PDF."""
+        is_pdf = (text.upper() == "PDF")
+        self.single_pdf_checkbox.setEnabled(is_pdf)
+        if not is_pdf:
+            self.single_pdf_checkbox.setChecked(False)
+
+    def get_selected_scope(self):
+        if self.radio_comments.isChecked():
+            return self.SCOPE_COMMENTS
+        return self.SCOPE_CONTENT
+
+    def get_selected_format(self):
+        return self.format_combo.currentText().lower()
+
+    def get_single_pdf_state(self):
+        """Returns the state of the Single PDF checkbox."""
+        return self.single_pdf_checkbox.isChecked() and self.single_pdf_checkbox.isEnabled()
+
+    def _apply_theme(self):
+        """Applies the current theme from the parent application."""
+        if self.parent_app and self.parent_app.current_theme == "dark":
+            # Get the scale factor from the parent app
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            # Call the imported function with the correct scale
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            # Explicitly set a blank stylesheet for light mode
+            self.setStyleSheet("")

src/ui/dialogs/SinglePDF.py

@@ -0,0 +1,108 @@
+import os
+import re
+try:
+    from fpdf import FPDF
+    FPDF_AVAILABLE = True
+except ImportError:
+    FPDF_AVAILABLE = False
+
+def strip_html_tags(text):
+    if not text:
+        return ""
+    clean = re.compile('<.*?>')
+    return re.sub(clean, '', text)
+
+class PDF(FPDF):
+    """Custom PDF class to handle headers and footers."""
+    def header(self):
+        pass 
+
+    def footer(self):
+        self.set_y(-15)
+        if self.font_family:
+             self.set_font(self.font_family, '', 8)
+        else:
+             self.set_font('Arial', '', 8)
+        self.cell(0, 10, 'Page ' + str(self.page_no()), 0, 0, 'C')
+
+def create_single_pdf_from_content(posts_data, output_filename, font_path, logger=print):
+    """
+    Creates a single, continuous PDF, correctly formatting both descriptions and comments.
+    """
+    if not FPDF_AVAILABLE:
+        logger("❌ PDF Creation failed: 'fpdf2' library is not installed. Please run: pip install fpdf2")
+        return False
+
+    if not posts_data:
+        logger("   No text content was collected to create a PDF.")
+        return False
+
+    pdf = PDF()
+    default_font_family = 'DejaVu'
+    
+    bold_font_path = ""
+    if font_path:
+        bold_font_path = font_path.replace("DejaVuSans.ttf", "DejaVuSans-Bold.ttf")
+
+    try:
+        if not os.path.exists(font_path): raise RuntimeError(f"Font file not found: {font_path}")
+        if not os.path.exists(bold_font_path): raise RuntimeError(f"Bold font file not found: {bold_font_path}")
+        
+        pdf.add_font('DejaVu', '', font_path, uni=True)
+        pdf.add_font('DejaVu', 'B', bold_font_path, uni=True)
+    except Exception as font_error:
+        logger(f"   ⚠️ Could not load DejaVu font: {font_error}. Falling back to Arial.")
+        default_font_family = 'Arial'
+    
+    pdf.add_page()
+
+    logger(f"   Starting continuous PDF creation with content from {len(posts_data)} posts...")
+
+    for i, post in enumerate(posts_data):
+        if i > 0:
+            if 'content' in post:
+                pdf.add_page()
+            elif 'comments' in post:
+                pdf.ln(10)
+                pdf.cell(0, 0, '', border='T')
+                pdf.ln(10)
+
+        pdf.set_font(default_font_family, 'B', 16)
+        pdf.multi_cell(w=0, h=10, text=post.get('title', 'Untitled Post'), align='L')
+        pdf.ln(5)
+
+        if 'comments' in post and post['comments']:
+            comments_list = post['comments']
+            for comment_index, comment in enumerate(comments_list):
+                user = comment.get('commenter_name', 'Unknown User')
+                timestamp = comment.get('published', 'No Date')
+                body = strip_html_tags(comment.get('content', ''))
+
+                pdf.set_font(default_font_family, '', 10)
+                pdf.write(8, "Comment by: ")
+                if user is not None:
+                    pdf.set_font(default_font_family, 'B', 10)
+                    pdf.write(8, str(user))
+                
+                pdf.set_font(default_font_family, '', 10)
+                pdf.write(8, f" on {timestamp}")
+                pdf.ln(10)
+
+                pdf.set_font(default_font_family, '', 11)
+                pdf.multi_cell(0, 7, body)
+                
+                if comment_index < len(comments_list) - 1:
+                    pdf.ln(3)
+                    pdf.cell(w=0, h=0, border='T')
+                    pdf.ln(3)
+        elif 'content' in post:
+            pdf.set_font(default_font_family, '', 12)
+            pdf.multi_cell(w=0, h=7, text=post.get('content', 'No Content'))
+    
+    try:
+        pdf.output(output_filename)
+        logger(f"✅ Successfully created single PDF: '{os.path.basename(output_filename)}'")
+        return True
+    except Exception as e:
+        logger(f"❌ A critical error occurred while saving the final PDF: {e}")
+        return False

src/ui/dialogs/SupportDialog.py

@@ -0,0 +1,155 @@
+# src/ui/dialogs/SupportDialog.py
+
+# --- Standard Library Imports ---
+import sys
+import os
+
+# --- PyQt5 Imports ---
+from PyQt5.QtWidgets import (
+    QDialog, QVBoxLayout, QLabel, QFrame, QDialogButtonBox, QGridLayout
+)
+from PyQt5.QtCore import Qt, QSize
+from PyQt5.QtGui import QFont, QPixmap
+
+# --- Local Application Imports ---
+from ...utils.resolution import get_dark_theme
+
+# --- Helper function for robust asset loading ---
+def get_asset_path(filename):
+    """
+    Gets the absolute path to a file in the assets folder,
+    handling both development and frozen (PyInstaller) environments.
+    """
+    if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
+        # Running in a PyInstaller bundle
+        base_path = sys._MEIPASS
+    else:
+        # Running in a normal Python environment from src/ui/dialogs/
+        base_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+    
+    return os.path.join(base_path, 'assets', filename)
+
+
+class SupportDialog(QDialog):
+    """
+    A dialog to show support and donation options.
+    """
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.parent_app = parent
+        self.setWindowTitle("❤️ Support the Developer")
+        self.setMinimumWidth(450)
+
+        self._init_ui()
+        self._apply_theme()
+
+    def _init_ui(self):
+        """Initializes all UI components and layouts for the dialog."""
+        # Main layout
+        main_layout = QVBoxLayout(self)
+        main_layout.setSpacing(15)
+
+        # Title Label
+        title_label = QLabel("Thank You for Your Support!")
+        font = title_label.font()
+        font.setPointSize(14)
+        font.setBold(True)
+        title_label.setFont(font)
+        title_label.setAlignment(Qt.AlignCenter)
+        main_layout.addWidget(title_label)
+
+        # Informational Text
+        info_label = QLabel(
+            "If you find this application useful, please consider supporting its development. "
+            "Your contribution helps cover costs and encourages future updates and features."
+        )
+        info_label.setWordWrap(True)
+        info_label.setAlignment(Qt.AlignCenter)
+        main_layout.addWidget(info_label)
+
+        # Separator
+        line = QFrame()
+        line.setFrameShape(QFrame.HLine)
+        line.setFrameShadow(QFrame.Sunken)
+        main_layout.addWidget(line)
+
+        # --- Donation Options Layout (using a grid for icons and text) ---
+        options_layout = QGridLayout()
+        options_layout.setSpacing(18)
+        options_layout.setColumnStretch(0, 1) # Add stretch to center the content horizontally
+        options_layout.setColumnStretch(3, 1)
+
+        link_font = self.font()
+        link_font.setPointSize(12)
+        link_font.setBold(True)
+        
+        scale = getattr(self.parent_app, 'scale_factor', 1.0)
+        icon_size = int(32 * scale)
+
+        # --- Ko-fi ---
+        kofi_icon_label = QLabel()
+        kofi_pixmap = QPixmap(get_asset_path("kofi.png"))
+        if not kofi_pixmap.isNull():
+            kofi_icon_label.setPixmap(kofi_pixmap.scaled(QSize(icon_size, icon_size), Qt.KeepAspectRatio, Qt.SmoothTransformation))
+        
+        kofi_text_label = QLabel(
+            '<a href="https://ko-fi.com/yuvi427183" style="color: #13C2C2; text-decoration: none;">'
+            '☕ Buy me a Ko-fi'
+            '</a>'
+        )
+        kofi_text_label.setOpenExternalLinks(True)
+        kofi_text_label.setFont(link_font)
+        
+        options_layout.addWidget(kofi_icon_label, 0, 1, Qt.AlignRight | Qt.AlignVCenter)
+        options_layout.addWidget(kofi_text_label, 0, 2, Qt.AlignLeft | Qt.AlignVCenter)
+
+        # --- GitHub Sponsors ---
+        github_icon_label = QLabel()
+        github_pixmap = QPixmap(get_asset_path("github_sponsors.png"))
+        if not github_pixmap.isNull():
+            github_icon_label.setPixmap(github_pixmap.scaled(QSize(icon_size, icon_size), Qt.KeepAspectRatio, Qt.SmoothTransformation))
+
+        github_text_label = QLabel(
+            '<a href="https://github.com/sponsors/Yuvi9587" style="color: #EA4AAA; text-decoration: none;">'
+            '💜 Sponsor on GitHub'
+            '</a>'
+        )
+        github_text_label.setOpenExternalLinks(True)
+        github_text_label.setFont(link_font)
+
+        options_layout.addWidget(github_icon_label, 1, 1, Qt.AlignRight | Qt.AlignVCenter)
+        options_layout.addWidget(github_text_label, 1, 2, Qt.AlignLeft | Qt.AlignVCenter)
+
+        # --- Buy Me a Coffee (New) ---
+        bmac_icon_label = QLabel()
+        bmac_pixmap = QPixmap(get_asset_path("bmac.png"))
+        if not bmac_pixmap.isNull():
+            bmac_icon_label.setPixmap(bmac_pixmap.scaled(QSize(icon_size, icon_size), Qt.KeepAspectRatio, Qt.SmoothTransformation))
+            
+        bmac_text_label = QLabel(
+            '<a href="https://buymeacoffee.com/yuvi9587" style="color: #FFDD00; text-decoration: none;">'
+            '🍺 Buy Me a Coffee'
+            '</a>'
+        )
+        bmac_text_label.setOpenExternalLinks(True)
+        bmac_text_label.setFont(link_font)
+        
+        options_layout.addWidget(bmac_icon_label, 2, 1, Qt.AlignRight | Qt.AlignVCenter)
+        options_layout.addWidget(bmac_text_label, 2, 2, Qt.AlignLeft | Qt.AlignVCenter)
+
+        main_layout.addLayout(options_layout)
+
+        # Close Button
+        self.button_box = QDialogButtonBox(QDialogButtonBox.Close)
+        self.button_box.rejected.connect(self.reject)
+        main_layout.addWidget(self.button_box)
+
+        self.setLayout(main_layout)
+
+    def _apply_theme(self):
+        """Applies the current theme from the parent application."""
+        if self.parent_app and hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark":
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            self.setStyleSheet("")

src/ui/dialogs/TourDialog.py

@@ -1,17 +1,13 @@
-# --- Standard Library Imports ---
 import os
 import sys
-
-# --- PyQt5 Imports ---
 from PyQt5.QtCore import pyqtSignal, Qt, QSettings, QCoreApplication
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
     QStackedWidget, QScrollArea, QFrame, QWidget, QCheckBox
 )
-
-# --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
+from ...utils.resolution import get_dark_theme
 from ...config.constants import (
     CONFIG_ORGANIZATION_NAME
 )
@@ -57,8 +53,6 @@ class TourDialog(QDialog):
     """
     tour_finished_normally = pyqtSignal()
     tour_skipped = pyqtSignal()
-
-    # Constants for QSettings
     CONFIG_APP_NAME_TOUR = "ApplicationTour"
     TOUR_SHOWN_KEY = "neverShowTourAgainV19"
 
@@ -97,8 +91,6 @@ class TourDialog(QDialog):
 
         self.stacked_widget = QStackedWidget()
         main_layout.addWidget(self.stacked_widget, 1)
-
-        # Load content for each step
         steps_content = [
             ("tour_dialog_step1_title", "tour_dialog_step1_content"),
             ("tour_dialog_step2_title", "tour_dialog_step2_content"),
@@ -119,8 +111,6 @@ class TourDialog(QDialog):
             self.stacked_widget.addWidget(step_widget)
 
         self.setWindowTitle(self._tr("tour_dialog_title", "Welcome to Kemono Downloader!"))
-
-        # --- Bottom Controls ---
         bottom_controls_layout = QVBoxLayout()
         bottom_controls_layout.setContentsMargins(15, 10, 15, 15)
         bottom_controls_layout.setSpacing(12)
@@ -150,8 +140,9 @@ class TourDialog(QDialog):
 
     def _apply_theme(self):
         """Applies the current theme from the parent application."""
-        if self.parent_app and hasattr(self.parent_app, 'get_dark_theme') and self.parent_app.current_theme == "dark":
+        if self.parent_app and self.parent_app.current_theme == "dark":
-            self.setStyleSheet(self.parent_app.get_dark_theme())
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            self.setStyleSheet(get_dark_theme(scale))
         else:
             self.setStyleSheet("QDialog { background-color: #f0f0f0; }")
 

src/utils/file_utils.py

@@ -12,7 +12,7 @@ MAX_FILENAME_COMPONENT_LENGTH = 150
 
 # Sets of file extensions for quick type checking
 IMAGE_EXTENSIONS = {
-    '.jpg', '.jpeg', '.png', '.gif', '.bmp', '.tiff', '.tif', '.webp',
+    '.jpg', '.jpeg', '.jpe', '.png', '.gif', '.bmp', '.tiff', '.tif', '.webp',
     '.heic', '.heif', '.svg', '.ico', '.jfif', '.pjpeg', '.pjp', '.avif'
 }
 VIDEO_EXTENSIONS = {

src/utils/network_utils.py

@@ -196,10 +196,9 @@ def get_link_platform(url):
         if 'twitter.com' in domain or 'x.com' in domain: return 'twitter/x'
         if 'discord.gg' in domain or 'discord.com/invite' in domain: return 'discord invite'
         if 'pixiv.net' in domain: return 'pixiv'
-        if 'kemono.su' in domain or 'kemono.party' in domain: return 'kemono'
+        if 'kemono.su' in domain or 'kemono.party' in domain or 'kemono.cr' in domain: return 'kemono'
-        if 'coomer.su' in domain or 'coomer.party' in domain: return 'coomer'
+        if 'coomer.su' in domain or 'coomer.party' in domain or 'coomer.st' in domain: return 'coomer'
         
-        # Fallback to a generic name for other domains
         parts = domain.split('.')
         if len(parts) >= 2:
             return parts[-2]

src/utils/resolution.py

@@ -0,0 +1,587 @@
+# src/ui/utils/resolution.py
+
+# --- Standard Library Imports ---
+import os
+
+# --- PyQt5 Imports ---
+from PyQt5.QtWidgets import (
+    QSplitter, QScrollArea, QFrame, QWidget, QVBoxLayout, QHBoxLayout, QLabel,
+    QLineEdit, QPushButton, QStackedWidget, QButtonGroup, QRadioButton, QCheckBox,
+    QListWidget, QTextEdit, QApplication
+)
+from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QIntValidator, QFont # <-- Import QFont
+
+# --- Local Application Imports ---
+# Assuming execution from project root
+from ..config.constants import *
+
+
+def setup_ui(main_app):
+    """
+    Initializes and scales the user interface for the DownloaderApp.
+    
+    Args:
+        main_app: The instance of the main DownloaderApp.
+    """
+    scale = float(main_app.settings.value(UI_SCALE_KEY, 1.0))
+    main_app.scale_factor = scale
+
+    default_font = QApplication.font()
+    base_font_size = 9 # Use a standard base size
+    default_font.setPointSize(int(base_font_size * scale))
+    main_app.setFont(default_font)
+
+    default_font = QApplication.font()
+    base_font_size = 9 # Use a standard base size
+    default_font.setPointSize(int(base_font_size * scale))
+    main_app.setFont(default_font)
+    # --- END: Improved Scaling Logic ---
+
+    main_app.main_splitter = QSplitter(Qt.Horizontal)
+    
+    # --- Use a scroll area for the left panel for consistency ---
+    left_scroll_area = QScrollArea()
+    left_scroll_area.setWidgetResizable(True)
+    left_scroll_area.setFrameShape(QFrame.NoFrame)
+
+    left_panel_widget = QWidget()
+    left_layout = QVBoxLayout(left_panel_widget)
+    left_scroll_area.setWidget(left_panel_widget)
+
+    right_panel_widget = QWidget()
+    right_layout = QVBoxLayout(right_panel_widget)
+    
+    left_layout.setContentsMargins(10, 10, 10, 10)
+    right_layout.setContentsMargins(10, 10, 10, 10)
+    apply_theme_to_app(main_app, main_app.current_theme, initial_load=True)
+
+    # --- URL and Page Range ---
+    main_app.url_input_widget = QWidget()
+    url_input_layout = QHBoxLayout(main_app.url_input_widget)
+    url_input_layout.setContentsMargins(0, 0, 0, 0)
+    main_app.url_label_widget = QLabel()
+    url_input_layout.addWidget(main_app.url_label_widget)
+    main_app.link_input = QLineEdit()
+    main_app.link_input.setPlaceholderText("e.g., https://kemono.su/patreon/user/12345 or .../post/98765")
+    main_app.link_input.textChanged.connect(main_app.update_custom_folder_visibility)
+    url_input_layout.addWidget(main_app.link_input, 1)
+    main_app.empty_popup_button = QPushButton("🎨")
+    special_font_size = int(9.5 * scale) 
+    main_app.empty_popup_button.setStyleSheet(f"""
+        padding: {4*scale}px {6*scale}px;
+        font-size: {special_font_size}pt;
+    """)
+    main_app.empty_popup_button.clicked.connect(main_app._show_empty_popup)
+    url_input_layout.addWidget(main_app.empty_popup_button)
+    main_app.page_range_label = QLabel(main_app._tr("page_range_label_text", "Page Range:"))
+    main_app.page_range_label.setStyleSheet("font-weight: bold; padding-left: 10px;")
+    url_input_layout.addWidget(main_app.page_range_label)
+    main_app.start_page_input = QLineEdit()
+    main_app.start_page_input.setPlaceholderText(main_app._tr("start_page_input_placeholder", "Start"))
+    main_app.start_page_input.setFixedWidth(int(50 * scale))
+    main_app.start_page_input.setValidator(QIntValidator(1, 99999))
+    url_input_layout.addWidget(main_app.start_page_input)
+    main_app.to_label = QLabel(main_app._tr("page_range_to_label_text", "to"))
+    url_input_layout.addWidget(main_app.to_label)
+    main_app.end_page_input = QLineEdit()
+    main_app.end_page_input.setPlaceholderText(main_app._tr("end_page_input_placeholder", "End"))
+    main_app.end_page_input.setFixedWidth(int(50 * scale))
+    main_app.end_page_input.setToolTip(main_app._tr("end_page_input_tooltip", "For creator URLs: Specify the ending page number..."))
+    main_app.end_page_input.setValidator(QIntValidator(1, 99999))
+    url_input_layout.addWidget(main_app.end_page_input)
+    main_app.url_placeholder_widget = QWidget()
+    placeholder_layout = QHBoxLayout(main_app.url_placeholder_widget)
+    placeholder_layout.setContentsMargins(0, 0, 0, 0)
+    main_app.fav_mode_active_label = QLabel(main_app._tr("fav_mode_active_label_text", "⭐ Favorite Mode is active..."))
+    main_app.fav_mode_active_label.setAlignment(Qt.AlignCenter)
+    placeholder_layout.addWidget(main_app.fav_mode_active_label)
+    main_app.url_or_placeholder_stack = QStackedWidget()
+    main_app.url_or_placeholder_stack.addWidget(main_app.url_input_widget)
+    main_app.url_or_placeholder_stack.addWidget(main_app.url_placeholder_widget)
+    left_layout.addWidget(main_app.url_or_placeholder_stack)
+
+    # --- Download Location ---
+    main_app.download_location_label_widget = QLabel()
+    left_layout.addWidget(main_app.download_location_label_widget)
+    dir_layout = QHBoxLayout()
+    main_app.dir_input = QLineEdit()
+    main_app.dir_input.setPlaceholderText("Select folder where downloads will be saved")
+    main_app.dir_button = QPushButton("Browse...")
+    main_app.dir_button.clicked.connect(main_app.browse_directory)
+    dir_layout.addWidget(main_app.dir_input, 1)
+    dir_layout.addWidget(main_app.dir_button)
+    left_layout.addLayout(dir_layout)
+
+    # --- Filters and Custom Folder Container ---
+    main_app.filters_and_custom_folder_container_widget = QWidget()
+    filters_and_custom_folder_layout = QHBoxLayout(main_app.filters_and_custom_folder_container_widget)
+    filters_and_custom_folder_layout.setContentsMargins(0, 5, 0, 0)
+    filters_and_custom_folder_layout.setSpacing(10)
+    main_app.character_filter_widget = QWidget()
+    character_filter_v_layout = QVBoxLayout(main_app.character_filter_widget)
+    character_filter_v_layout.setContentsMargins(0, 0, 0, 0)
+    character_filter_v_layout.setSpacing(2)
+    main_app.character_label = QLabel("🎯 Filter by Character(s) (comma-separated):")
+    character_filter_v_layout.addWidget(main_app.character_label)
+    char_input_and_button_layout = QHBoxLayout()
+    char_input_and_button_layout.setContentsMargins(0, 0, 0, 0)
+    char_input_and_button_layout.setSpacing(10)
+    main_app.character_input = QLineEdit()
+    main_app.character_input.setPlaceholderText("e.g., Tifa, Aerith, (Cloud, Zack)")
+    char_input_and_button_layout.addWidget(main_app.character_input, 3)
+    main_app.char_filter_scope_toggle_button = QPushButton()
+    main_app._update_char_filter_scope_button_text()
+    char_input_and_button_layout.addWidget(main_app.char_filter_scope_toggle_button, 1)
+    character_filter_v_layout.addLayout(char_input_and_button_layout)
+    
+    # --- Custom Folder Widget Definition ---
+    main_app.custom_folder_widget = QWidget()
+    custom_folder_v_layout = QVBoxLayout(main_app.custom_folder_widget)
+    custom_folder_v_layout.setContentsMargins(0, 0, 0, 0)
+    custom_folder_v_layout.setSpacing(2)
+    main_app.custom_folder_label = QLabel("🗄️ Custom Folder Name (Single Post Only):")
+    main_app.custom_folder_input = QLineEdit()
+    main_app.custom_folder_input.setPlaceholderText("Optional: Save this post to specific folder")
+    custom_folder_v_layout.addWidget(main_app.custom_folder_label)
+    custom_folder_v_layout.addWidget(main_app.custom_folder_input)
+    main_app.custom_folder_widget.setVisible(False)
+    
+    filters_and_custom_folder_layout.addWidget(main_app.character_filter_widget, 1)
+    filters_and_custom_folder_layout.addWidget(main_app.custom_folder_widget, 1)
+    left_layout.addWidget(main_app.filters_and_custom_folder_container_widget)
+
+    # --- Word Manipulation Container ---
+    word_manipulation_container_widget = QWidget()
+    word_manipulation_outer_layout = QHBoxLayout(word_manipulation_container_widget)
+    word_manipulation_outer_layout.setContentsMargins(0, 0, 0, 0)
+    word_manipulation_outer_layout.setSpacing(15)
+    skip_words_widget = QWidget()
+    skip_words_vertical_layout = QVBoxLayout(skip_words_widget)
+    skip_words_vertical_layout.setContentsMargins(0, 0, 0, 0)
+    skip_words_vertical_layout.setSpacing(2)
+    main_app.skip_words_label_widget = QLabel()
+    skip_words_vertical_layout.addWidget(main_app.skip_words_label_widget)
+    skip_input_and_button_layout = QHBoxLayout()
+    skip_input_and_button_layout.setContentsMargins(0, 0, 0, 0)
+    skip_input_and_button_layout.setSpacing(10)
+    main_app.skip_words_input = QLineEdit()
+    main_app.skip_words_input.setPlaceholderText("e.g., WM, WIP, sketch, preview")
+    skip_input_and_button_layout.addWidget(main_app.skip_words_input, 1)
+    main_app.skip_scope_toggle_button = QPushButton()
+    main_app._update_skip_scope_button_text()
+    skip_input_and_button_layout.addWidget(main_app.skip_scope_toggle_button, 0)
+    skip_words_vertical_layout.addLayout(skip_input_and_button_layout)
+    word_manipulation_outer_layout.addWidget(skip_words_widget, 7)
+    remove_words_widget = QWidget()
+    remove_words_vertical_layout = QVBoxLayout(remove_words_widget)
+    remove_words_vertical_layout.setContentsMargins(0, 0, 0, 0)
+    remove_words_vertical_layout.setSpacing(2)
+    main_app.remove_from_filename_label_widget = QLabel()
+    remove_words_vertical_layout.addWidget(main_app.remove_from_filename_label_widget)
+    main_app.remove_from_filename_input = QLineEdit()
+    main_app.remove_from_filename_input.setPlaceholderText("e.g., patreon, HD")
+    remove_words_vertical_layout.addWidget(main_app.remove_from_filename_input)
+    word_manipulation_outer_layout.addWidget(remove_words_widget, 3)
+    left_layout.addWidget(word_manipulation_container_widget)
+
+    # --- File Filter Layout ---
+    file_filter_layout = QVBoxLayout()
+    file_filter_layout.setContentsMargins(0, 10, 0, 0)
+    file_filter_layout.addWidget(QLabel("Filter Files:"))
+    radio_button_layout = QHBoxLayout()
+    radio_button_layout.setSpacing(10)
+    main_app.radio_group = QButtonGroup(main_app)
+    main_app.radio_all = QRadioButton("All")
+    main_app.radio_images = QRadioButton("Images/GIFs")
+    main_app.radio_videos = QRadioButton("Videos")
+    main_app.radio_only_archives = QRadioButton("📦 Only Archives")
+    main_app.radio_only_audio = QRadioButton("🎧 Only Audio")
+    main_app.radio_only_links = QRadioButton("🔗 Only Links")
+    main_app.radio_more = QRadioButton("More") 
+
+    main_app.radio_all.setChecked(True)
+    for btn in [main_app.radio_all, main_app.radio_images, main_app.radio_videos, main_app.radio_only_archives, main_app.radio_only_audio, main_app.radio_only_links, main_app.radio_more]:
+        main_app.radio_group.addButton(btn)
+        radio_button_layout.addWidget(btn)
+    main_app.favorite_mode_checkbox = QCheckBox()
+    main_app.favorite_mode_checkbox.setChecked(False)
+    radio_button_layout.addWidget(main_app.favorite_mode_checkbox)
+    radio_button_layout.addStretch(1)
+    file_filter_layout.addLayout(radio_button_layout)
+    left_layout.addLayout(file_filter_layout)
+
+    # --- Checkboxes Group ---
+    checkboxes_group_layout = QVBoxLayout()
+    checkboxes_group_layout.setSpacing(10)
+    row1_layout = QHBoxLayout()
+    row1_layout.setSpacing(10)
+    main_app.skip_zip_checkbox = QCheckBox("Skip archives")
+    main_app.skip_zip_checkbox.setToolTip("Skip Common Archives (Eg.. Zip, Rar, 7z)")
+    main_app.skip_zip_checkbox.setChecked(True)
+    row1_layout.addWidget(main_app.skip_zip_checkbox)
+    main_app.download_thumbnails_checkbox = QCheckBox("Download Thumbnails Only")
+    row1_layout.addWidget(main_app.download_thumbnails_checkbox)
+    main_app.scan_content_images_checkbox = QCheckBox("Scan Content for Images")
+    main_app.scan_content_images_checkbox.setChecked(main_app.scan_content_images_setting)
+    row1_layout.addWidget(main_app.scan_content_images_checkbox)
+    main_app.compress_images_checkbox = QCheckBox("Compress to WebP")
+    main_app.compress_images_checkbox.setToolTip("Compress images > 1.5MB to WebP format (requires Pillow).")
+    row1_layout.addWidget(main_app.compress_images_checkbox)
+    main_app.keep_duplicates_checkbox = QCheckBox("Keep Duplicates")
+    main_app.keep_duplicates_checkbox.setToolTip("If checked, downloads all files from a post even if they have the same name.")
+    row1_layout.addWidget(main_app.keep_duplicates_checkbox)
+    row1_layout.addStretch(1)
+    checkboxes_group_layout.addLayout(row1_layout)
+
+    # --- Advanced Settings ---
+    advanced_settings_label = QLabel("⚙️ Advanced Settings:")
+    checkboxes_group_layout.addWidget(advanced_settings_label)
+    advanced_row1_layout = QHBoxLayout()
+    advanced_row1_layout.setSpacing(10)
+
+    # --- REORDERED CHECKBOXES ---
+    main_app.use_subfolder_per_post_checkbox = QCheckBox("Subfolder per Post")
+    main_app.use_subfolder_per_post_checkbox.toggled.connect(main_app.update_ui_for_subfolders)
+    main_app.use_subfolder_per_post_checkbox.setChecked(True)    
+    advanced_row1_layout.addWidget(main_app.use_subfolder_per_post_checkbox)
+
+    main_app.date_prefix_checkbox = QCheckBox("Date Prefix")
+    main_app.date_prefix_checkbox.setToolTip("When 'Subfolder per Post' is active, prefix the folder name with the post's upload date.")
+    advanced_row1_layout.addWidget(main_app.date_prefix_checkbox)
+    
+    main_app.use_subfolders_checkbox = QCheckBox("Separate Folders by Known.txt")
+    main_app.use_subfolders_checkbox.setChecked(False)
+    main_app.use_subfolders_checkbox.toggled.connect(main_app.update_ui_for_subfolders)
+    advanced_row1_layout.addWidget(main_app.use_subfolders_checkbox)
+    # --- END REORDER ---
+
+    main_app.use_cookie_checkbox = QCheckBox("Use Cookie")
+    main_app.use_cookie_checkbox.setChecked(main_app.use_cookie_setting)
+    main_app.cookie_text_input = QLineEdit()
+    main_app.cookie_text_input.setPlaceholderText("if no Select cookies.txt)")
+    main_app.cookie_text_input.setText(main_app.cookie_text_setting)
+    advanced_row1_layout.addWidget(main_app.use_cookie_checkbox)
+    advanced_row1_layout.addWidget(main_app.cookie_text_input, 2)
+    main_app.cookie_browse_button = QPushButton("Browse...")
+    main_app.cookie_browse_button.setFixedWidth(int(80 * scale))
+    advanced_row1_layout.addWidget(main_app.cookie_browse_button)
+    advanced_row1_layout.addStretch(1)
+    checkboxes_group_layout.addLayout(advanced_row1_layout)
+    advanced_row2_layout = QHBoxLayout()
+    advanced_row2_layout.setSpacing(10)
+    multithreading_layout = QHBoxLayout()
+    multithreading_layout.setContentsMargins(0, 0, 0, 0)
+    main_app.use_multithreading_checkbox = QCheckBox("Use Multithreading")
+    main_app.use_multithreading_checkbox.setChecked(True)
+    multithreading_layout.addWidget(main_app.use_multithreading_checkbox)
+    main_app.thread_count_label = QLabel("Threads:")
+    multithreading_layout.addWidget(main_app.thread_count_label)
+    main_app.thread_count_input = QLineEdit("4")
+    main_app.thread_count_input.setFixedWidth(int(40 * scale))
+    main_app.thread_count_input.setValidator(QIntValidator(1, MAX_THREADS))
+    multithreading_layout.addWidget(main_app.thread_count_input)
+    advanced_row2_layout.addLayout(multithreading_layout)
+    main_app.external_links_checkbox = QCheckBox("Show External Links in Log")
+    advanced_row2_layout.addWidget(main_app.external_links_checkbox)
+    main_app.manga_mode_checkbox = QCheckBox("Manga/Comic Mode")
+    advanced_row2_layout.addWidget(main_app.manga_mode_checkbox)
+    advanced_row2_layout.addStretch(1)
+    checkboxes_group_layout.addLayout(advanced_row2_layout)
+    left_layout.addLayout(checkboxes_group_layout)
+
+    # --- Action Buttons ---
+    main_app.standard_action_buttons_widget = QWidget()
+    btn_layout = QHBoxLayout(main_app.standard_action_buttons_widget)
+    btn_layout.setContentsMargins(0, 10, 0, 0)
+    btn_layout.setSpacing(10)
+    main_app.download_btn = QPushButton("⬇️ Start Download")
+    font = main_app.download_btn.font()
+    font.setBold(True)
+    main_app.download_btn.setFont(font)
+    main_app.download_btn.clicked.connect(main_app.start_download)
+    main_app.pause_btn = QPushButton("⏸️ Pause Download")
+    main_app.pause_btn.setEnabled(False)
+    main_app.pause_btn.clicked.connect(main_app._handle_pause_resume_action)
+    main_app.cancel_btn = QPushButton("❌ Cancel & Reset UI")
+    main_app.cancel_btn.setEnabled(False)
+    main_app.cancel_btn.clicked.connect(main_app.cancel_download_button_action)
+    main_app.error_btn = QPushButton("Error")
+    main_app.error_btn.setToolTip("View files skipped due to errors and optionally retry them.")
+    main_app.error_btn.setEnabled(True)
+    btn_layout.addWidget(main_app.download_btn)
+    btn_layout.addWidget(main_app.pause_btn)
+    btn_layout.addWidget(main_app.cancel_btn)
+    btn_layout.addWidget(main_app.error_btn)
+    main_app.favorite_action_buttons_widget = QWidget()
+    favorite_buttons_layout = QHBoxLayout(main_app.favorite_action_buttons_widget)
+    main_app.favorite_mode_artists_button = QPushButton("🖼️ Favorite Artists")
+    main_app.favorite_mode_posts_button = QPushButton("📄 Favorite Posts")
+    main_app.favorite_scope_toggle_button = QPushButton()
+    favorite_buttons_layout.addWidget(main_app.favorite_mode_artists_button)
+    favorite_buttons_layout.addWidget(main_app.favorite_mode_posts_button)
+    favorite_buttons_layout.addWidget(main_app.favorite_scope_toggle_button)
+    main_app.bottom_action_buttons_stack = QStackedWidget()
+    main_app.bottom_action_buttons_stack.addWidget(main_app.standard_action_buttons_widget)
+    main_app.bottom_action_buttons_stack.addWidget(main_app.favorite_action_buttons_widget)
+    left_layout.addWidget(main_app.bottom_action_buttons_stack)
+    left_layout.addSpacing(10)
+
+    # --- Known Names Layout ---
+    known_chars_label_layout = QHBoxLayout()
+    known_chars_label_layout.setSpacing(10)
+    main_app.known_chars_label = QLabel("🎭 Known Shows/Characters (for Folder Names):")
+    known_chars_label_layout.addWidget(main_app.known_chars_label)
+    main_app.open_known_txt_button = QPushButton("Open Known.txt")
+    main_app.open_known_txt_button.setFixedWidth(int(120 * scale))
+    known_chars_label_layout.addWidget(main_app.open_known_txt_button)
+    main_app.character_search_input = QLineEdit()
+    main_app.character_search_input.setPlaceholderText("Search characters...")
+    known_chars_label_layout.addWidget(main_app.character_search_input, 1)
+    left_layout.addLayout(known_chars_label_layout)
+    main_app.character_list = QListWidget()
+    main_app.character_list.setSelectionMode(QListWidget.ExtendedSelection)
+    left_layout.addWidget(main_app.character_list, 1)
+    char_manage_layout = QHBoxLayout()
+    char_manage_layout.setSpacing(10)
+    main_app.new_char_input = QLineEdit()
+    main_app.new_char_input.setPlaceholderText("Add new show/character name")
+    main_app.add_char_button = QPushButton("➕ Add")
+    main_app.add_to_filter_button = QPushButton("⤵️ Add to Filter")
+    main_app.add_to_filter_button.setToolTip("Select names... to add to the 'Filter by Character(s)' field.")
+    main_app.delete_char_button = QPushButton("🗑️ Delete Selected")
+    main_app.delete_char_button.setToolTip("Delete the selected name(s)...")
+    main_app.add_char_button.clicked.connect(main_app._handle_ui_add_new_character)
+    main_app.new_char_input.returnPressed.connect(main_app.add_char_button.click)
+    main_app.delete_char_button.clicked.connect(main_app.delete_selected_character)
+    char_manage_layout.addWidget(main_app.new_char_input, 2)
+    char_manage_layout.addWidget(main_app.add_char_button, 0)
+    main_app.known_names_help_button = QPushButton("?")
+    main_app.known_names_help_button.setFixedWidth(int(45 * scale))
+    main_app.known_names_help_button.clicked.connect(main_app._show_feature_guide)
+    main_app.history_button = QPushButton("📜")
+    main_app.history_button.setFixedWidth(int(45 * scale))
+    main_app.history_button.setToolTip(main_app._tr("history_button_tooltip_text", "View download history"))
+    main_app.future_settings_button = QPushButton("⚙️")
+    main_app.future_settings_button.setFixedWidth(int(45 * scale))
+    main_app.future_settings_button.clicked.connect(main_app._show_future_settings_dialog)
+    main_app.support_button = QPushButton("❤️ Support")
+    main_app.support_button.setFixedWidth(int(100 * scale))
+    main_app.support_button.setToolTip("Support the application developer.")
+    char_manage_layout.addWidget(main_app.add_to_filter_button, 1)
+    char_manage_layout.addWidget(main_app.delete_char_button, 1)
+    char_manage_layout.addWidget(main_app.known_names_help_button, 0)
+    char_manage_layout.addWidget(main_app.history_button, 0)
+    char_manage_layout.addWidget(main_app.future_settings_button, 0)
+    char_manage_layout.addWidget(main_app.support_button, 0)
+    left_layout.addLayout(char_manage_layout)
+    left_layout.addStretch(0)
+
+    # --- Right Panel (Logs) ---
+    right_panel_widget.setLayout(right_layout)
+    log_title_layout = QHBoxLayout()
+    main_app.progress_log_label = QLabel("📜 Progress Log:")
+    log_title_layout.addWidget(main_app.progress_log_label)
+    log_title_layout.addStretch(1)
+    main_app.link_search_input = QLineEdit()
+    main_app.link_search_input.setPlaceholderText("Search Links...")
+    main_app.link_search_input.setVisible(False)
+    log_title_layout.addWidget(main_app.link_search_input)
+    main_app.link_search_button = QPushButton("<EFBFBD>")
+    main_app.link_search_button.setVisible(False)
+    main_app.link_search_button.setFixedWidth(int(30 * scale))
+    log_title_layout.addWidget(main_app.link_search_button)
+    main_app.manga_rename_toggle_button = QPushButton()
+    main_app.manga_rename_toggle_button.setVisible(False)
+    main_app.manga_rename_toggle_button.setFixedWidth(int(140 * scale))
+    main_app._update_manga_filename_style_button_text()
+    log_title_layout.addWidget(main_app.manga_rename_toggle_button)
+    main_app.manga_date_prefix_input = QLineEdit()
+    main_app.manga_date_prefix_input.setPlaceholderText("Prefix for Manga Filenames")
+    main_app.manga_date_prefix_input.setVisible(False)
+    log_title_layout.addWidget(main_app.manga_date_prefix_input)
+    main_app.multipart_toggle_button = QPushButton()
+    main_app.multipart_toggle_button.setToolTip("Toggle between Multi-part and Single-stream downloads for large files.")
+    main_app.multipart_toggle_button.setFixedWidth(int(130 * scale))
+    main_app._update_multipart_toggle_button_text()
+    log_title_layout.addWidget(main_app.multipart_toggle_button)
+    main_app.EYE_ICON = "\U0001F441"
+    main_app.CLOSED_EYE_ICON = "\U0001F648"
+    main_app.log_verbosity_toggle_button = QPushButton(main_app.EYE_ICON)
+    main_app.log_verbosity_toggle_button.setFixedWidth(int(45 * scale))
+    main_app.log_verbosity_toggle_button.setStyleSheet(f"font-size: {11 * scale}pt; padding: {4 * scale}px {2 * scale}px;")
+    log_title_layout.addWidget(main_app.log_verbosity_toggle_button)
+    main_app.reset_button = QPushButton("🔄 Reset")
+    main_app.reset_button.setFixedWidth(int(80 * scale))
+    log_title_layout.addWidget(main_app.reset_button)
+    right_layout.addLayout(log_title_layout)
+    main_app.log_splitter = QSplitter(Qt.Vertical)
+    main_app.log_view_stack = QStackedWidget()
+    main_app.main_log_output = QTextEdit()
+    main_app.main_log_output.setReadOnly(True)
+    main_app.main_log_output.setLineWrapMode(QTextEdit.NoWrap)
+    main_app.log_view_stack.addWidget(main_app.main_log_output)
+    main_app.missed_character_log_output = QTextEdit()
+    main_app.missed_character_log_output.setReadOnly(True)
+    main_app.missed_character_log_output.setLineWrapMode(QTextEdit.NoWrap)
+    main_app.log_view_stack.addWidget(main_app.missed_character_log_output)
+    main_app.external_log_output = QTextEdit()
+    main_app.external_log_output.setReadOnly(True)
+    main_app.external_log_output.setLineWrapMode(QTextEdit.NoWrap)
+    main_app.external_log_output.hide()
+    main_app.log_splitter.addWidget(main_app.log_view_stack)
+    main_app.log_splitter.addWidget(main_app.external_log_output)
+    main_app.log_splitter.setSizes([main_app.height(), 0])
+    right_layout.addWidget(main_app.log_splitter, 1)
+    export_button_layout = QHBoxLayout()
+    export_button_layout.addStretch(1)
+    main_app.export_links_button = QPushButton(main_app._tr("export_links_button_text", "Export Links"))
+    main_app.export_links_button.setFixedWidth(int(100 * scale))
+    main_app.export_links_button.setEnabled(False)
+    main_app.export_links_button.setVisible(False)
+    export_button_layout.addWidget(main_app.export_links_button)
+    main_app.download_extracted_links_button = QPushButton(main_app._tr("download_extracted_links_button_text", "Download"))
+    main_app.download_extracted_links_button.setFixedWidth(int(100 * scale))
+    main_app.download_extracted_links_button.setEnabled(False)
+    main_app.download_extracted_links_button.setVisible(False)
+    export_button_layout.addWidget(main_app.download_extracted_links_button)
+    main_app.log_display_mode_toggle_button = QPushButton()
+    main_app.log_display_mode_toggle_button.setFixedWidth(int(120 * scale))
+    main_app.log_display_mode_toggle_button.setVisible(False)
+    export_button_layout.addWidget(main_app.log_display_mode_toggle_button)
+    right_layout.addLayout(export_button_layout)
+    main_app.progress_label = QLabel("Progress: Idle")
+    main_app.progress_label.setStyleSheet("padding-top: 5px; font-style: italic;")
+    right_layout.addWidget(main_app.progress_label)
+    main_app.file_progress_label = QLabel("")
+    main_app.file_progress_label.setToolTip("Shows the progress of individual file downloads, including speed and size.")
+    main_app.file_progress_label.setWordWrap(True)
+    main_app.file_progress_label.setStyleSheet("padding-top: 2px; font-style: italic; color: #A0A0A0;")
+    right_layout.addWidget(main_app.file_progress_label)
+
+    # --- Final Assembly ---
+    main_app.main_splitter.addWidget(left_scroll_area)
+    main_app.main_splitter.addWidget(right_panel_widget)
+    
+    if main_app.width() >= 1920:
+        # For wider resolutions, give more space to the log panel (right).
+        main_app.main_splitter.setStretchFactor(0, 4)
+        main_app.main_splitter.setStretchFactor(1, 6)
+    else:
+        # Default for lower resolutions, giving more space to controls (left).
+        main_app.main_splitter.setStretchFactor(0, 7)
+        main_app.main_splitter.setStretchFactor(1, 3)
+
+
+    top_level_layout = QHBoxLayout(main_app)
+    top_level_layout.setContentsMargins(0, 0, 0, 0)
+    top_level_layout.addWidget(main_app.main_splitter)
+
+    # --- Initial UI State Updates ---
+    main_app.update_ui_for_subfolders(main_app.use_subfolders_checkbox.isChecked())
+    main_app.update_external_links_setting(main_app.external_links_checkbox.isChecked())
+    main_app.update_multithreading_label(main_app.thread_count_input.text())
+    main_app.update_page_range_enabled_state()
+    if main_app.manga_mode_checkbox:
+        main_app.update_ui_for_manga_mode(main_app.manga_mode_checkbox.isChecked())
+    if hasattr(main_app, 'link_input'):
+        main_app.link_input.textChanged.connect(lambda: main_app.update_ui_for_manga_mode(main_app.manga_mode_checkbox.isChecked() if main_app.manga_mode_checkbox else False))
+    main_app._load_creator_name_cache_from_json()
+    main_app.load_known_names_from_util()
+    main_app._update_cookie_input_visibility(main_app.use_cookie_checkbox.isChecked() if hasattr(main_app, 'use_cookie_checkbox') else False)
+    main_app._handle_multithreading_toggle(main_app.use_multithreading_checkbox.isChecked())
+    if hasattr(main_app, 'radio_group') and main_app.radio_group.checkedButton():
+        main_app._handle_filter_mode_change(main_app.radio_group.checkedButton(), True)
+        main_app.radio_group.buttonToggled.connect(main_app._handle_more_options_toggled)
+        
+    main_app._update_manga_filename_style_button_text()
+    main_app._update_skip_scope_button_text()
+    main_app._update_char_filter_scope_button_text()
+    main_app._update_multithreading_for_date_mode()
+    if hasattr(main_app, 'download_thumbnails_checkbox'):
+        main_app._handle_thumbnail_mode_change(main_app.download_thumbnails_checkbox.isChecked())
+    if hasattr(main_app, 'favorite_mode_checkbox'):
+        main_app._handle_favorite_mode_toggle(False)
+
+def get_dark_theme(scale=1):
+    """
+    Generates the stylesheet for the dark theme, scaled by the given factor.
+    """
+    # Adjust base font size for better readability
+    font_size_base = 9.5
+    font_size_small_base = 8.5
+    
+    # Apply scaling
+    font_size = int(font_size_base * scale)
+    font_size_small = int(font_size_small_base * scale)
+    line_edit_padding = int(5 * scale)
+    button_padding_v = int(5 * scale)
+    button_padding_h = int(12 * scale)
+    tooltip_padding = int(4 * scale)
+    indicator_size = int(14 * scale)
+    
+    return f"""
+    QWidget {{ 
+        background-color: #2E2E2E; 
+        color: #E0E0E0; 
+        font-family: Segoe UI, Arial, sans-serif; 
+        font-size: {font_size}pt;
+    }}
+    QLineEdit, QListWidget, QTextEdit {{ 
+        background-color: #3C3F41; 
+        border: 1px solid #5A5A5A; 
+        padding: {line_edit_padding}px; 
+        color: #F0F0F0; 
+        border-radius: 4px; 
+        font-size: {font_size}pt; 
+    }}
+    QTextEdit {{
+        font-family: Consolas, Courier New, monospace;
+    }}
+    QPushButton {{ 
+        background-color: #555; 
+        color: #F0F0F0; 
+        border: 1px solid #6A6A6A; 
+        padding: {button_padding_v}px {button_padding_h}px; 
+        border-radius: 4px; 
+    }}
+    QPushButton:hover {{ background-color: #656565; border: 1px solid #7A7A7A; }}
+    QPushButton:pressed {{ background-color: #4A4A4A; }}
+    QPushButton:disabled {{ background-color: #404040; color: #888; border-color: #555; }}
+    QLabel {{ font-weight: bold; color: #C0C0C0; }}
+    QRadioButton, QCheckBox {{ spacing: {int(5 * scale)}px; color: #E0E0E0; }}
+    QRadioButton::indicator, QCheckBox::indicator {{ width: {indicator_size}px; height: {indicator_size}px; }}
+    QListWidget {{ alternate-background-color: #353535; }}
+    QListWidget::item:selected {{ background-color: #007ACC; color: #FFFFFF; }}
+    QToolTip {{ 
+        background-color: #4A4A4A; 
+        color: #F0F0F0; 
+        border: 1px solid #6A6A6A; 
+        padding: {tooltip_padding}px; 
+        border-radius: 3px; 
+        font-size: {font_size}pt;
+    }}
+    QSplitter::handle {{ background-color: #5A5A5A; }}
+    QSplitter::handle:horizontal {{ width: {int(5 * scale)}px; }}
+    QSplitter::handle:vertical {{ height: {int(5 * scale)}px; }}
+    """
+
+def apply_theme_to_app(main_app, theme_name, initial_load=False):
+    """
+    Applies the selected theme and scaling to the main application window.
+    """
+    main_app.current_theme = theme_name
+    if not initial_load:
+        main_app.settings.setValue(THEME_KEY, theme_name)
+        main_app.settings.sync()
+
+    if theme_name == "dark":
+        scale = getattr(main_app, 'scale_factor', 1)
+        main_app.setStyleSheet(get_dark_theme(scale))
+        if not initial_load:
+            main_app.log_signal.emit("🎨 Switched to Dark Mode.")
+    else:
+        main_app.setStyleSheet("")
+        if not initial_load:
+            main_app.log_signal.emit("🎨 Switched to Light Mode.")
+    main_app.update()