Commit

src/config/constants.py

@@ -68,6 +68,15 @@ DISCORD_TOKEN_KEY = "discord/token"
 
 POST_DOWNLOAD_ACTION_KEY = "postDownloadAction"
 
+
+# --- Proxy / Network Keys ---
+PROXY_ENABLED_KEY = "proxy/enabled"
+PROXY_HOST_KEY = "proxy/host"
+PROXY_PORT_KEY = "proxy/port"
+PROXY_USERNAME_KEY = "proxy/username"
+PROXY_PASSWORD_KEY = "proxy/password"
+PROXY_TYPE_KEY = "proxy_type"
+
 # --- UI Constants and Identifiers ---
 HTML_PREFIX = "<!HTML!>"
 LOG_DISPLAY_LINKS = "links"

src/core/Hentai2read_client.py

@@ -1,8 +1,6 @@
-# src/core/Hentai2read_client.py
-
 import re
 import os
-import time
+import time 
 import cloudscraper
 from bs4 import BeautifulSoup
 from urllib.parse import urljoin
@@ -12,10 +10,9 @@ import queue
 def run_hentai2read_download(start_url, output_dir, progress_callback, overall_progress_callback, check_pause_func):
     """
     Orchestrates the download process using a producer-consumer model.
-    The main thread scrapes image URLs and puts them in a queue.
-    A pool of worker threads consumes from the queue to download images concurrently.
     """
     scraper = cloudscraper.create_scraper()
+    all_failed_files = [] # Track all failures across chapters
     
     try:
         progress_callback("   [Hentai2Read] Scraping series page for all metadata...")
@@ -41,8 +38,7 @@ def run_hentai2read_download(start_url, output_dir, progress_callback, overall_p
             final_save_path = os.path.join(output_dir, series_folder, chapter_folder)
             os.makedirs(final_save_path, exist_ok=True)
             
-            # This function now scrapes and downloads simultaneously
-            dl_count, skip_count = _process_and_download_chapter(
+            dl_count, skip_count, chapter_failures = _process_and_download_chapter(
                 chapter_url=chapter['url'],
                 save_path=final_save_path,
                 scraper=scraper,
@@ -53,9 +49,22 @@ def run_hentai2read_download(start_url, output_dir, progress_callback, overall_p
             total_downloaded_count += dl_count
             total_skipped_count += skip_count
             
+            if chapter_failures:
+                all_failed_files.extend(chapter_failures)
+            
             overall_progress_callback(total_chapters, idx + 1)
             if check_pause_func(): break
         
+        # --- FINAL SUMMARY OF FAILURES ---
+        if all_failed_files:
+            progress_callback("\n" + "="*40)
+            progress_callback(f"❌ SUMMARY: {len(all_failed_files)} files failed permanently after 10 retries:")
+            for fail_msg in all_failed_files:
+                progress_callback(f"   • {fail_msg}")
+            progress_callback("="*40 + "\n")
+        else:
+            progress_callback("\n✅ All chapters processed successfully with no permanent failures.")
+
         return total_downloaded_count, total_skipped_count
 
     except Exception as e:
@@ -66,30 +75,65 @@ def _get_series_metadata(start_url, progress_callback, scraper):
     """
     Scrapes the main series page to get the Artist Name, Series Title, and chapter list.
     """
-    try:
-        response = scraper.get(start_url, timeout=30)
-        response.raise_for_status()
-        soup = BeautifulSoup(response.text, 'html.parser')
+    max_retries = 4
+    last_exception = None
+    soup = None
 
+    for attempt in range(max_retries):
+        try:
+            if attempt > 0:
+                progress_callback(f"   [Hentai2Read] ⚠️ Retrying connection (Attempt {attempt + 1}/{max_retries})...")
+            
+            response = scraper.get(start_url, timeout=30)
+            response.raise_for_status()
+            soup = BeautifulSoup(response.text, 'html.parser')
+            last_exception = None
+            break
+
+        except Exception as e:
+            last_exception = e
+            progress_callback(f"   [Hentai2Read] ⚠️ Connection attempt {attempt + 1} failed: {e}")
+            if attempt < max_retries - 1:
+                time.sleep(2 * (attempt + 1))
+            continue
+
+    if last_exception:
+        progress_callback(f"   [Hentai2Read] ❌ Error getting series metadata after {max_retries} attempts: {last_exception}")
+        return "Unknown Series", []
+
+    try:
         series_title = "Unknown Series"
         artist_name = None
-        metadata_list = soup.select_one("ul.list.list-simple-mini")
-        
-        if metadata_list:
-            first_li = metadata_list.find('li', recursive=False)
-            if first_li and not first_li.find('a'):
-                series_title = first_li.get_text(strip=True)
 
+        # 1. Try fetching Title
+        title_tag = soup.select_one("h3.block-title a")
+        if title_tag:
+            series_title = title_tag.get_text(strip=True)
+        else:
+            meta_title = soup.select_one("meta[property='og:title']")
+            if meta_title:
+                series_title = meta_title.get("content", "Unknown Series").replace(" - Hentai2Read", "")
+
+        # 2. Try fetching Artist
+        metadata_list = soup.select_one("ul.list.list-simple-mini")
+        if metadata_list:
             for b_tag in metadata_list.find_all('b'):
                 label = b_tag.get_text(strip=True)
-                if label in ("Artist", "Author"):
+                if "Artist" in label or "Author" in label:
                     a_tag = b_tag.find_next_sibling('a')
                     if a_tag:
                         artist_name = a_tag.get_text(strip=True)
-                        if label == "Artist":
-                            break
+                        break
         
-        top_level_folder_name = artist_name if artist_name else series_title
+        if not artist_name:
+            artist_link = soup.find('a', href=re.compile(r'/hentai-list/artist/'))
+            if artist_link:
+                artist_name = artist_link.get_text(strip=True)
+
+        if artist_name:
+            top_level_folder_name = f"{artist_name} - {series_title}"
+        else:
+            top_level_folder_name = series_title
         
         chapter_links = soup.select("div.media a.pull-left.font-w600")
         if not chapter_links:
@@ -101,107 +145,148 @@ def _get_series_metadata(start_url, progress_callback, scraper):
             ]
             chapters_to_process.reverse()
 
-        progress_callback(f"   [Hentai2Read] ✅ Found Artist/Series: '{top_level_folder_name}'")
+        progress_callback(f"   [Hentai2Read] ✅ Found Metadata: '{top_level_folder_name}'")
         progress_callback(f"   [Hentai2Read] ✅ Found {len(chapters_to_process)} chapters to process.")
         
         return top_level_folder_name, chapters_to_process
 
     except Exception as e:
-        progress_callback(f"   [Hentai2Read] ❌ Error getting series metadata: {e}")
+        progress_callback(f"   [Hentai2Read] ❌ Error parsing metadata after successful connection: {e}")
         return "Unknown Series", []
 
-### NEW: This function contains the pipeline logic ###
 def _process_and_download_chapter(chapter_url, save_path, scraper, progress_callback, check_pause_func):
     """
     Uses a producer-consumer pattern to download a chapter.
-    The main thread (producer) scrapes URLs one by one.
-    Worker threads (consumers) download the URLs as they are found.
+    Includes RETRY LOGIC and ACTIVE LOGGING.
     """
     task_queue = queue.Queue()
     num_download_threads = 8
     
-    # These will be updated by the worker threads
     download_stats = {'downloaded': 0, 'skipped': 0}
+    failed_files_list = [] 
 
     def downloader_worker():
-        """The function that each download thread will run."""
-        # Create a unique session for each thread to avoid conflicts
         worker_scraper = cloudscraper.create_scraper()
         while True:
-            try:
-                # Get a task from the queue
-                task = task_queue.get()
-                # The sentinel value to signal the end
-                if task is None:
-                    break
-                
-                filepath, img_url = task
-                if os.path.exists(filepath):
-                    progress_callback(f"   -> Skip: '{os.path.basename(filepath)}'")
-                    download_stats['skipped'] += 1
-                else:
-                    progress_callback(f"   Downloading: '{os.path.basename(filepath)}'...")
+            task = task_queue.get()
+            if task is None:
+                task_queue.task_done()
+                break
+            
+            filepath, img_url = task
+            filename = os.path.basename(filepath)
+            
+            if os.path.exists(filepath):
+                # We log skips to show it's checking files
+                progress_callback(f"   -> Skip (Exists): '{filename}'")
+                download_stats['skipped'] += 1
+                task_queue.task_done()
+                continue
+
+            # --- RETRY LOGIC START ---
+            success = False
+            # UNCOMMENTED: Log the start of download so you see activity
+            progress_callback(f"   Downloading: '{filename}'...")
+            
+            for attempt in range(10): # Try 10 times
+                try:
+                    if attempt > 0:
+                        progress_callback(f"   ⚠️ Retrying '{filename}' (Attempt {attempt+1}/10)...")
+                        time.sleep(2) 
+
                     response = worker_scraper.get(img_url, stream=True, timeout=60, headers={'Referer': chapter_url})
                     response.raise_for_status()
+                    
                     with open(filepath, 'wb') as f:
                         for chunk in response.iter_content(chunk_size=8192):
                             f.write(chunk)
+                    
                     download_stats['downloaded'] += 1
-            except Exception as e:
-                progress_callback(f"   ❌ Download failed for task. Error: {e}")
-                download_stats['skipped'] += 1
-            finally:
-                task_queue.task_done()
+                    success = True
+                    # UNCOMMENTED: Log success
+                    progress_callback(f"   ✅ Downloaded: '{filename}'")
+                    break 
+
+                except Exception as e:
+                    if attempt == 9:
+                        progress_callback(f"   ❌ Failed '{filename}' after 10 attempts: {e}")
+            
+            if not success:
+                failed_files_list.append(f"{filename} (Chapter: {os.path.basename(save_path)})")
+                # Clean up empty file if failed
+                if os.path.exists(filepath):
+                    try:
+                        os.remove(filepath)
+                    except OSError: pass
+
+            task_queue.task_done()
 
-    # --- Start the downloader threads ---
     executor = ThreadPoolExecutor(max_workers=num_download_threads, thread_name_prefix='H2R_Downloader')
     for _ in range(num_download_threads):
         executor.submit(downloader_worker)
 
-    # --- Main thread acts as the scraper (producer) ---
     page_number = 1
+    progress_callback("   [Hentai2Read] Scanning pages...") # Initial log
+    
     while True:
         if check_pause_func(): break
-        if page_number > 300: # Safety break
+        if page_number > 300: 
             progress_callback("   [Hentai2Read] ⚠️ Safety break: Reached 300 pages.")
             break
         
+        # Log occasionally to show scanning is alive
+        if page_number % 10 == 0:
+             progress_callback(f"   [Hentai2Read] Scanned {page_number} pages so far...")
+
         page_url_to_check = f"{chapter_url}{page_number}/"
         try:
-            response = scraper.get(page_url_to_check, timeout=30)
-            if response.history or response.status_code != 200:
+            page_response = None
+            page_last_exception = None
+            for page_attempt in range(3): 
+                try:
+                    page_response = scraper.get(page_url_to_check, timeout=30)
+                    page_last_exception = None
+                    break
+                except Exception as e:
+                    page_last_exception = e
+                    time.sleep(1)
+            
+            if page_last_exception:
+                raise page_last_exception
+
+            if page_response.history or page_response.status_code != 200:
                 progress_callback(f"   [Hentai2Read] End of chapter detected on page {page_number}.")
                 break
 
-            soup = BeautifulSoup(response.text, 'html.parser')
+            soup = BeautifulSoup(page_response.text, 'html.parser')
             img_tag = soup.select_one("img#arf-reader")
             img_src = img_tag.get("src") if img_tag else None
 
             if not img_tag or img_src == "https://static.hentai.direct/hentai":
-                progress_callback(f"   [Hentai2Read] End of chapter detected (Placeholder image on page {page_number}).")
+                progress_callback(f"   [Hentai2Read] End of chapter detected (Last page reached at {page_number}).")
                 break
             
-            normalized_img_src = urljoin(response.url, img_src)
+            normalized_img_src = urljoin(page_response.url, img_src)
             ext = os.path.splitext(normalized_img_src.split('/')[-1])[-1] or ".jpg"
             filename = f"{page_number:03d}{ext}"
             filepath = os.path.join(save_path, filename)
             
-            # Put the download task into the queue for a worker to pick up
             task_queue.put((filepath, normalized_img_src))
             
             page_number += 1
-            time.sleep(0.1) # Small delay between scraping pages
+            time.sleep(0.1) 
         except Exception as e:
             progress_callback(f"   [Hentai2Read] ❌ Error while scraping page {page_number}: {e}")
             break
             
-    # --- Shutdown sequence ---
-    # Tell all worker threads to exit by sending the sentinel value
+    # Signal workers to exit
     for _ in range(num_download_threads):
         task_queue.put(None)
     
-    # Wait for all download tasks to be completed
+    # Wait for all tasks to complete
+    task_queue.join()
     executor.shutdown(wait=True)
     
-    progress_callback(f"   Found and processed {page_number - 1} images for this chapter.")
-    return download_stats['downloaded'], download_stats['skipped']
+    progress_callback(f"   Chapter complete. Processed {page_number - 1} images.")
+    
+    return download_stats['downloaded'], download_stats['skipped'], failed_files_list

src/core/allcomic_client.py

@@ -1,36 +1,41 @@
 import requests
 import re
 from bs4 import BeautifulSoup
-import cloudscraper
 import time 
+import random
 from urllib.parse import urlparse
 
-def get_chapter_list(series_url, logger_func):
+# 1. Update arguments to accept proxies=None
+def get_chapter_list(scraper, series_url, logger_func, proxies=None):
     """
     Checks if a URL is a series page and returns a list of all chapter URLs if it is.
-    Includes a retry mechanism for robust connection.
+    Relies on a passed-in scraper session for connection.
     """
     logger_func(f"   [AllComic] Checking for chapter list at: {series_url}")
     
-    scraper = cloudscraper.create_scraper()
+    headers = {'Referer': 'https://allporncomic.com/'}
     response = None
     max_retries = 8
 
+    # 2. Define smart timeout logic
+    req_timeout = (30, 120) if proxies else 30
+
     for attempt in range(max_retries):
         try:
-            response = scraper.get(series_url, timeout=30)
+            # 3. Add proxies, verify=False, and the new timeout
+            response = scraper.get(series_url, headers=headers, timeout=req_timeout, proxies=proxies, verify=False)
             response.raise_for_status()
             logger_func(f"   [AllComic] Successfully connected to series page on attempt {attempt + 1}.")
-            break # Success, exit the loop
+            break 
         except requests.RequestException as e:
             logger_func(f"   [AllComic] ⚠️ Series page check attempt {attempt + 1}/{max_retries} failed: {e}")
             if attempt < max_retries - 1:
-                wait_time = 2 * (attempt + 1)
-                logger_func(f"      Retrying in {wait_time} seconds...")
+                wait_time = (2 ** attempt) + random.uniform(0, 2)
+                logger_func(f"      Retrying in {wait_time:.1f} seconds...")
                 time.sleep(wait_time)
             else:
                 logger_func(f"   [AllComic] ❌ All attempts to check series page failed.")
-                return [] # Return empty on final failure
+                return [] 
     
     if not response:
         return []
@@ -44,7 +49,7 @@ def get_chapter_list(series_url, logger_func):
             return []
 
         chapter_urls = [link['href'] for link in chapter_links]
-        chapter_urls.reverse() # Reverse for oldest-to-newest reading order
+        chapter_urls.reverse() 
         
         logger_func(f"   [AllComic] ✅ Found {len(chapter_urls)} chapters.")
         return chapter_urls
@@ -53,35 +58,46 @@ def get_chapter_list(series_url, logger_func):
         logger_func(f"   [AllComic] ❌ Error parsing chapters after successful connection: {e}")
         return []
 
-def fetch_chapter_data(chapter_url, logger_func):
+# 4. Update arguments here too
+def fetch_chapter_data(scraper, chapter_url, logger_func, proxies=None):
     """
     Fetches the comic title, chapter title, and image URLs for a single chapter page.
+    Relies on a passed-in scraper session for connection.
     """
     logger_func(f"   [AllComic] Fetching page: {chapter_url}")
 
-    scraper = cloudscraper.create_scraper(
-        browser={'browser': 'firefox', 'platform': 'windows', 'desktop': True}
-    )
     headers = {'Referer': 'https://allporncomic.com/'}
     
     response = None
     max_retries = 8
+    
+    # 5. Define smart timeout logic again
+    req_timeout = (30, 120) if proxies else 30
+
     for attempt in range(max_retries):
         try:
-            response = scraper.get(chapter_url, headers=headers, timeout=30)
+            # 6. Add proxies, verify=False, and timeout
+            response = scraper.get(chapter_url, headers=headers, timeout=req_timeout, proxies=proxies, verify=False)
             response.raise_for_status()
             break
         except requests.RequestException as e:
+            logger_func(f"   [AllComic] ⚠️ Chapter page connection attempt {attempt + 1}/{max_retries} failed: {e}")
             if attempt < max_retries - 1:
-                time.sleep(2 * (attempt + 1))
+                wait_time = (2 ** attempt) + random.uniform(0, 2)
+                logger_func(f"      Retrying in {wait_time:.1f} seconds...")
+                time.sleep(wait_time)
             else:
                 logger_func(f"   [AllComic] ❌ All connection attempts failed for chapter: {chapter_url}")
                 return None, None, None
     
+    if not response:
+        return None, None, None
+
     try:
         soup = BeautifulSoup(response.text, 'html.parser')
+        
+        comic_title = "Unknown Comic"
         title_element = soup.find('h1', class_='post-title')
-        comic_title = None
         if title_element:
             comic_title = title_element.text.strip()
         else:
@@ -91,7 +107,7 @@ def fetch_chapter_data(chapter_url, logger_func):
                     comic_slug = path_parts[-2]
                     comic_title = comic_slug.replace('-', ' ').title()
             except Exception:
-                comic_title = "Unknown Comic"
+                pass 
 
         chapter_slug = chapter_url.strip('/').split('/')[-1]
         chapter_title = chapter_slug.replace('-', ' ').title()
@@ -105,8 +121,8 @@ def fetch_chapter_data(chapter_url, logger_func):
                 if img_url:
                     list_of_image_urls.append(img_url)
 
-        if not comic_title or comic_title == "Unknown Comic" or not list_of_image_urls:
-            logger_func(f"   [AllComic] ❌ Could not find a valid title or images on the page. Title found: '{comic_title}'")
+        if not list_of_image_urls:
+            logger_func(f"   [AllComic] ❌ Could not find any images on the page.")
             return None, None, None
 
         return comic_title, chapter_title, list_of_image_urls

src/core/api_client.py

@@ -4,13 +4,37 @@ from urllib.parse import urlparse
 import json
 import requests
 import cloudscraper 
+import ssl
+from requests.adapters import HTTPAdapter
+from urllib3.poolmanager import PoolManager
+
 from ..utils.network_utils import extract_post_info, prepare_cookies_for_request
 from ..config.constants import (
-    STYLE_DATE_POST_TITLE
+    STYLE_DATE_POST_TITLE,
+    STYLE_DATE_BASED,
+    STYLE_POST_TITLE_GLOBAL_NUMBERING
 )
 
+# --- NEW: Custom Adapter to fix SSL errors ---
+class CustomSSLAdapter(HTTPAdapter):
+    """
+    A custom HTTPAdapter that forces check_hostname=False when using SSL.
+    This prevents the 'Cannot set verify_mode to CERT_NONE' error.
+    """
+    def init_poolmanager(self, connections, maxsize, block=False):
+        ctx = ssl.create_default_context()
+        # Crucial: Disable hostname checking FIRST, then set verify mode
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
+        
+        self.poolmanager = PoolManager(
+            num_pools=connections,
+            maxsize=maxsize,
+            block=block,
+            ssl_context=ctx
+        )
 
-def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_event=None, pause_event=None, cookies_dict=None):
+def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_event=None, pause_event=None, cookies_dict=None, proxies=None):
     """
     Fetches a single page of posts from the API with robust retry logic.
     """
@@ -23,7 +47,7 @@ def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_ev
                 raise RuntimeError("Fetch operation cancelled by user while paused.")
             time.sleep(0.5)
         logger("   Post fetching resumed.")
-    fields_to_request = "id,user,service,title,shared_file,added,published,edited,file,attachments,tags"
+    fields_to_request = "id,user,service,title,shared_file,added,published,edited,file,attachments,tags,content"
     paginated_url = f'{api_url_base}?o={offset}&fields={fields_to_request}'
     
     max_retries = 3
@@ -38,11 +62,14 @@ def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_ev
             log_message += f" (Attempt {attempt + 1}/{max_retries})"
         logger(log_message)
 
+        request_timeout = (30, 120) if proxies else (15, 60)
+        
         try:
-            response = requests.get(paginated_url, headers=headers, timeout=(15, 60), cookies=cookies_dict)
-            response.raise_for_status()
-            response.encoding = 'utf-8'  
-            return response.json()
+            with requests.get(paginated_url, headers=headers, timeout=request_timeout, cookies=cookies_dict, proxies=proxies, verify=False) as response:
+              
+                response.raise_for_status()
+                response.encoding = 'utf-8'  
+                return response.json()
 
         except requests.exceptions.RequestException as e:
             # Handle 403 error on the FIRST page as a rate limit/block
@@ -79,34 +106,67 @@ def fetch_posts_paginated(api_url_base, headers, offset, logger, cancellation_ev
 
     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):
+def fetch_single_post_data(api_domain, service, user_id, post_id, headers, logger, cookies_dict=None, proxies=None):
     """
-    --- MODIFIED FUNCTION ---
     Fetches the full data, including the 'content' field, for a single post using cloudscraper.
+    Includes RETRY logic for 429 Rate Limit errors.
     """
     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}...")
 
-    scraper = cloudscraper.create_scraper()
-
-    try:
-        response = scraper.get(post_api_url, headers=headers, timeout=(15, 300), cookies=cookies_dict)
-        response.raise_for_status()
-
-        full_post_data = response.json()
-
-        if isinstance(full_post_data, list) and full_post_data:
-            return full_post_data[0] 
-        if isinstance(full_post_data, dict) and 'post' in full_post_data:
-            return full_post_data['post'] 
-        return full_post_data 
-
-    except Exception as e:
-        logger(f"      ❌ Failed to fetch full content for post {post_id}: {e}")
-        return None
+    # Retry settings
+    max_retries = 4
+    
+    for attempt in range(max_retries + 1):
+        scraper = None
+        try:
+            scraper = cloudscraper.create_scraper()
+            
+            # Mount custom SSL adapter
+            adapter = CustomSSLAdapter()
+            scraper.mount("https://", adapter)
 
+            request_timeout = (30, 300) if proxies else (15, 300)
+            
+            response = scraper.get(post_api_url, headers=headers, timeout=request_timeout, cookies=cookies_dict, proxies=proxies, verify=False)
         
-def fetch_post_comments(api_domain, service, user_id, post_id, headers, logger, cancellation_event=None, pause_event=None, cookies_dict=None):
+            # --- FIX: Handle 429 Rate Limit explicitly ---
+            if response.status_code == 429:
+                wait_time = 20 + (attempt * 10) # 20s, 30s, 40s...
+                logger(f"      ⚠️ Rate Limited (429) on post {post_id}. Waiting {wait_time} seconds before retrying...")
+                time.sleep(wait_time)
+                continue # Try loop again
+            # ---------------------------------------------
+
+            response.raise_for_status()
+
+            full_post_data = response.json()
+
+            if isinstance(full_post_data, list) and full_post_data:
+                return full_post_data[0] 
+            if isinstance(full_post_data, dict) and 'post' in full_post_data:
+                return full_post_data['post'] 
+            return full_post_data 
+
+        except Exception as e:
+            # Catch "Too Many Requests" if it wasn't caught by status_code check above
+            if "429" in str(e) or "Too Many Requests" in str(e):
+                if attempt < max_retries:
+                    wait_time = 20 + (attempt * 10)
+                    logger(f"      ⚠️ Rate Limit Error caught: {e}. Waiting {wait_time}s...")
+                    time.sleep(wait_time)
+                    continue
+            
+            # Only log error if this was the last attempt
+            if attempt == max_retries:
+                logger(f"      ❌ Failed to fetch full content for post {post_id} after {max_retries} retries: {e}")
+                return None
+        finally:
+            if scraper:
+                scraper.close()
+    return None
+        
+def fetch_post_comments(api_domain, service, user_id, post_id, headers, logger, cancellation_event=None, pause_event=None, cookies_dict=None, proxies=None):
     """Fetches all comments for a specific post."""
     if cancellation_event and cancellation_event.is_set():
         raise RuntimeError("Comment fetch operation cancelled by user.")
@@ -115,10 +175,12 @@ def fetch_post_comments(api_domain, service, user_id, post_id, headers, logger,
     logger(f"   Fetching comments: {comments_api_url}")
     
     try:
-        response = requests.get(comments_api_url, headers=headers, timeout=(10, 30), cookies=cookies_dict)
-        response.raise_for_status()
-        response.encoding = 'utf-8'          
-        return response.json()
+        request_timeout = (30, 60) if proxies else (10, 30)
+        
+        with requests.get(comments_api_url, headers=headers, timeout=request_timeout, cookies=cookies_dict, proxies=proxies, verify=False) as response:
+            response.raise_for_status()
+            response.encoding = 'utf-8'          
+            return response.json()
     except requests.exceptions.RequestException as e:
         raise RuntimeError(f"Error fetching comments for post {post_id}: {e}")
     except ValueError as e:
@@ -138,7 +200,8 @@ def download_from_api(
     app_base_dir=None,
     manga_filename_style_for_sort_check=None,
     processed_post_ids=None,
-    fetch_all_first=False  
+    fetch_all_first=False,
+    proxies=None
     ):
     parsed_input_url_for_domain = urlparse(api_url_input)
     api_domain = parsed_input_url_for_domain.netloc
@@ -159,8 +222,6 @@ def download_from_api(
     if cancellation_event and cancellation_event.is_set():
         logger("   Download_from_api cancelled at start.")
         return
-
-    # The code that defined api_domain was moved from here to the top of the function
     
     if not any(d in api_domain.lower() for d in ['kemono.su', 'kemono.party', 'kemono.cr', 'coomer.su', 'coomer.party', 'coomer.st']):
         logger(f"⚠️ Unrecognized domain '{api_domain}' from input URL. Defaulting to kemono.su for API calls.")
@@ -176,10 +237,13 @@ def download_from_api(
         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}")
         try:
-            direct_response = requests.get(direct_post_api_url, headers=headers, timeout=(10, 30), cookies=cookies_for_api)
-            direct_response.raise_for_status()
-            direct_response.encoding = 'utf-8' 
-            direct_post_data = direct_response.json()
+            request_timeout = (30, 60) if proxies else (10, 30)
+            
+            with requests.get(direct_post_api_url, headers=headers, timeout=request_timeout, cookies=cookies_for_api, proxies=proxies, verify=False) as direct_response:
+                direct_response.raise_for_status()
+                direct_response.encoding = 'utf-8' 
+                direct_post_data = direct_response.json()
+            
             if isinstance(direct_post_data, list) and direct_post_data:
                 direct_post_data = direct_post_data[0]
             if isinstance(direct_post_data, dict) and 'post' in direct_post_data and isinstance(direct_post_data['post'], dict):
@@ -202,12 +266,23 @@ def download_from_api(
     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
+    # --- FIXED LOGIC HERE ---
+    # Define which styles require fetching ALL posts first (Sequential Mode)
+    styles_requiring_fetch_all = [STYLE_DATE_BASED, STYLE_POST_TITLE_GLOBAL_NUMBERING]
+
+    # Only enable "fetch all and sort" if the current style is explicitly in the list above
+    is_manga_mode_fetch_all_and_sort_oldest_first = (
+        manga_mode and 
+        (manga_filename_style_for_sort_check in styles_requiring_fetch_all) and 
+        not target_post_id
+    )
+
     should_fetch_all = fetch_all_first or is_manga_mode_fetch_all_and_sort_oldest_first  
     api_base_url = f"https://{api_domain}/api/v1/{service}/user/{user_id}/posts"
     page_size = 50
+    
     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} - Oldest First Sort Active): Fetching all posts to sort by date...")
         all_posts_for_manga_mode = []
         current_offset_manga = 0
         if start_page and start_page > 1:
@@ -234,7 +309,7 @@ def download_from_api(
                 logger(f"   Manga Mode: Reached specified end page ({end_page}). Stopping post fetch.")
                 break
             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, proxies=proxies)
                 if not isinstance(posts_batch_manga, list):
                     logger(f"❌ API Error (Manga Mode): Expected list of posts, got {type(posts_batch_manga)}.")
                     break
@@ -302,8 +377,9 @@ def download_from_api(
                 yield all_posts_for_manga_mode[i:i + page_size]
         return
 
-    if manga_mode and not target_post_id and (manga_filename_style_for_sort_check == STYLE_DATE_POST_TITLE):
-        logger(f"   Manga Mode (Style: {STYLE_DATE_POST_TITLE}): Processing posts in default API order (newest first).")
+    # Log specific message for styles that are in Manga Mode but NOT sorting (Streaming)
+    if manga_mode and not target_post_id and (manga_filename_style_for_sort_check not in styles_requiring_fetch_all):
+        logger(f"   Renaming Mode (Style: {manga_filename_style_for_sort_check}): Processing posts in default API order (Streaming).")
 
     current_page_num = 1
     current_offset = 0
@@ -312,6 +388,7 @@ def download_from_api(
         current_offset = (start_page - 1) * page_size
         current_page_num = start_page
         logger(f"   Starting from page {current_page_num} (calculated offset {current_offset}).")
+    
     while True:
         if pause_event and pause_event.is_set():
             logger("   Post fetching loop paused...")
@@ -321,18 +398,22 @@ def download_from_api(
                     break
                 time.sleep(0.5)
             if not (cancellation_event and cancellation_event.is_set()): logger("   Post fetching loop resumed.")
+        
         if cancellation_event and cancellation_event.is_set():
             logger("   Post fetching loop cancelled.")
             break
+            
         if target_post_id and processed_target_post_flag:
             break
+            
         if not target_post_id and end_page and current_page_num > end_page:
             logger(f"✅ Reached specified end page ({end_page}) for creator feed. Stopping.")
             break
+            
         try:
-            posts_batch = fetch_posts_paginated(api_base_url, headers, current_offset, logger, cancellation_event, pause_event, cookies_dict=cookies_for_api)
-            if not isinstance(posts_batch, list):
-                logger(f"❌ API Error: Expected list of posts, got {type(posts_batch)} at page {current_page_num} (offset {current_offset}).")
+            raw_posts_batch = fetch_posts_paginated(api_base_url, headers, current_offset, logger, cancellation_event, pause_event, cookies_dict=cookies_for_api, proxies=proxies)
+            if not isinstance(raw_posts_batch, list):
+                logger(f"❌ API Error: Expected list of posts, got {type(raw_posts_batch)} at page {current_page_num} (offset {current_offset}).")
                 break
         except RuntimeError as e:
             if "cancelled by user" in str(e).lower():
@@ -344,14 +425,8 @@ def download_from_api(
             logger(f"❌ Unexpected error fetching page {current_page_num} (offset {current_offset}): {e}")
             traceback.print_exc()
             break
-        if processed_post_ids:
-            original_count = len(posts_batch)
-            posts_batch = [post for post in posts_batch if post.get('id') not in processed_post_ids]
-            skipped_count = original_count - len(posts_batch)
-            if skipped_count > 0:
-                logger(f"   Skipped {skipped_count} already processed post(s) from page {current_page_num}.")
-        
-        if not posts_batch:
+
+        if not raw_posts_batch:
             if target_post_id and not processed_target_post_flag:
                 logger(f"❌ Target post {target_post_id} not found after checking all available pages (API returned no more posts at offset {current_offset}).")
             elif not target_post_id:
@@ -360,19 +435,34 @@ def download_from_api(
                 else:
                     logger(f"✅ Reached end of posts (no more content from API at offset {current_offset}).")
             break
+
+        posts_batch_to_yield = raw_posts_batch
+        original_count = len(raw_posts_batch)
+        
+        if processed_post_ids:
+            posts_batch_to_yield = [post for post in raw_posts_batch if post.get('id') not in processed_post_ids]
+            skipped_count = original_count - len(posts_batch_to_yield)
+            if skipped_count > 0:
+                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)
+            matching_post = next((p for p in posts_batch_to_yield if str(p.get('id')) == str(target_post_id)), None)
             if matching_post:
                 logger(f"🎯 Found target post {target_post_id} on page {current_page_num} (offset {current_offset}).")
                 yield [matching_post]
                 processed_target_post_flag = True
         elif not target_post_id:
-            yield posts_batch
+            if posts_batch_to_yield:
+                yield posts_batch_to_yield
+            elif original_count > 0:
+                logger(f"   No new posts found on page {current_page_num}. Checking next page...")
+
         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).")
-
+        logger(f"❌ Target post {target_post_id} could not be found after checking all relevant pages (final check after loop).")

src/core/booru_client.py

@@ -1,4 +1,3 @@
-# src/core/booru_client.py
 
 import os
 import re

src/core/bunkr_client.py

@@ -164,17 +164,34 @@ class BunkrAlbumExtractor(Extractor):
     def _extract_file(self, webpage_url):
         page = self.request(webpage_url).text
         data_id = extr(page, 'data-file-id="', '"')
-        referer = self.root_dl + "/file/" + data_id
-        headers = {"Referer": referer, "Origin": self.root_dl}
+        
+        # This referer is for the API call only
+        api_referer = self.root_dl + "/file/" + data_id
+        headers = {"Referer": api_referer, "Origin": self.root_dl}
         data = self.request_json(self.endpoint, method="POST", headers=headers, json={"id": data_id})
         
+        # Get the raw file URL (no domain replacement)
         file_url = decrypt_xor(data["url"], f"SECRET_KEY_{data['timestamp'] // 3600}".encode()) if data.get("encrypted") else data["url"]
+        
         file_name = extr(page, "<h1", "<").rpartition(">")[2]
 
+        # --- NEW FIX ---
+        # The download thread uses a new `requests` call, so we must
+        # explicitly pass BOTH the User-Agent and the correct Referer.
+        
+        # 1. Get the User-Agent from this extractor's session
+        user_agent = self.session.headers.get("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0")
+        
+        # 2. Use the original album URL as the Referer
+        download_referer = self.url 
+
         return {
             "url": file_url, 
             "name": unescape(file_name), 
-            "_http_headers": {"Referer": referer}
+            "_http_headers": {
+                "Referer": download_referer,
+                "User-Agent": user_agent
+            }
         }
 
 class BunkrMediaExtractor(BunkrAlbumExtractor):

src/core/deviantart_client.py

@@ -0,0 +1,193 @@
+import requests
+import re
+import os
+import time
+import threading
+from urllib.parse import urlparse
+
+class DeviantArtClient:
+    # Public Client Credentials
+    CLIENT_ID = "5388"
+    CLIENT_SECRET = "76b08c69cfb27f26d6161f9ab6d061a1"
+    BASE_API = "https://www.deviantart.com/api/v1/oauth2"
+
+    # 1. Accept proxies in init
+    def __init__(self, logger_func=print, proxies=None):
+        self.session = requests.Session()
+        
+        # 2. Configure Session with Proxy & SSL settings immediately
+        if proxies:
+            self.session.proxies.update(proxies)
+            self.session.verify = False # Ignore SSL for proxies
+            self.proxies_enabled = True
+        else:
+            self.proxies_enabled = False
+
+        self.session.headers.update({
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0",
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8",
+            "Accept-Language": "en-US,en;q=0.5",
+            "Connection": "keep-alive",
+            "Upgrade-Insecure-Requests": "1",
+            "Sec-Fetch-Dest": "document",
+            "Sec-Fetch-Mode": "navigate",
+            "Sec-Fetch-Site": "none",
+            "Sec-Fetch-User": "?1",
+        })
+        self.access_token = None
+        self.logger = logger_func
+        
+        # --- DEDUPLICATION LOGIC ---
+        self.logged_waits = set()
+        self.log_lock = threading.Lock()
+
+    def authenticate(self):
+        """Authenticates using client credentials flow."""
+        try:
+            url = "https://www.deviantart.com/oauth2/token"
+            data = {
+                "grant_type": "client_credentials",
+                "client_id": self.CLIENT_ID,
+                "client_secret": self.CLIENT_SECRET
+            }
+            # 3. Smart timeout (longer if proxy)
+            req_timeout = 30 if self.proxies_enabled else 10
+            
+            resp = self.session.post(url, data=data, timeout=req_timeout)
+            resp.raise_for_status()
+            data = resp.json()
+            self.access_token = data.get("access_token")
+            return True
+        except Exception as e:
+            self.logger(f"DA Auth Error: {e}")
+            return False
+
+    def _api_call(self, endpoint, params=None):
+        if not self.access_token:
+            if not self.authenticate():
+                raise Exception("Authentication failed")
+        
+        url = f"{self.BASE_API}{endpoint}"
+        params = params or {}
+        params['access_token'] = self.access_token
+        params['mature_content'] = 'true'
+        
+        retries = 0
+        max_retries = 4
+        backoff_delay = 2 
+        
+        # 4. Smart timeout
+        req_timeout = 30 if self.proxies_enabled else 20
+
+        while True:
+            try:
+                resp = self.session.get(url, params=params, timeout=req_timeout)
+                                
+                # 429: Rate Limit 
+                if resp.status_code == 429:
+                    retry_after = resp.headers.get('Retry-After')
+                    if retry_after:
+                        sleep_time = int(retry_after) + 2 # Add buffer
+                    else:
+                        # 5. Increase default wait time for 429s
+                        sleep_time = 15 
+                    
+                    self._log_once(sleep_time, f"   [DeviantArt] ⚠️ Rate limit (429). Sleeping {sleep_time}s...")
+                    time.sleep(sleep_time)
+                    continue
+
+                # 401: Token Expired (Refresh and Retry)
+                if resp.status_code == 401: 
+                    self.logger("   [DeviantArt] Token expired. Refreshing...")
+                    if self.authenticate():
+                        params['access_token'] = self.access_token
+                        continue 
+                    else:
+                        raise Exception("Failed to refresh token")
+
+                if 400 <= resp.status_code < 500:
+                    resp.raise_for_status() 
+
+                if 500 <= resp.status_code < 600:
+                    resp.raise_for_status() 
+
+                resp.raise_for_status()
+                
+                with self.log_lock:
+                    self.logged_waits.clear()
+                        
+                return resp.json()
+
+            except requests.exceptions.HTTPError as e:
+                if e.response is not None and 400 <= e.response.status_code < 500:
+                    raise e
+                pass
+
+            except requests.exceptions.RequestException as e:
+                if retries < max_retries:
+                    self._log_once("conn_error", f"   [DeviantArt] Connection error: {e}. Retrying...")
+                    time.sleep(backoff_delay)
+                    retries += 1
+                    continue
+                raise e
+    
+    def _log_once(self, key, message):
+        """Helper to avoid spamming the same log message during loops."""
+        should_log = False
+        with self.log_lock:
+            if key not in self.logged_waits:
+                self.logged_waits.add(key)
+                should_log = True
+        if should_log:
+            self.logger(message)
+
+    def get_deviation_uuid(self, url):
+        """Scrapes the deviation page to find the UUID."""
+        try:
+            req_timeout = 30 if self.proxies_enabled else 15
+            resp = self.session.get(url, timeout=req_timeout)
+            match = re.search(r'"deviationUuid":"([^"]+)"', resp.text)
+            if match:
+                return match.group(1)
+            match = re.search(r'-(\d+)$', url)
+            if match:
+                return match.group(1)
+        except Exception as e:
+            self.logger(f"Error scraping UUID: {e}")
+        return None
+
+    def get_deviation_content(self, uuid):
+        """Fetches download info."""
+        try:
+            data = self._api_call(f"/deviation/download/{uuid}")
+            if 'src' in data:
+                return data
+        except:
+            pass
+        
+        try:
+            meta = self._api_call(f"/deviation/{uuid}")
+            if 'content' in meta:
+                return meta['content']
+        except:
+            pass
+        return None
+
+    def get_gallery_folder(self, username, offset=0, limit=24):
+        """Fetches items from a user's gallery."""
+        return self._api_call("/gallery/all", {"username": username, "offset": offset, "limit": limit})
+
+    @staticmethod
+    def extract_info_from_url(url):
+        parsed = urlparse(url)
+        path = parsed.path.strip('/')
+        parts = path.split('/')
+        
+        if len(parts) >= 3 and parts[1] == 'art':
+            return 'post', parts[0], parts[2]
+        elif len(parts) >= 2 and parts[1] == 'gallery':
+            return 'gallery', parts[0], None
+        elif len(parts) == 1:
+            return 'gallery', parts[0], None
+            
+        return None, None, None

src/core/fap_nation_client.py

@@ -69,15 +69,28 @@ def fetch_fap_nation_data(album_url, logger_func):
 
             if direct_links_found:
                 logger_func(f"   [Fap-Nation] Found {len(direct_links_found)} direct media link(s). Selecting the best quality...")
-                best_link = direct_links_found[0]
-                for link in direct_links_found:
-                    if '1080p' in link.lower():
-                        best_link = link
-                        break
+                best_link = None
+                # Define qualities from highest to lowest
+                qualities_to_check = ['1080p', '720p', '480p', '360p']
+                
+                # Find the best quality link by iterating through preferred qualities
+                for quality in qualities_to_check:
+                    for link in direct_links_found:
+                        if quality in link.lower():
+                            best_link = link
+                            logger_func(f"   [Fap-Nation] Found '{quality}' link: {best_link}")
+                            break  # Found the best link for this quality level
+                    if best_link:
+                        break # Found the highest quality available
+
+                # Fallback if no quality string was found in any link
+                if not best_link:
+                    best_link = direct_links_found[0]
+                    logger_func(f"   [Fap-Nation] ⚠️ No quality tags (1080p, 720p, etc.) found in links. Defaulting to first link: {best_link}")
+
                 final_url = best_link
                 link_type = 'direct'
                 logger_func(f"   [Fap-Nation] Identified direct media link: {final_url}")
-
         # If after all checks, we still have no URL, then fail.
         if not final_url:
             logger_func("   [Fap-Nation] ❌ Stage 1 Failed: Could not find any HLS stream or direct link.")

src/core/hentaifox_client.py

@@ -0,0 +1,60 @@
+import requests
+import re
+from bs4 import BeautifulSoup  # Optional, but regex is faster for this specific site
+
+# Logic derived from NHdownloader.sh 'hentaifox' function
+BASE_URL = "https://hentaifox.com"
+HEADERS = {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+    "Referer": "https://hentaifox.com/",
+    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8"
+}
+
+def get_gallery_id(url_or_id):
+    """Extracts numbers from URL or returns the ID string."""
+    match = re.search(r"(\d+)", str(url_or_id))
+    return match.group(1) if match else None
+
+def get_gallery_metadata(gallery_id):
+    """
+    Fetches the main gallery page to get the Title and Total Pages.
+    Equivalent to the first part of the 'hentaifox' function in .sh file.
+    """
+    url = f"{BASE_URL}/gallery/{gallery_id}/"
+    response = requests.get(url, headers=HEADERS)
+    response.raise_for_status()
+    html = response.text
+    
+    # Extract Title (Bash: grep -o '<title>.*</title>')
+    title_match = re.search(r'<title>(.*?)</title>', html)
+    title = title_match.group(1).replace(" - HentaiFox", "").strip() if title_match else f"Gallery {gallery_id}"
+    
+    # Extract Total Pages (Bash: grep -Eo 'Pages: [0-9]*')
+    pages_match = re.search(r'Pages: (\d+)', html)
+    if not pages_match:
+        raise ValueError("Could not find total pages count.")
+    
+    total_pages = int(pages_match.group(1))
+    
+    return {
+        "id": gallery_id,
+        "title": title,
+        "total_pages": total_pages
+    }
+
+def get_image_link_for_page(gallery_id, page_num):
+    """
+    Fetches the specific reader page to find the actual image URL.
+    Equivalent to the loop in the 'hentaifox' function:
+    url="https://hentaifox.com/g/${id}/${i}/"
+    """
+    url = f"{BASE_URL}/g/{gallery_id}/{page_num}/"
+    response = requests.get(url, headers=HEADERS)
+    
+    # Extract image source (Bash: grep -Eo 'data-src="..."')
+    # Regex looks for: data-src="https://..."
+    match = re.search(r'data-src="(https://[^"]+)"', response.text)
+    
+    if match:
+        return match.group(1)
+    return None

src/core/manager.py

@@ -3,7 +3,7 @@ import time
 import os
 import json
 import traceback
-from concurrent.futures import ThreadPoolExecutor, as_completed, Future
+from concurrent.futures import ThreadPoolExecutor, as_completed, Future, CancelledError
 from .api_client import download_from_api
 from .workers import PostProcessorWorker
 from ..config.constants import (
@@ -84,8 +84,18 @@ class DownloadManager:
         
         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]
+        
+        # --- FIXED LOGIC: Strict check for sequential fetch modes ---
+        # Only "Date Based" and "Title + Global Numbering" require fetching the full list first.
+        # "Custom", "Date + Title", "Original Name", and "Post ID" will now use the pool (streaming).
+        sequential_styles = [STYLE_DATE_BASED, STYLE_POST_TITLE_GLOBAL_NUMBERING]
+        
+        is_manga_sequential = (
+            config.get('manga_mode_active') and 
+            config.get('manga_filename_style') in sequential_styles
+        )
 
+        # If it is NOT a strictly sequential manga mode, we use the pool (fetch-as-we-go)
         should_use_multithreading_for_posts = use_multithreading and not is_single_post and not is_manga_sequential
         
         if should_use_multithreading_for_posts:
@@ -97,12 +107,34 @@ class DownloadManager:
             fetcher_thread.start()
         else:
             # Single-threaded mode does not use the manager's complex logic
-            self._log("ℹ️ Manager is handing off to a single-threaded worker...")
+            self._log("ℹ️ Manager is handing off to a single-threaded worker (Sequential Mode)...")
             # 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 _get_proxies_from_config(self, config):
+        """Constructs the proxy dictionary from the config."""
+        if not config.get('proxy_enabled'):
+            return None
+
+        host = config.get('proxy_host')
+        port = config.get('proxy_port')
+        if not host or not port:
+            return None
+
+        proxy_str = f"http://{host}:{port}"
+        
+        # Add auth if provided
+        user = config.get('proxy_username')
+        password = config.get('proxy_password')
+        if user and password:
+            proxy_str = f"http://{user}:{password}@{host}:{port}"
+        
+        return {
+            "http": proxy_str,
+            "https": proxy_str
+        }
 
     def _fetch_and_queue_posts_for_pool(self, config, restore_data, creator_profile_data):
         """
@@ -117,6 +149,9 @@ class DownloadManager:
             session_processed_ids = set(restore_data.get('processed_post_ids', [])) if restore_data else set()
             profile_processed_ids = set(creator_profile_data.get('processed_post_ids', []))
             processed_ids = session_processed_ids.union(profile_processed_ids)
+            
+            # Helper to get proxies
+            proxies = self._get_proxies_from_config(config)
 
             if restore_data and 'all_posts_data' in restore_data:
                 # This logic for session restore remains as it relies on a pre-fetched list
@@ -132,127 +167,113 @@ class DownloadManager:
                     return
 
                 for post_data in posts_to_process:
-                    if self.cancellation_event.is_set(): break
-                    worker = PostProcessorWorker(post_data, config, self.progress_queue)
+                    if self.cancellation_event.is_set():
+                        break
+                    
+                    worker_args = self._map_config_to_worker_args(post_data, config)
+                    # Manually inject proxies here if _map_config_to_worker_args didn't catch it (though it should)
+                    worker_args['proxies'] = proxies
+                    
+                    worker = PostProcessorWorker(**worker_args)
                     future = self.thread_pool.submit(worker.process)
                     future.add_done_callback(self._handle_future_result)
                     self.active_futures.append(future)
             else:
-                # --- START: REFACTORED STREAMING LOGIC ---
+                # --- Streaming Logic ---
+                if proxies:
+                    self._log(f"   🌐 Using Proxy: {config.get('proxy_host')}:{config.get('proxy_port')}")
+
                 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)
+                    cookies_dict=None, # Cookie handling handled inside client if needed
+                    proxies=proxies    # <--- NEW: Pass proxies to API client
                 )
 
-                self.total_posts = 0
-                self.processed_posts = 0
-
-                # Process posts in batches as they are yielded by the API client
-                for batch in post_generator:
+                for post_batch in post_generator:
                     if self.cancellation_event.is_set():
-                        self._log("   Post fetching cancelled.")
                         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:
+                    if not post_batch:
                         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)})
+                    new_posts_batch = [p for p in post_batch if p.get('id') not in processed_ids]
+                    
+                    if not new_posts_batch:
+                         continue
 
-                    for post_data in posts_in_batch_to_process:
-                        if self.cancellation_event.is_set(): break
-                        worker = PostProcessorWorker(post_data, config, self.progress_queue)
+                    # Update total posts dynamically as we find them
+                    self.total_posts += len(new_posts_batch) 
+                    
+                    for post_data in new_posts_batch:
+                        if self.cancellation_event.is_set():
+                            break
+                        
+                        # MAPPING CONFIG TO WORKER ARGS
+                        worker_args = self._map_config_to_worker_args(post_data, config)
+                        worker = PostProcessorWorker(**worker_args)
+                        
                         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.")
+                        
+                    # Small sleep to prevent UI freeze
+                    time.sleep(0.01)
 
         except Exception as e:
-            self._log(f"❌ CRITICAL ERROR in post fetcher thread: {e}")
-            self._log(traceback.format_exc())
+            self._log(f"❌ Critical Error in Fetcher Thread: {e}")
+            traceback.print_exc()
         finally:
-            if self.thread_pool:
-                self.thread_pool.shutdown(wait=True)
-            self.is_running = False
-            self._log("🏁 All processing tasks have completed or been cancelled.") 
-            self.progress_queue.put({
-                'type': 'finished',
-                'payload': (self.total_downloads, self.total_skips, self.cancellation_event.is_set(), self.all_kept_original_filenames)
-            })
+            self.is_running = False # Mark as not running so we can finish
+            # The main window checks active futures, so we just exit this thread.
 
-    def _handle_future_result(self, future: Future):
-        """Callback executed when a worker task completes."""
-        if self.cancellation_event.is_set():
-            return
-            
-        with threading.Lock(): # Protect shared counters
-            self.processed_posts += 1
-            try:
-                if future.cancelled():
-                    self._log("⚠️ A post processing task was cancelled.")
-                    self.total_skips += 1
-                else:
-                    result = future.result()
-                    (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)
-                    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
-            self.progress_queue.put({'type': 'overall_progress', 'payload': (self.total_posts, self.processed_posts)})
+    def _map_config_to_worker_args(self, post_data, config):
+        """Helper to map the flat config dict to PostProcessorWorker arguments."""
+        # Get proxy dict
+        proxies = self._get_proxies_from_config(config)
 
+        # This mirrors the arguments in workers.py PostProcessorWorker.__init__
+        return {
+            'post_data': post_data,
+            'download_root': config.get('output_dir'),
+            'known_names': [], # If needed, pass KNOWN_NAMES or load them
+            'filter_character_list': [], # Parsed filters if available in config
+            'emitter': self.progress_queue,
+            'unwanted_keywords': set(), # Parse if needed
+            'filter_mode': config.get('filter_mode'),
+            'skip_zip': config.get('skip_zip'),
+            'use_subfolders': config.get('use_subfolders'),
+            'use_post_subfolders': config.get('use_post_subfolders'),
+            'target_post_id_from_initial_url': config.get('target_post_id_from_initial_url'),
+            'custom_folder_name': config.get('custom_folder_name'),
+            'compress_images': config.get('compress_images'),
+            'download_thumbnails': config.get('download_thumbnails'),
+            'service': config.get('service') or 'unknown',
+            'user_id': config.get('user_id') or 'unknown',
+            'pause_event': self.pause_event,
+            'api_url_input': config.get('api_url'),
+            'cancellation_event': self.cancellation_event,
+            'downloaded_files': None, 
+            'downloaded_file_hashes': None,
+            'downloaded_files_lock': None,
+            'downloaded_file_hashes_lock': None,
+            'manga_mode_active': config.get('manga_mode_active'),
+            'manga_filename_style': config.get('manga_filename_style'),
+            'manga_custom_filename_format': config.get('custom_manga_filename_format', "{published} {title}"),
+            'manga_custom_date_format': config.get('manga_custom_date_format', "YYYY-MM-DD"),
+            'use_multithreading': config.get('use_multithreading', True),
+            'proxies': proxies, # <--- NEW: Pass proxies to worker
+        }
+        
     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.")
+        # Extract name logic here or assume config has it
+        self.current_creator_name_for_profile = "Unknown" 
+        # You should ideally extract name from URL or config here if available
         return {}
 
     def _save_creator_profile(self, data):
@@ -280,6 +301,33 @@ class DownloadManager:
         self.cancellation_event.set()
 
         if self.thread_pool:
-            self._log("   Signaling all worker threads to stop and shutting down pool...")
-            self.thread_pool.shutdown(wait=False)
+            self.thread_pool.shutdown(wait=False, cancel_futures=True)
 
+    def _handle_future_result(self, future):
+        """Callback for when a worker task finishes."""
+        if self.active_futures:
+            try:
+                self.active_futures.remove(future)
+            except ValueError:
+                pass
+        
+        try:
+            result = future.result()
+            # result tuple: (download_count, skip_count, kept_original_filenames, ...)
+            if result:
+                self.total_downloads += result[0]
+                self.total_skips += result[1]
+                if len(result) > 3 and result[3]:
+                    # filename was kept original
+                    pass
+        except CancelledError:
+            pass
+        except Exception as e:
+            self._log(f"❌ Worker Error: {e}")
+        
+        self.processed_posts += 1
+        self.progress_queue.put({'type': 'overall_progress', 'payload': (self.total_posts, self.processed_posts)})
+
+        if not self.active_futures and not self.is_running:
+            self._log("✅ All tasks completed.")
+            self.progress_queue.put({'type': 'worker_finished', 'payload': (self.total_downloads, self.total_skips, [], [])})

src/core/nhentai_client.py

@@ -1,31 +1,35 @@
 import requests
-import cloudscraper
 import json
 
-def fetch_nhentai_gallery(gallery_id, logger=print):
+# 1. Update arguments to accept proxies=None
+def fetch_nhentai_gallery(gallery_id, logger=print, proxies=None):
     """
-    Fetches the metadata for a single nhentai gallery using cloudscraper to bypass Cloudflare.
-
-    Args:
-        gallery_id (str or int): The ID of the nhentai gallery.
-        logger (function): A function to log progress and error messages.
-
-    Returns:
-        dict: A dictionary containing the gallery's metadata if successful, otherwise None.
+    Fetches the metadata for a single nhentai gallery.
+    Switched to standard requests to support proxies with self-signed certs.
     """
     api_url = f"https://nhentai.net/api/gallery/{gallery_id}"
     
-    scraper = cloudscraper.create_scraper()
+    # 2. Use a real User-Agent to avoid immediate blocking
+    headers = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'
+    }
     
     logger(f"   Fetching nhentai gallery metadata from: {api_url}")
 
+    # 3. Smart timeout logic
+    req_timeout = (30, 120) if proxies else 20
+
     try:
-        # Use the scraper to make the GET request
-        response = scraper.get(api_url, timeout=20)
+        # 4. Use requests.get with proxies, verify=False, and timeout
+        response = requests.get(api_url, headers=headers, timeout=req_timeout, proxies=proxies, verify=False)
         
         if response.status_code == 404:
             logger(f"   ❌ Gallery not found (404): ID {gallery_id}")
             return None
+        elif response.status_code == 403:
+            logger(f"   ❌ Access Denied (403): Cloudflare blocked the request. Try a different proxy or User-Agent.")
+            return None
             
         response.raise_for_status()
 
@@ -36,9 +40,9 @@ def fetch_nhentai_gallery(gallery_id, logger=print):
             gallery_data['pages'] = gallery_data.pop('images')['pages']
             return gallery_data
         else:
-            logger("   ❌ API response is missing essential keys (id, media_id, or images).")
+            logger("   ❌ API response is missing essential keys (id, media_id, images).")
             return None
 
     except Exception as e:
-        logger(f"   ❌ An error occurred while fetching gallery {gallery_id}: {e}")
+        logger(f"   ❌ Error fetching nhentai metadata: {e}")
         return None

src/core/rule34video_client.py

@@ -0,0 +1,107 @@
+import cloudscraper
+from bs4 import BeautifulSoup
+import re
+import html
+
+def fetch_rule34video_data(video_url, logger_func):
+    """
+    Scrapes a rule34video.com page by specifically finding the 'Download' div,
+    then selecting the best available quality link.
+    
+    Args:
+        video_url (str): The full URL to the rule34video.com page.
+        logger_func (callable): Function to use for logging progress.
+
+    Returns:
+        tuple: (video_title, final_video_url) or (None, None) on failure.
+    """
+    logger_func(f"   [Rule34Video] Fetching page: {video_url}")
+    scraper = cloudscraper.create_scraper()
+    
+    try:
+        main_page_response = scraper.get(video_url, timeout=20)
+        main_page_response.raise_for_status()
+        
+        soup = BeautifulSoup(main_page_response.text, 'html.parser')
+        
+        page_title_tag = soup.find('title')
+        video_title = page_title_tag.text.strip() if page_title_tag else "rule34video_file"
+
+        # --- START OF FINAL FIX ---
+        # 1. Find the SPECIFIC "Download" label first. This is the key.
+        download_label = soup.find('div', class_='label', string='Download')
+
+        if not download_label:
+            logger_func("   [Rule34Video] ❌ Could not find the 'Download' label. Unable to locate the correct links div.")
+            return None, None
+
+        # 2. The correct container is the parent of this label.
+        download_div = download_label.parent
+        
+        # 3. Now, find the links ONLY within this correct container.
+        link_tags = download_div.find_all('a', class_='tag_item')
+        if not link_tags:
+            logger_func("   [Rule34Video] ❌ Found the 'Download' div, but no download links were inside it.")
+            return None, None
+        # --- END OF FINAL FIX ---
+
+        links_by_quality = {}
+        quality_pattern = re.compile(r'(\d+p|4k)')
+
+        for tag in link_tags:
+            href = tag.get('href')
+            if not href:
+                continue
+
+            quality = None
+            text_match = quality_pattern.search(tag.text)
+            if text_match:
+                quality = text_match.group(1)
+            else:
+                href_match = quality_pattern.search(href)
+                if href_match:
+                    quality = href_match.group(1)
+
+            if quality:
+                links_by_quality[quality] = href
+        
+        if not links_by_quality:
+            logger_func("   [Rule34Video] ⚠️ Could not parse specific qualities. Using first available link as a fallback.")
+            final_video_url = link_tags[0].get('href')
+            if not final_video_url:
+                logger_func("   [Rule34Video] ❌ Fallback failed: First link tag had no href attribute.")
+                return None, None
+            
+            final_video_url = html.unescape(final_video_url)
+            logger_func(f"   [Rule34Video] ✅ Selected first available link as fallback: {final_video_url}")
+            return video_title, final_video_url
+            
+        logger_func(f"   [Rule34Video] Found available qualities: {list(links_by_quality.keys())}")
+
+        final_video_url = None
+        if '1080p' in links_by_quality:
+            final_video_url = links_by_quality['1080p']
+            logger_func("   [Rule34Video] ✅ Selected preferred 1080p link.")
+        elif '720p' in links_by_quality:
+            final_video_url = links_by_quality['720p']
+            logger_func("   [Rule34Video] ✅ 1080p not found. Selected fallback 720p link.")
+        else:
+            fallback_order = ['480p', '360p']
+            for quality in fallback_order:
+                if quality in links_by_quality:
+                    final_video_url = links_by_quality[quality]
+                    logger_func(f"   [Rule34Video] ⚠️ 1080p/720p not found. Selected best available fallback: {quality}")
+                    break
+        
+        if not final_video_url:
+            logger_func("   [Rule34Video] ❌ Could not find a suitable download link.")
+            return None, None
+            
+        final_video_url = html.unescape(final_video_url)
+        logger_func(f"   [Rule34Video] ✅ Selected direct download URL: {final_video_url}")
+        
+        return video_title, final_video_url
+
+    except Exception as e:
+        logger_func(f"   [Rule34Video] ❌ An error occurred: {e}")
+        return None, None

src/core/simpcity_client.py

@@ -17,8 +17,10 @@ def fetch_single_simpcity_page(url, logger_func, cookies=None, post_id=None):
     
     try:
         response = scraper.get(url, timeout=30, headers=headers, cookies=cookies)
+        final_url = response.url # Capture the final URL after any redirects
+        
         if response.status_code == 404:
-            return None, []
+            return None, [], final_url
         response.raise_for_status()
         soup = BeautifulSoup(response.text, 'html.parser')
 
@@ -91,9 +93,9 @@ def fetch_single_simpcity_page(url, logger_func, cookies=None, post_id=None):
             # We use a set to remove duplicate URLs that might be found in multiple ways
             unique_jobs = list({job['url']: job for job in jobs_on_page}.values())
             logger_func(f"   [SimpCity] Scraper found jobs: {[job['type'] for job in unique_jobs]}")
-            return album_title, unique_jobs
+            return album_title, unique_jobs, final_url
 
-        return album_title, []
+        return album_title, [], final_url
 
     except Exception as e:
         logger_func(f"   [SimpCity] ❌ Error fetching page {url}: {e}")

src/core/workers.py

@@ -52,16 +52,18 @@ from ..utils.file_utils import (
 from ..utils.network_utils import prepare_cookies_for_request, get_link_platform
 from ..utils.text_utils import (
     is_title_match_for_character, is_filename_match_for_character, strip_html_tags,
-    extract_folder_name_from_title, # This was the function causing the error
+    extract_folder_name_from_title, 
     match_folders_from_title, match_folders_from_filename_enhanced
 )
 from ..config.constants import *
+from ..ui.dialogs.SinglePDF import create_individual_pdf
 
 def robust_clean_name(name):
     """A more robust function to remove illegal characters for filenames and folders."""
     if not name:
         return ""
-    illegal_chars_pattern = r'[\x00-\x1f<>:"/\\|?*\'\[\]]'
+    # FIX: Removed \' from the list so apostrophes are kept
+    illegal_chars_pattern = r'[\x00-\x1f<>:"/\\|?*]' 
     cleaned_name = re.sub(illegal_chars_pattern, '', name)
 
     cleaned_name = cleaned_name.strip(' .')
@@ -132,6 +134,9 @@ class PostProcessorWorker:
                  sfp_threshold=None,
                  handle_unknown_mode=False,
                  creator_name_cache=None,
+                 add_info_in_pdf=False,
+                 proxies=None
+
                  ):
         self.post = post_data
         self.download_root = download_root
@@ -205,6 +210,9 @@ class PostProcessorWorker:
         self.sfp_threshold = sfp_threshold 
         self.handle_unknown_mode = handle_unknown_mode 
         self.creator_name_cache = creator_name_cache 
+        self.add_info_in_pdf = add_info_in_pdf
+        self.proxies = proxies
+
 
         if self.compress_images and Image is None:
             self.logger("⚠️ Image compression disabled: Pillow library not found.")
@@ -256,7 +264,7 @@ class PostProcessorWorker:
             new_url = parsed_url._replace(netloc=new_domain).geturl()
             
             try:
-                with requests.head(new_url, headers={'User-Agent': 'Mozilla/5.0'}, timeout=5, allow_redirects=True) as resp:
+                with requests.head(new_url, headers={'User-Agent': 'Mozilla/5.0'}, timeout=5, allow_redirects=True, proxies=self.proxies, verify=False) as resp:
                     if resp.status_code == 200:
                         return new_url
             except requests.RequestException:
@@ -331,7 +339,8 @@ class PostProcessorWorker:
                 api_original_filename_for_size_check = file_info.get('_original_name_for_log', file_info.get('name'))
                 try:
                         # Use a stream=True HEAD request to get headers without downloading the body
-                        with requests.head(file_url, headers=file_download_headers, timeout=15, cookies=cookies_to_use_for_file, allow_redirects=True) as head_response:
+                        with requests.head(file_url, headers=file_download_headers, timeout=15, cookies=cookies_to_use_for_file, allow_redirects=True, proxies=self.proxies, verify=False) as head_response:
+                               
                                 head_response.raise_for_status()
                                 content_length = head_response.headers.get('Content-Length')
                                 if content_length:
@@ -665,7 +674,7 @@ class PostProcessorWorker:
                 
                 current_url_to_try = file_url
                           
-                response = requests.get(current_url_to_try, headers=file_download_headers, timeout=(30, 300), stream=True, cookies=cookies_to_use_for_file)
+                response = requests.get(current_url_to_try, headers=file_download_headers, timeout=(30, 300), stream=True, cookies=cookies_to_use_for_file, proxies=self.proxies, verify=False)
                 
                 if response.status_code == 403 and ('kemono.' in current_url_to_try or 'coomer.' in current_url_to_try):
                     self.logger(f"   ⚠️ Got 403 Forbidden for '{api_original_filename}'. Attempting subdomain rotation...")
@@ -674,8 +683,7 @@ class PostProcessorWorker:
                         self.logger(f"   Retrying with new URL: {new_url}")
                         file_url = new_url
                         response.close() # Close the old response
-                        response = requests.get(new_url, headers=file_download_headers, timeout=(30, 300), stream=True, cookies=cookies_to_use_for_file)
-
+                        response = requests.get(new_url, headers=file_download_headers, timeout=(30, 300), stream=True, cookies=cookies_to_use_for_file, proxies=self.proxies, verify=False)
                 response.raise_for_status()
                 
                 # --- REVISED AND MOVED SIZE CHECK LOGIC ---
@@ -974,6 +982,92 @@ class PostProcessorWorker:
             else:
                 return 0, 1, filename_to_save_in_main_path, was_original_name_kept_flag, FILE_DOWNLOAD_STATUS_FAILED_RETRYABLE_LATER, details_for_failure
 
+    def _get_manga_style_filename_for_post(self, post_title, original_ext):
+        """Generates a filename based on manga style, using post data."""
+        if self.manga_filename_style == STYLE_POST_TITLE:
+            cleaned_post_title_base = robust_clean_name(post_title.strip() if post_title and post_title.strip() else "post")
+            return f"{cleaned_post_title_base}{original_ext}"
+            
+        elif self.manga_filename_style == STYLE_CUSTOM:
+            try:
+                def format_date(date_str):
+                    if not date_str or 'NoDate' in date_str:
+                        return "NoDate"
+                    try:
+                        dt_obj = datetime.fromisoformat(date_str)
+                        strftime_format = self.manga_custom_date_format.replace("YYYY", "%Y").replace("MM", "%m").replace("DD", "%d")
+                        return dt_obj.strftime(strftime_format)
+                    except (ValueError, TypeError):
+                        return date_str.split('T')[0]
+
+                service = self.service.lower()
+                user_id = str(self.user_id)
+                creator_name = self.creator_name_cache.get((service, user_id), user_id)
+
+                added_date = self.post.get('added')
+                published_date = self.post.get('published')
+                edited_date = self.post.get('edited')
+
+                format_values = {
+                    'id': str(self.post.get('id', '')),
+                    'user': user_id,
+                    'creator_name': creator_name,
+                    'service': self.service,
+                    'title': str(self.post.get('title', '')),
+                    'name': robust_clean_name(post_title), # Use post title as a fallback 'name'
+                    'added': format_date(added_date or published_date),
+                    'published': format_date(published_date),
+                    'edited': format_date(edited_date or published_date)
+                }
+                
+                custom_base_name = self.manga_custom_filename_format.format(**format_values)
+                cleaned_custom_name = robust_clean_name(custom_base_name)
+                
+                return f"{cleaned_custom_name}{original_ext}"
+                
+            except (KeyError, IndexError, ValueError) as e:
+                self.logger(f"⚠️ Custom format error for text export: {e}. Falling back to post title.")
+                return f"{robust_clean_name(post_title.strip() or 'untitled_post')}{original_ext}"
+        
+        elif self.manga_filename_style == STYLE_DATE_POST_TITLE:
+            published_date_str = self.post.get('published')
+            added_date_str = self.post.get('added')
+            formatted_date_str = "nodate"
+            if published_date_str:
+                try:
+                    formatted_date_str = published_date_str.split('T')[0]
+                except Exception:
+                    pass
+            elif added_date_str:
+                try:
+                    formatted_date_str = added_date_str.split('T')[0]
+                except Exception:
+                    pass
+
+            cleaned_post_title_for_filename = robust_clean_name(post_title.strip() or "post")
+            base_name_for_style = f"{formatted_date_str}_{cleaned_post_title_for_filename}"
+            return f"{base_name_for_style}{original_ext}"
+        
+        elif self.manga_filename_style == STYLE_POST_ID:
+            post_id = str(self.post.get('id', 'unknown_id'))
+            return f"{post_id}{original_ext}"
+            
+        elif self.manga_filename_style == STYLE_ORIGINAL_NAME:
+            published_date_str = self.post.get('published') or self.post.get('added')
+            formatted_date_str = "nodate"
+            if published_date_str:
+                try:
+                    formatted_date_str = published_date_str.split('T')[0]
+                except Exception:
+                    pass
+            
+            # Use post title as the name part, as there is no "original filename" for the text export.
+            cleaned_post_title_base = robust_clean_name(post_title.strip() or "untitled_post")
+            return f"{formatted_date_str}_{cleaned_post_title_base}{original_ext}"
+
+        # Default fallback
+        return f"{robust_clean_name(post_title.strip() or 'untitled_post')}{original_ext}"
+
     def process(self):
         result_tuple = (0, 0, [], [], [], None, None)
         try:
@@ -1011,8 +1105,8 @@ class PostProcessorWorker:
                     'Referer': creator_page_url,
                     'Accept': 'text/css'
                     }
-                cookies = prepare_cookies_for_request(self.use_cookie, self.cookie_text, self.selected_cookie_file, self.app_base_dir, self.logger, target_domain=api_domain)
-                full_post_data = fetch_single_post_data(api_domain, self.service, self.user_id, post_id, headers, self.logger, cookies_dict=cookies)
+                cookies = prepare_cookies_for_request(self.use_cookie, self.cookie_text, self.selected_cookie_file, self.app_base_dir, self.logger, target_domain=api_domain)  
+                full_post_data = fetch_single_post_data(api_domain, self.service, self.user_id, post_id, headers, self.logger, cookies_dict=cookies, proxies=self.proxies)              
                 if full_post_data:
                     self.logger("   ✅ Full post data fetched successfully.")
                     self.post = full_post_data
@@ -1213,13 +1307,17 @@ class PostProcessorWorker:
                         if not any(d in api_domain_for_comments.lower() for d in ['kemono.su', 'kemono.party', 'kemono.cr', 'coomer.su', 'coomer.party', 'coomer.st']):
                             self.logger(f"⚠️ Unrecognized domain '{api_domain_for_comments}' for comment API. Defaulting based on service.")
                             api_domain_for_comments = "kemono.cr" if "kemono" in self.service.lower() else "coomer.st"
+                       
+                        # Fetch comments (Indented correctly now)
                         comments_data = fetch_post_comments(
                             api_domain_for_comments, self.service, self.user_id, post_id,
                             headers, self.logger, self.cancellation_event, self.pause_event,
                             cookies_dict=prepare_cookies_for_request(
                                 self.use_cookie, self.cookie_text, self.selected_cookie_file, self.app_base_dir, self.logger
-                            )
+                            ),
+                            proxies=self.proxies 
                         )
+                     
                         if comments_data:
                             self.logger(f"     Fetched {len(comments_data)} comments for post {post_id}.")
                             for comment_item_idx, comment_item in enumerate(comments_data):
@@ -1246,8 +1344,8 @@ class PostProcessorWorker:
                     except RuntimeError as e_fetch_comment:
                         self.logger(f"   ⚠️ Error fetching or processing comments for post {post_id}: {e_fetch_comment}")
                     except Exception as e_generic_comment:
-                        self.logger(f"   ❌ Unexpected error during comment processing for post {post_id}: {e_generic_comment}\n{traceback.format_exc(limit=2)}")
-                    self.logger(f"   [Char Scope: Comments] Phase 2 Result: post_is_candidate_by_comment_char_match = {post_is_candidate_by_comment_char_match}")
+                        self.logger(f"   ❌ Unexpected error during comment processing for post {post_id}: {e_generic_comment}\n{traceback.format_exc(limit=2)}")                
+                
                 else:
                     self.logger(f"   [Char Scope: Comments] Phase 2: Skipped comment check for post ID '{post_id}' because a file match already made it a candidate.")
 
@@ -1269,6 +1367,8 @@ class PostProcessorWorker:
             if self.filter_mode == 'text_only' and not self.extract_links_only:
                 self.logger(f"   Mode: Text Only (Scope: {self.text_only_scope})")
                 post_title_lower = post_title.lower()
+                
+                # --- Skip Words Check ---
                 if self.skip_words_list and (self.skip_words_scope == SKIP_SCOPE_POSTS or self.skip_words_scope == SKIP_SCOPE_BOTH):
                     for skip_word in self.skip_words_list:
                         if skip_word.lower() in post_title_lower:
@@ -1287,6 +1387,7 @@ class PostProcessorWorker:
                 comments_data = []
                 final_post_data = post_data
                 
+                # --- Content Fetching ---
                 if self.text_only_scope == 'content' and 'content' not in final_post_data:
                     self.logger(f"   Post {post_id} is missing 'content' field, fetching full data...")
                     parsed_url = urlparse(self.api_url_input)
@@ -1304,6 +1405,8 @@ class PostProcessorWorker:
                         api_domain = parsed_url.netloc
                         comments_data = fetch_post_comments(api_domain, self.service, self.user_id, post_id, headers, self.logger, self.cancellation_event, self.pause_event)
                         if comments_data:
+                            # For TXT/DOCX export, we format comments here. 
+                            # For PDF, we pass the raw list to the generator.
                             comment_texts = []
                             for comment in comments_data:
                                 user = comment.get('commenter_name', 'Unknown User')
@@ -1335,23 +1438,43 @@ class PostProcessorWorker:
                     self._emit_signal('worker_finished', result_tuple)
                     return result_tuple
 
+                # --- Metadata Preparation ---
+                # Prepare all data needed for the info page or JSON dump
+                service_str = self.service
+                user_id_str = str(self.user_id)
+                post_id_str = str(post_id)
+                creator_key = (service_str.lower(), user_id_str)
+                
+                # Resolve creator name using the cache passed from main_window
+                creator_name = user_id_str
+                if self.creator_name_cache:
+                    creator_name = self.creator_name_cache.get(creator_key, user_id_str)
+
+                common_content_data = {
+                    'title': post_title,
+                    'published': self.post.get('published') or self.post.get('added'),
+                    'service': service_str,
+                    'user': user_id_str,
+                    'id': post_id_str,
+                    'tags': self.post.get('tags'),
+                    'original_link': post_page_url,
+                    'creator_name': creator_name
+                }
+
+                # --- Single PDF Mode (Save Temp JSON) ---
                 if self.single_pdf_mode:
-                    content_data = {
-                        'title': post_title,
-                        'published': self.post.get('published') or self.post.get('added')
-                    }
                     if self.text_only_scope == 'comments':
                         if not comments_data: 
                             result_tuple = (0, 0, [], [], [], None, None)
                             self._emit_signal('worker_finished', result_tuple)
                             return result_tuple
-                        content_data['comments'] = comments_data
+                        common_content_data['comments'] = comments_data
                     else:
                         if not cleaned_text.strip():
                             result_tuple = (0, 0, [], [], [], None, None)
                             self._emit_signal('worker_finished', result_tuple)
                             return result_tuple
-                        content_data['content'] = cleaned_text
+                        common_content_data['content'] = cleaned_text
 
                     temp_dir = os.path.join(self.app_base_dir, "appdata")
                     os.makedirs(temp_dir, exist_ok=True)
@@ -1359,7 +1482,7 @@ class PostProcessorWorker:
                     temp_filepath = os.path.join(temp_dir, temp_filename)
                     try:
                         with open(temp_filepath, 'w', encoding='utf-8') as f:
-                            json.dump(content_data, f, indent=2)
+                            json.dump(common_content_data, f, indent=2)
                         self.logger(f"   Saved temporary data for '{post_title}' for single PDF compilation.")
                         result_tuple = (0, 0, [], [], [], None, temp_filepath)
                         self._emit_signal('worker_finished', result_tuple)
@@ -1369,82 +1492,67 @@ class PostProcessorWorker:
                         result_tuple = (0, 0, [], [], [], None, None)
                         self._emit_signal('worker_finished', result_tuple)
                         return result_tuple
+                
+                # --- Individual File Mode ---
                 else:
                     file_extension = self.text_export_format
-                    txt_filename = clean_filename(post_title) + f".{file_extension}"
+                    txt_filename = ""
+                                        
+                    if self.manga_mode_active:
+                        txt_filename = self._get_manga_style_filename_for_post(post_title, f".{file_extension}")
+                        self.logger(f"   ℹ️ Applying Renaming Mode. Generated filename: '{txt_filename}'")
+                    else:
+                        txt_filename = clean_filename(post_title) + f".{file_extension}"                       
+                       
                     final_save_path = os.path.join(determined_post_save_path_for_history, txt_filename)
+
                     try:
                         os.makedirs(determined_post_save_path_for_history, exist_ok=True)
-                        base, ext = os.path.splitext(final_save_path)
+                        base, ext = os.path.splitext(final_save_path)                    
+                    
                         counter = 1
                         while os.path.exists(final_save_path):
                             final_save_path = f"{base}_{counter}{ext}"
                             counter += 1
 
+                        # --- PDF Generation ---
                         if file_extension == 'pdf':
-                            if FPDF:
-                                self.logger(f"   Creating formatted PDF for {'comments' if self.text_only_scope == 'comments' else 'content'}...")
-                                pdf = PDF()
-                                base_path = self.project_root_dir
-                                font_path = ""
-                                bold_font_path = ""
-
-                                if base_path:
-                                    font_path = os.path.join(base_path, 'data', 'dejavu-sans', 'DejaVuSans.ttf')
-                                    bold_font_path = os.path.join(base_path, 'data', 'dejavu-sans', '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)
-                                    default_font_family = 'DejaVu'
-                                except Exception as font_error:
-                                    self.logger(f"   ⚠️ Could not load DejaVu font: {font_error}. Falling back to Arial.")
-                                    default_font_family = 'Arial'
-
-                                pdf.add_page()
-                                pdf.set_font(default_font_family, 'B', 16)
-                                pdf.multi_cell(0, 10, post_title)
-                                pdf.ln(10)
-
-                                if self.text_only_scope == 'comments':
-                                    if not comments_data:
-                                        self.logger("   -> Skip PDF Creation: No comments to process.")
-                                        result_tuple = (0, num_potential_files_in_post, [], [], [], None, None)
-                                        self._emit_signal('worker_finished', result_tuple)
-                                        return result_tuple
-                                    for i, comment in enumerate(comments_data):
-                                        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: ")
-                                        pdf.set_font(default_font_family, 'B', 10)
-                                        pdf.write(8, 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 i < len(comments_data) - 1:
-                                            pdf.ln(5)
-                                            pdf.cell(0, 0, '', border='T')
-                                            pdf.ln(5)
-                                else:
-                                    pdf.set_font(default_font_family, '', 12)
-                                    pdf.multi_cell(0, 7, cleaned_text)
-
-                                pdf.output(final_save_path)
+                            # Font setup
+                            font_path = ""
+                            if self.project_root_dir:
+                                font_path = os.path.join(self.project_root_dir, 'data', 'dejavu-sans', 'DejaVuSans.ttf')
+                            
+                            # Add content specific fields for the generator
+                            if self.text_only_scope == 'comments':
+                                common_content_data['comments_list_for_pdf'] = comments_data
                             else:
-                                self.logger(f"   ⚠️ Cannot create PDF: 'fpdf2' library not installed. Saving as .txt.")
-                                final_save_path = os.path.splitext(final_save_path)[0] + ".txt"
-                                with open(final_save_path, 'w', encoding='utf-8') as f: f.write(cleaned_text)
-                        
+                                common_content_data['content_text_for_pdf'] = cleaned_text
+
+                            # Call the centralized function
+                            success = create_individual_pdf(
+                                post_data=common_content_data,
+                                output_filename=final_save_path,
+                                font_path=font_path,
+                                add_info_page=self.add_info_in_pdf, # <--- NEW PARAMETER
+                                logger=self.logger
+                            )
+
+                            if not success:
+                                raise Exception("PDF generation failed (check logs)")
+
+                        # --- DOCX Generation ---
                         elif file_extension == 'docx':
                             if Document:
                                 self.logger(f"   Converting to DOCX...")
                                 document = Document()
+                                # Add simple header info if desired, or keep pure text
+                                if self.add_info_in_pdf: 
+                                    document.add_heading(post_title, 0)
+                                    document.add_paragraph(f"Date: {common_content_data['published']}")
+                                    document.add_paragraph(f"Creator: {common_content_data['creator_name']}")
+                                    document.add_paragraph(f"URL: {common_content_data['original_link']}")
+                                    document.add_page_break()
+
                                 document.add_paragraph(cleaned_text)
                                 document.save(final_save_path)
                             else:
@@ -1452,9 +1560,20 @@ class PostProcessorWorker:
                                 final_save_path = os.path.splitext(final_save_path)[0] + ".txt"
                                 with open(final_save_path, 'w', encoding='utf-8') as f: f.write(cleaned_text)
                         
-                        else: # TXT file
+                        # --- TXT Generation ---
+                        else: 
+                            content_to_write = cleaned_text
+                            # Optional: Add simple text header if "Add Info" is checked
+                            if self.add_info_in_pdf:
+                                header = (f"Title: {post_title}\n"
+                                          f"Date: {common_content_data['published']}\n"
+                                          f"Creator: {common_content_data['creator_name']}\n"
+                                          f"URL: {common_content_data['original_link']}\n"
+                                          f"{'-'*40}\n\n")
+                                content_to_write = header + cleaned_text
+
                             with open(final_save_path, 'w', encoding='utf-8') as f:
-                                f.write(cleaned_text)
+                                f.write(content_to_write)
                         
                         self.logger(f"✅ Saved Text: '{os.path.basename(final_save_path)}' in '{os.path.basename(determined_post_save_path_for_history)}'")
                         result_tuple = (1, num_potential_files_in_post, [], [], [], history_data_for_this_post, None)
@@ -1467,6 +1586,7 @@ class PostProcessorWorker:
                         self._emit_signal('worker_finished', result_tuple)
                         return result_tuple
 
+
             if not self.extract_links_only and self.manga_mode_active and current_character_filters and (self.char_filter_scope == CHAR_SCOPE_TITLE or self.char_filter_scope == CHAR_SCOPE_BOTH) and not post_is_candidate_by_title_char_match:
                  self.logger(f"   -> Skip Post (Renaming Mode with Title/Both Scope - No Title Char Match): Title '{post_title[:50]}' doesn't match filters.")
                  self._emit_signal('missed_character_post', post_title, "Renaming Mode: No title match for character filter (Title/Both scope)")
@@ -1480,12 +1600,11 @@ class PostProcessorWorker:
 
             should_create_post_subfolder = self.use_post_subfolders
 
-            if (not self.use_post_subfolders and self.use_subfolders and 
+            if (not self.use_post_subfolders and 
                 self.sfp_threshold is not None and num_potential_files_in_post >= self.sfp_threshold):
                 
                 self.logger(f"   ℹ️ Post has {num_potential_files_in_post} files (≥{self.sfp_threshold}). Activating Subfolder per Post via [sfp] command.")
                 should_create_post_subfolder = True
-
             base_folder_names_for_post_content = []
             determined_post_save_path_for_history = self.override_output_dir if self.override_output_dir else self.download_root
             if not self.extract_links_only and self.use_subfolders:
@@ -1810,6 +1929,31 @@ class PostProcessorWorker:
 
             if not all_files_from_post_api:
                 self.logger(f"   No files found to download for post {post_id}.")
+                if not self.extract_links_only and should_create_post_subfolder:
+                    path_to_check_for_emptiness = determined_post_save_path_for_history
+                    try:
+                        if os.path.isdir(path_to_check_for_emptiness):
+                            dir_contents = os.listdir(path_to_check_for_emptiness)
+                            # Check if the directory is empty OR only contains our ID file
+                            is_effectively_empty = True
+                            if dir_contents:
+                                if not all(f.startswith('.postid_') for f in dir_contents):
+                                    is_effectively_empty = False
+                            
+                            if is_effectively_empty:
+                                self.logger(f"   🗑️ Removing empty post-specific subfolder (post had no files): '{path_to_check_for_emptiness}'")
+                                if dir_contents:
+                                    for id_file in dir_contents:
+                                        if id_file.startswith('.postid_'):
+                                            try:
+                                                os.remove(os.path.join(path_to_check_for_emptiness, id_file))
+                                            except OSError as e_rm_id:
+                                                self.logger(f"   ⚠️ Could not remove ID file '{id_file}' during cleanup: {e_rm_id}")
+                                os.rmdir(path_to_check_for_emptiness)
+                    except OSError as e_rmdir:
+                        self.logger(f"   ⚠️ Could not remove effectively empty subfolder (no files) '{path_to_check_for_emptiness}': {e_rmdir}")
+                # --- END NEW CLEANUP LOGIC ---
+
                 history_data_for_no_files_post = {
                     'post_title': post_title,
                     'post_id': post_id,
@@ -1823,7 +1967,7 @@ class PostProcessorWorker:
                 result_tuple = (0, 0, [], [], [], history_data_for_no_files_post, None)
                 self._emit_signal('worker_finished', result_tuple)
                 return result_tuple
-
+                
             files_to_download_info_list = []
             processed_original_filenames_in_this_post = set()
             if self.keep_in_post_duplicates:
@@ -2052,9 +2196,27 @@ class PostProcessorWorker:
             if not self.extract_links_only and self.use_post_subfolders and total_downloaded_this_post == 0:
                 path_to_check_for_emptiness = determined_post_save_path_for_history
                 try:
-                    if os.path.isdir(path_to_check_for_emptiness) and not os.listdir(path_to_check_for_emptiness):
-                        self.logger(f"   🗑️ Removing empty post-specific subfolder: '{path_to_check_for_emptiness}'")
-                        os.rmdir(path_to_check_for_emptiness)
+                    if os.path.isdir(path_to_check_for_emptiness):
+                        dir_contents = os.listdir(path_to_check_for_emptiness)
+                        # Check if the directory is empty OR only contains our ID file
+                        is_effectively_empty = True
+                        if dir_contents:
+                            # If there are files, check if ALL of them are .postid files
+                            if not all(f.startswith('.postid_') for f in dir_contents):
+                                is_effectively_empty = False
+                        
+                        if is_effectively_empty:
+                            self.logger(f"   🗑️ Removing empty post-specific subfolder (no files downloaded): '{path_to_check_for_emptiness}'")
+                            # We must first remove the ID file(s) before removing the dir
+                            if dir_contents:
+                                for id_file in dir_contents:
+                                    if id_file.startswith('.postid_'):
+                                        try:
+                                            os.remove(os.path.join(path_to_check_for_emptiness, id_file))
+                                        except OSError as e_rm_id:
+                                            self.logger(f"   ⚠️ Could not remove ID file '{id_file}' during cleanup: {e_rm_id}")
+                            
+                            os.rmdir(path_to_check_for_emptiness) # Now the rmdir should work
                 except OSError as e_rmdir:
                     self.logger(f"   ⚠️ Could not remove empty post-specific subfolder '{path_to_check_for_emptiness}': {e_rmdir}")
 
@@ -2066,11 +2228,29 @@ class PostProcessorWorker:
             if not self.extract_links_only and self.use_post_subfolders and total_downloaded_this_post == 0:
                 path_to_check_for_emptiness = determined_post_save_path_for_history
                 try:
-                    if os.path.isdir(path_to_check_for_emptiness) and not os.listdir(path_to_check_for_emptiness):
-                        self.logger(f"   🗑️ Removing empty post-specific subfolder: '{path_to_check_for_emptiness}'")
-                        os.rmdir(path_to_check_for_emptiness)
+                    if os.path.isdir(path_to_check_for_emptiness):
+                        dir_contents = os.listdir(path_to_check_for_emptiness)
+                        # Check if the directory is empty OR only contains our ID file
+                        is_effectively_empty = True
+                        if dir_contents:
+                            # If there are files, check if ALL of them are .postid files
+                            if not all(f.startswith('.postid_') for f in dir_contents):
+                                is_effectively_empty = False
+                        
+                        if is_effectively_empty:
+                            self.logger(f"   🗑️ Removing empty post-specific subfolder (no files downloaded): '{path_to_check_for_emptiness}'")
+                            # We must first remove the ID file(s) before removing the dir
+                            if dir_contents:
+                                for id_file in dir_contents:
+                                    if id_file.startswith('.postid_'):
+                                        try:
+                                            os.remove(os.path.join(path_to_check_for_emptiness, id_file))
+                                        except OSError as e_rm_id:
+                                            self.logger(f"   ⚠️ Could not remove ID file '{id_file}' during cleanup: {e_rm_id}")
+                            
+                            os.rmdir(path_to_check_for_emptiness) # Now the rmdir should work
                 except OSError as e_rmdir:
-                    self.logger(f"   ⚠️ Could not remove potentially empty subfolder '{path_to_check_for_emptiness}': {e_rmdir}")
+                    self.logger(f"   ⚠️ Could not remove empty post-specific subfolder '{path_to_check_for_emptiness}': {e_rmdir}")
             
             self._emit_signal('worker_finished', result_tuple)
             return result_tuple
@@ -2151,9 +2331,10 @@ class DownloadThread(QThread):
                  manga_custom_filename_format="{published} {title}",
                  manga_custom_date_format="YYYY-MM-DD" ,
                  sfp_threshold=None,
-                 creator_name_cache=None 
-
+                 creator_name_cache=None,
+                 proxies=None 
                  ): 
+
         super().__init__()
         self.api_url_input = api_url_input
         self.output_dir = output_dir
@@ -2228,6 +2409,7 @@ class DownloadThread(QThread):
         self.domain_override = domain_override 
         self.sfp_threshold = sfp_threshold 
         self.creator_name_cache = creator_name_cache 
+        self.proxies = proxies
 
         if self.compress_images and Image is None:
             self.logger("⚠️ Image compression disabled: Pillow library not found (DownloadThread).")
@@ -2261,6 +2443,7 @@ class DownloadThread(QThread):
 
             self.logger("   Starting post fetch (single-threaded download process)...")
 
+            # --- FIX: Removed duplicate proxies argument here ---
             post_generator = download_from_api(
                 self.api_url_input,
                 logger=self.logger,
@@ -2275,9 +2458,11 @@ class DownloadThread(QThread):
                 app_base_dir=self.app_base_dir,
                 manga_filename_style_for_sort_check=self.manga_filename_style if self.manga_mode_active else None,
                 processed_post_ids=self.processed_post_ids_set,
-                fetch_all_first=self.fetch_first 
+                fetch_all_first=self.fetch_first,
+                proxies=self.proxies 
             )
 
+            processed_count_for_delay = 0
             for posts_batch_data in post_generator:
                 if self.isInterruptionRequested():
                     was_process_cancelled = True
@@ -2288,6 +2473,11 @@ class DownloadThread(QThread):
                         was_process_cancelled = True
                         break
 
+                    processed_count_for_delay += 1
+                    if processed_count_for_delay > 0 and processed_count_for_delay % 50 == 0:
+                         self.logger("   ⏳ Safety Pause: Waiting 10 seconds to respect server rate limits...")
+                         time.sleep(10)
+
                     worker_args = {
                         'post_data': individual_post_data,
                         'emitter': worker_signals_obj,
@@ -2356,7 +2546,8 @@ class DownloadThread(QThread):
                         'archive_only_mode': self.archive_only_mode, 
                         'manga_custom_filename_format': self.manga_custom_filename_format,
                         'manga_custom_date_format': self.manga_custom_date_format,
-                        'sfp_threshold': self.sfp_threshold 
+                        'sfp_threshold': self.sfp_threshold,
+                        'proxies': self.proxies 
                     }
 
                     post_processing_worker = PostProcessorWorker(**worker_args)

src/services/drive_downloader.py

@@ -145,7 +145,9 @@ def download_and_decrypt_mega_file(info, download_path, logger_func, progress_ca
         logger_func(f"   [Mega] Download for '{file_name}' cancelled before starting.")
         return
 
-    if file_size < MIN_SIZE_FOR_MULTIPART_MEGA:
+
+    # i tried to make the mega download multipart for big file but it didnt work you can try if you can fix this to make it multipart replace "if true" with this "if file_size < MIN_SIZE_FOR_MULTIPART_MEGA:" to activate multipart
+    if True:
         logger_func(f"   [Mega] Downloading '{file_name}' (Single Stream)...")
         try:
             cipher = AES.new(key, AES.MODE_CTR, nonce=nonce, initial_value=0)

src/services/updater.py

@@ -6,7 +6,7 @@ from packaging.version import parse as parse_version
 from PyQt5.QtCore import QThread, pyqtSignal
 
 # Constants for the updater
-GITHUB_REPO_URL = "https://api.github.com/repos/Yuvi63771/Kemono-Downloader/releases/latest"
+GITHUB_REPO_URL = "https://api.github.com/repos/Yuvi9587/Kemono-Downloader/releases/latest"
 EXE_NAME = "Kemono.Downloader.exe"
 
 class UpdateChecker(QThread):

src/ui/classes/allcomic_downloader_thread.py

@@ -0,0 +1,150 @@
+import os
+import threading
+import time
+from urllib.parse import urlparse
+
+import cloudscraper
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.allcomic_client import (fetch_chapter_data as allcomic_fetch_data,
+                                     get_chapter_list as allcomic_get_list)
+from ...utils.file_utils import clean_folder_name
+
+
+class AllcomicDownloadThread(QThread):
+    """A dedicated QThread for handling allcomic.com downloads."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool) 
+    overall_progress_signal = pyqtSignal(int, int) 
+
+    # 1. Update __init__ to accept proxies
+    def __init__(self, url, output_dir, parent=None, proxies=None):
+        super().__init__(parent)
+        self.comic_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+        self.pause_event = parent.pause_event if hasattr(parent, 'pause_event') else threading.Event()
+        self.proxies = proxies  # Store the proxies
+
+    def _check_pause(self):
+        if self.is_cancelled: return True
+        if self.pause_event and self.pause_event.is_set():
+            self.progress_signal.emit("   Download paused...")
+            while self.pause_event.is_set():
+                if self.is_cancelled: return True
+                time.sleep(0.5)
+            self.progress_signal.emit("   Download resumed.")
+        return self.is_cancelled
+
+    def run(self):
+        grand_total_dl = 0
+        grand_total_skip = 0
+
+        if self.proxies:
+            self.progress_signal.emit(f"   🌍 Network: Using Proxy {self.proxies}")
+        else:
+            self.progress_signal.emit("   🌍 Network: Direct Connection (No Proxy)")
+
+        scraper = requests.Session()
+        scraper.headers.update({
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+            'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8'
+        })
+
+        # 2. Pass self.proxies to get_chapter_list
+        chapters_to_download = allcomic_get_list(scraper, self.comic_url, self.progress_signal.emit, proxies=self.proxies)
+
+        if not chapters_to_download:
+            chapters_to_download = [self.comic_url]
+
+        self.progress_signal.emit(f"--- Starting download of {len(chapters_to_download)} chapter(s) ---")
+
+        for chapter_idx, chapter_url in enumerate(chapters_to_download):
+            if self._check_pause(): break
+            
+            self.progress_signal.emit(f"\n-- Processing Chapter {chapter_idx + 1}/{len(chapters_to_download)} --")
+            
+            # 3. Pass self.proxies to fetch_chapter_data
+            comic_title, chapter_title, image_urls = allcomic_fetch_data(scraper, chapter_url, self.progress_signal.emit, proxies=self.proxies)
+            
+            if not image_urls:
+                self.progress_signal.emit(f"❌ Failed to get data for chapter. Skipping.")
+                continue
+
+            series_folder_name = clean_folder_name(comic_title)
+            chapter_folder_name = clean_folder_name(chapter_title)
+            final_save_path = os.path.join(self.output_dir, series_folder_name, chapter_folder_name)
+            
+            try:
+                os.makedirs(final_save_path, exist_ok=True)
+                self.progress_signal.emit(f"   Saving to folder: '{os.path.join(series_folder_name, chapter_folder_name)}'")
+            except OSError as e:
+                self.progress_signal.emit(f"❌ Critical error creating directory: {e}")
+                grand_total_skip += len(image_urls)
+                continue
+
+            total_files_in_chapter = len(image_urls)
+            self.overall_progress_signal.emit(total_files_in_chapter, 0)
+            headers = {'Referer': chapter_url}
+
+            # 4. Define smart timeout for images
+            img_timeout = (30, 120) if self.proxies else 60
+
+            for i, img_url in enumerate(image_urls):
+                if self._check_pause(): break
+
+                file_extension = os.path.splitext(urlparse(img_url).path)[1] or '.jpg'
+                filename = f"{i+1:03d}{file_extension}"
+                filepath = os.path.join(final_save_path, filename)
+
+                if os.path.exists(filepath):
+                    self.progress_signal.emit(f"   -> Skip ({i+1}/{total_files_in_chapter}): '{filename}' already exists.")
+                    grand_total_skip += 1
+                else:
+                    download_successful = False
+                    max_retries = 8
+                    for attempt in range(max_retries):
+                        if self._check_pause(): break
+                        try:
+                            self.progress_signal.emit(f"   Downloading ({i+1}/{total_files_in_chapter}): '{filename}' (Attempt {attempt + 1})...")
+                            
+                            # 5. Use proxies, verify=False, and new timeout
+                            response = scraper.get(img_url, stream=True, headers=headers, timeout=img_timeout, proxies=self.proxies, verify=False)
+                            response.raise_for_status()
+
+                            with open(filepath, 'wb') as f:
+                                for chunk in response.iter_content(chunk_size=8192):
+                                    if self._check_pause(): break
+                                    f.write(chunk)
+                            
+                            if self._check_pause():
+                                if os.path.exists(filepath): os.remove(filepath)
+                                break 
+                            
+                            download_successful = True
+                            grand_total_dl += 1
+                            break
+                        
+                        except requests.RequestException as e:
+                            self.progress_signal.emit(f"      ⚠️ Attempt {attempt + 1} failed for '{filename}': {e}")
+                            if attempt < max_retries - 1:
+                                wait_time = 2 * (attempt + 1)
+                                self.progress_signal.emit(f"         Retrying in {wait_time} seconds...")
+                                time.sleep(wait_time)
+                            else:
+                                self.progress_signal.emit(f"   ❌ All attempts failed for '{filename}'. Skipping.")
+                                grand_total_skip += 1
+                
+                self.overall_progress_signal.emit(total_files_in_chapter, i + 1)
+                time.sleep(0.5) 
+            
+            if self._check_pause(): break
+
+        self.file_progress_signal.emit("", None)
+        self.finished_signal.emit(grand_total_dl, grand_total_skip, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by AllComic thread.")

src/ui/classes/booru_downloader_thread.py

@@ -0,0 +1,133 @@
+import os
+import threading
+import time
+import datetime
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.booru_client import fetch_booru_data, BooruClientException
+from ...utils.file_utils import clean_folder_name
+
+_ff_ver = (datetime.date.today().toordinal() - 735506) // 28
+USERAGENT_FIREFOX = (f"Mozilla/5.0 (Windows NT 10.0; Win64; x64; "
+                     f"rv:{_ff_ver}.0) Gecko/20100101 Firefox/{_ff_ver}.0")
+
+class BooruDownloadThread(QThread):
+    """A dedicated QThread for handling Danbooru and Gelbooru downloads."""
+    progress_signal = pyqtSignal(str)
+    overall_progress_signal = pyqtSignal(int, int)
+    finished_signal = pyqtSignal(int, int, bool) # dl_count, skip_count, cancelled
+
+    def __init__(self, url, output_dir, api_key, user_id, parent=None):
+        super().__init__(parent)
+        self.booru_url = url
+        self.output_dir = output_dir
+        self.api_key = api_key
+        self.user_id = user_id
+        self.is_cancelled = False
+        self.pause_event = parent.pause_event if hasattr(parent, 'pause_event') else threading.Event()
+
+    def run(self):
+        download_count = 0
+        skip_count = 0
+        processed_count = 0
+        cumulative_total = 0
+        
+        def logger(msg):
+            self.progress_signal.emit(str(msg))
+
+        try:
+            self.progress_signal.emit("=" * 40)
+            self.progress_signal.emit(f"🚀 Starting Booru Download for: {self.booru_url}")
+            
+            item_generator = fetch_booru_data(self.booru_url, self.api_key, self.user_id, logger)
+            
+            download_path = self.output_dir # Default path
+            path_initialized = False
+            
+            session = requests.Session()
+            session.headers["User-Agent"] = USERAGENT_FIREFOX
+
+            for item in item_generator:
+                if self.is_cancelled:
+                    break
+
+                if isinstance(item, tuple) and item[0] == 'PAGE_UPDATE':
+                    newly_found = item[1]
+                    cumulative_total += newly_found
+                    self.progress_signal.emit(f"   Found {newly_found} more posts. Total so far: {cumulative_total}")
+                    self.overall_progress_signal.emit(cumulative_total, processed_count)
+                    continue
+
+                post_data = item
+                processed_count += 1
+
+                if not path_initialized:
+                    base_folder_name = post_data.get('search_tags', 'booru_download')
+                    download_path = os.path.join(self.output_dir, clean_folder_name(base_folder_name))
+                    os.makedirs(download_path, exist_ok=True)
+                    path_initialized = True
+                
+                if self.pause_event.is_set():
+                    self.progress_signal.emit("   Download paused...")
+                    while self.pause_event.is_set():
+                        if self.is_cancelled: break
+                        time.sleep(0.5)
+                    if self.is_cancelled: break
+                    self.progress_signal.emit("   Download resumed.")
+
+                file_url = post_data.get('file_url')
+                if not file_url:
+                    skip_count += 1
+                    self.progress_signal.emit(f"   -> Skip ({processed_count}/{cumulative_total}): Post ID {post_data.get('id')} has no file URL.")
+                    continue
+
+                cat = post_data.get('category', 'booru')
+                post_id = post_data.get('id', 'unknown')
+                md5 = post_data.get('md5', '')
+                fname = post_data.get('filename', f"file_{post_id}")
+                ext = post_data.get('extension', 'jpg')
+                
+                final_filename = f"{cat}_{post_id}_{md5 or fname}.{ext}"
+                filepath = os.path.join(download_path, final_filename)
+
+                if os.path.exists(filepath):
+                    self.progress_signal.emit(f"   -> Skip ({processed_count}/{cumulative_total}): '{final_filename}' already exists.")
+                    skip_count += 1
+                else:
+                    try:
+                        self.progress_signal.emit(f"   Downloading ({processed_count}/{cumulative_total}): '{final_filename}'...")
+                        response = session.get(file_url, stream=True, timeout=60)
+                        response.raise_for_status()
+                        
+                        with open(filepath, 'wb') as f:
+                            for chunk in response.iter_content(chunk_size=8192):
+                                if self.is_cancelled: break
+                                f.write(chunk)
+                        
+                        if not self.is_cancelled:
+                            download_count += 1
+                        else:
+                            if os.path.exists(filepath): os.remove(filepath)
+                            skip_count += 1
+                            
+                    except Exception as e:
+                        self.progress_signal.emit(f"   ❌ Failed to download '{final_filename}': {e}")
+                        skip_count += 1
+                
+                self.overall_progress_signal.emit(cumulative_total, processed_count)
+                time.sleep(0.2)
+
+            if not path_initialized:
+                self.progress_signal.emit("No posts found for the given URL/tags.")
+
+        except BooruClientException as e:
+            self.progress_signal.emit(f"❌ A Booru client error occurred: {e}")
+        except Exception as e:
+            self.progress_signal.emit(f"❌ An unexpected error occurred in Booru thread: {e}")
+        finally:
+            self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Booru thread.")

src/ui/classes/bunkr_downloader_thread.py

@@ -0,0 +1,195 @@
+import os
+import re
+import time
+import requests
+import threading
+from concurrent.futures import ThreadPoolExecutor
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.bunkr_client import fetch_bunkr_data
+
+# Define image extensions
+IMG_EXTS = ('.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp', '.avif')
+BUNKR_IMG_THREADS = 6 # Hardcoded thread count for images
+
+class BunkrDownloadThread(QThread):
+    """A dedicated QThread for handling Bunkr downloads."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool, list)
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.bunkr_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+        
+        # --- NEW: Threading members ---
+        self.lock = threading.Lock()
+        self.download_count = 0
+        self.skip_count = 0
+        self.file_index = 0 # Use a shared index for logging
+
+        class ThreadLogger:
+            def __init__(self, signal_emitter):
+                self.signal_emitter = signal_emitter
+            def info(self, msg, *args, **kwargs):
+                self.signal_emitter.emit(str(msg))
+            def error(self, msg, *args, **kwargs):
+                self.signal_emitter.emit(f"❌ ERROR: {msg}")
+            def warning(self, msg, *args, **kwargs):
+                self.signal_emitter.emit(f"⚠️ WARNING: {msg}")
+            def debug(self, msg, *args, **kwargs):
+                pass
+
+        self.logger = ThreadLogger(self.progress_signal)
+
+    def _download_file(self, file_data, total_files, album_path, is_image_task=False):
+        """
+        A thread-safe method to download a single file.
+        This function will be called by the main thread (for videos) 
+        and worker threads (for images).
+        """
+        
+        # Stop if a cancellation signal was received before starting
+        if self.is_cancelled:
+            return
+
+        # --- Thread-safe index for logging ---
+        with self.lock:
+            self.file_index += 1
+            current_file_num = self.file_index
+        
+        try:
+            filename = file_data.get('name', 'untitled_file')
+            file_url = file_data.get('url')
+            headers = file_data.get('_http_headers')
+            
+            filename = re.sub(r'[<>:"/\\|?*]', '_', filename).strip()
+            filepath = os.path.join(album_path, filename)
+            
+            if os.path.exists(filepath):
+                self.progress_signal.emit(f"   -> Skip ({current_file_num}/{total_files}): '{filename}' already exists.")
+                with self.lock:
+                    self.skip_count += 1
+                return
+
+            self.progress_signal.emit(f"   Downloading ({current_file_num}/{total_files}): '{filename}'...")
+            
+            response = requests.get(file_url, stream=True, headers=headers, timeout=60)
+            response.raise_for_status()
+
+            total_size = int(response.headers.get('content-length', 0))
+            downloaded_size = 0
+            last_update_time = time.time()
+
+            with open(filepath, 'wb') as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    if self.is_cancelled:
+                        break
+                    if chunk:
+                        f.write(chunk)
+                        downloaded_size += len(chunk)
+                        
+                        # For videos/other files, send frequent progress
+                        # For images, don't send progress to avoid UI flicker
+                        if not is_image_task:
+                            current_time = time.time()
+                            if total_size > 0 and (current_time - last_update_time) > 0.5:
+                                self.file_progress_signal.emit(filename, (downloaded_size, total_size))
+                                last_update_time = current_time
+            
+            if self.is_cancelled:
+                self.progress_signal.emit(f"   Download cancelled for '{filename}'.")
+                if os.path.exists(filepath): os.remove(filepath)
+                return
+
+            if total_size > 0:
+                self.file_progress_signal.emit(filename, (total_size, total_size))
+            
+            with self.lock:
+                self.download_count += 1
+
+        except requests.exceptions.RequestException as e:
+            self.progress_signal.emit(f"   ❌ Failed to download '{filename}'. Error: {e}")
+            if os.path.exists(filepath): os.remove(filepath)
+            with self.lock:
+                self.skip_count += 1
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ An unexpected error occurred with '{filename}': {e}")
+            if os.path.exists(filepath): os.remove(filepath)
+            with self.lock:
+                self.skip_count += 1
+
+    def run(self):
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting Bunkr Download for: {self.bunkr_url}")
+        
+        album_name, files_to_download = fetch_bunkr_data(self.bunkr_url, self.logger)
+        
+        if not files_to_download:
+            self.progress_signal.emit("❌ Failed to extract file information from Bunkr. Aborting.")
+            self.finished_signal.emit(0, 0, self.is_cancelled, [])
+            return
+
+        album_path = os.path.join(self.output_dir, album_name)
+        try:
+            os.makedirs(album_path, exist_ok=True)
+            self.progress_signal.emit(f"   Saving to folder: '{album_path}'")
+        except OSError as e:
+            self.progress_signal.emit(f"❌ Critical error creating directory: {e}")
+            self.finished_signal.emit(0, len(files_to_download), self.is_cancelled, [])
+            return
+
+        total_files = len(files_to_download)
+        
+        # --- NEW: Separate files into images and others ---
+        image_files = []
+        other_files = []
+        for f in files_to_download:
+            name = f.get('name', '').lower()
+            if name.endswith(IMG_EXTS):
+                image_files.append(f)
+            else:
+                other_files.append(f)
+        
+        self.progress_signal.emit(f"   Found {len(image_files)} images and {len(other_files)} other files.")
+
+        # --- 1. Process videos and other files sequentially (one by one) ---
+        if other_files:
+            self.progress_signal.emit(f"   Downloading {len(other_files)} videos/other files sequentially...")
+            for file_data in other_files:
+                if self.is_cancelled:
+                    break
+                # Call the new download helper method
+                self._download_file(file_data, total_files, album_path, is_image_task=False)
+
+        # --- 2. Process images concurrently using a fixed 6-thread pool ---
+        if image_files and not self.is_cancelled:
+            self.progress_signal.emit(f"   Downloading {len(image_files)} images concurrently ({BUNKR_IMG_THREADS} threads)...")
+            with ThreadPoolExecutor(max_workers=BUNKR_IMG_THREADS, thread_name_prefix='BunkrImg') as executor:
+                
+                # Submit all image download tasks
+                futures = {executor.submit(self._download_file, file_data, total_files, album_path, is_image_task=True): file_data for file_data in image_files}
+                
+                try:
+                    # Wait for tasks to complete, but check for cancellation
+                    for future in futures:
+                        if self.is_cancelled:
+                            future.cancel() # Try to cancel running/pending tasks
+                        else:
+                            future.result() # Wait for the task to finish (or raise exception)
+                except Exception as e:
+                    self.progress_signal.emit(f"   ❌ A thread pool error occurred: {e}")
+
+        if self.is_cancelled:
+            self.progress_signal.emit("   Download cancelled by user.")
+            # Update skip count to reflect all non-downloaded files
+            self.skip_count = total_files - self.download_count
+        
+        self.file_progress_signal.emit("", None) # Clear file progress
+        self.finished_signal.emit(self.download_count, self.skip_count, self.is_cancelled, [])
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Bunkr thread.")

src/ui/classes/deviantart_downloader_thread.py

@@ -0,0 +1,212 @@
+import os
+import time
+import requests
+import re
+import random  # Needed for random delays
+from datetime import datetime
+from PyQt5.QtCore import QThread, pyqtSignal
+from ...core.deviantart_client import DeviantArtClient
+from ...utils.file_utils import clean_folder_name
+
+class DeviantArtDownloadThread(QThread):
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    overall_progress_signal = pyqtSignal(int, int)
+    finished_signal = pyqtSignal(int, int, bool, list)
+
+    # 1. Accept proxies in init
+    def __init__(self, url, output_dir, pause_event, cancellation_event, parent=None, proxies=None):
+        super().__init__(parent)
+        self.url = url
+        self.output_dir = output_dir
+        self.pause_event = pause_event
+        self.cancellation_event = cancellation_event
+        self.proxies = proxies # Store proxies
+                
+        self.parent_app = parent 
+        self.download_count = 0
+        self.skip_count = 0
+
+    def run(self):
+        self.client = DeviantArtClient(logger_func=self.progress_signal.emit, proxies=self.proxies)
+
+        if self.proxies:
+             self.progress_signal.emit(f"   🌍 Network: Using Proxy {self.proxies}")
+        else:
+             self.progress_signal.emit("   🌍 Network: Direct Connection")
+
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting DeviantArt download for: {self.url}")
+        
+        try:
+            if not self.client.authenticate():
+                self.progress_signal.emit("❌ Failed to authenticate with DeviantArt API.")
+                self.finished_signal.emit(0, 0, True, [])
+                return
+
+            mode, username, _ = self.client.extract_info_from_url(self.url)
+            
+            if mode == 'post':
+                self._process_single_post(self.url)
+            elif mode == 'gallery':
+                self._process_gallery(username)
+            else:
+                self.progress_signal.emit("❌ Could not parse DeviantArt URL type.")
+                
+        except Exception as e:
+            self.progress_signal.emit(f"❌ Error during download: {e}")
+            self.skip_count += 1
+        finally:
+            self.finished_signal.emit(self.download_count, self.skip_count, self.cancellation_event.is_set(), [])
+
+    def _check_pause_cancel(self):
+        if self.cancellation_event.is_set(): return True
+        while self.pause_event.is_set():
+            time.sleep(0.5)
+            if self.cancellation_event.is_set(): return True
+        return False
+
+    def _process_single_post(self, url):
+        self.progress_signal.emit(f"   Fetching deviation info...")
+        uuid = self.client.get_deviation_uuid(url)
+        if not uuid:
+            self.progress_signal.emit("❌ Could not find Deviation UUID.")
+            self.skip_count += 1
+            return
+
+        meta = self.client._api_call(f"/deviation/{uuid}")
+        content = self.client.get_deviation_content(uuid)
+        if not content:
+            self.progress_signal.emit("❌ Could not retrieve download URL.")
+            self.skip_count += 1
+            return
+
+        self._download_file(content['src'], meta)
+
+    def _process_gallery(self, username):
+        self.progress_signal.emit(f"   Fetching gallery for user: {username}...")
+        offset = 0
+        has_more = True
+        
+        base_folder = os.path.join(self.output_dir, clean_folder_name(username))
+        if not os.path.exists(base_folder):
+            os.makedirs(base_folder, exist_ok=True)
+
+        while has_more:
+            if self._check_pause_cancel(): break
+
+            data = self.client.get_gallery_folder(username, offset=offset)
+            results = data.get('results', [])
+            has_more = data.get('has_more', False)
+            offset = data.get('next_offset')
+
+            if not results: break
+
+            for deviation in results:
+                if self._check_pause_cancel(): break
+                self._process_deviation_task(deviation, base_folder)
+                
+                # 4. FIX 429: Add a small random delay between items
+                # This prevents hammering the API 24 times in a single second.
+                time.sleep(random.uniform(0.5, 1.2))
+
+            time.sleep(1) 
+
+    def _process_deviation_task(self, deviation, base_folder):
+        if self._check_pause_cancel(): return
+
+        dev_id = deviation.get('deviationid')
+        title = deviation.get('title', 'Unknown')
+
+        try:
+            content = self.client.get_deviation_content(dev_id)
+            if content:
+                self._download_file(content['src'], deviation, override_dir=base_folder)
+            else:
+                self.skip_count += 1
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ Error processing {title}: {e}")
+            self.skip_count += 1
+
+    def _format_date(self, timestamp):
+        if not timestamp: return "NoDate"
+        try:
+            fmt_setting = self.parent_app.manga_custom_date_format
+            strftime_fmt = fmt_setting.replace("YYYY", "%Y").replace("MM", "%m").replace("DD", "%d")
+            dt_obj = datetime.fromtimestamp(int(timestamp))
+            return dt_obj.strftime(strftime_fmt)
+        except Exception:
+            return "InvalidDate"
+
+    def _download_file(self, file_url, metadata, override_dir=None):
+        if self._check_pause_cancel(): return
+
+        parsed = requests.utils.urlparse(file_url)
+        path_filename = os.path.basename(parsed.path)
+        if '?' in path_filename: path_filename = path_filename.split('?')[0]
+        _, ext = os.path.splitext(path_filename)
+
+        title = metadata.get('title', 'Untitled')
+        safe_title = clean_folder_name(title)
+        if not safe_title: safe_title = "Untitled"
+        
+        final_filename = f"{safe_title}{ext}"
+
+        if self.parent_app and self.parent_app.manga_mode_checkbox.isChecked():
+            try:
+                creator_name = metadata.get('author', {}).get('username', 'Unknown')
+                published_ts = metadata.get('published_time')
+                
+                fmt_data = {
+                    "creator_name": creator_name,
+                    "title": title,
+                    "published": self._format_date(published_ts),
+                    "added": self._format_date(published_ts),
+                    "edited": self._format_date(published_ts),
+                    "id": metadata.get('deviationid', ''),
+                    "service": "deviantart",
+                    "name": safe_title 
+                }
+
+                custom_fmt = self.parent_app.custom_manga_filename_format
+                new_name = custom_fmt.format(**fmt_data)
+                final_filename = f"{clean_folder_name(new_name)}{ext}"
+                
+            except Exception as e:
+                pass 
+
+        save_dir = override_dir if override_dir else self.output_dir
+        if not os.path.exists(save_dir):
+            try:
+                os.makedirs(save_dir, exist_ok=True)
+            except OSError: pass
+
+        filepath = os.path.join(save_dir, final_filename)
+
+        if os.path.exists(filepath):
+            return
+
+        try:
+            self.progress_signal.emit(f"   ⬇️ Downloading: {final_filename}")
+            
+            # 5. Determine smart timeout for files
+            timeout_val = (30, 120) if self.proxies else 30
+            
+            # 6. Use proxies and verify=False
+            with requests.get(file_url, stream=True, timeout=timeout_val, proxies=self.proxies, verify=False) as r:
+                r.raise_for_status()
+                
+                with open(filepath, 'wb') as f:
+                    for chunk in r.iter_content(chunk_size=8192):
+                        if self._check_pause_cancel():
+                            f.close()
+                            os.remove(filepath)
+                            return
+                        if chunk:
+                            f.write(chunk)
+            
+            self.download_count += 1
+            
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ Download failed: {e}")
+            self.skip_count += 1

src/ui/classes/discord_downloader_thread.py

@@ -0,0 +1,189 @@
+import os
+import time
+import datetime
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+
+# Assuming discord_pdf_generator is in the dialogs folder, sibling to the classes folder
+from ..dialogs.discord_pdf_generator import create_pdf_from_discord_messages
+
+# This constant is needed for the thread to function independently
+_ff_ver = (datetime.date.today().toordinal() - 735506) // 28
+USERAGENT_FIREFOX = (f"Mozilla/5.0 (Windows NT 10.0; Win64; x64; "
+                     f"rv:{_ff_ver}.0) Gecko/20100101 Firefox/{_ff_ver}.0")
+
+class DiscordDownloadThread(QThread):
+    """A dedicated QThread for handling all official Discord downloads."""
+    progress_signal = pyqtSignal(str)
+    progress_label_signal = pyqtSignal(str)
+    finished_signal = pyqtSignal(int, int, bool, list)
+
+    def __init__(self, mode, session, token, output_dir, server_id, channel_id, url, app_base_dir, limit=None, parent=None):
+        super().__init__(parent)
+        self.mode = mode
+        self.session = session
+        self.token = token
+        self.output_dir = output_dir
+        self.server_id = server_id
+        self.channel_id = channel_id
+        self.api_url = url
+        self.message_limit = limit
+        self.app_base_dir = app_base_dir # Path to app's base directory
+
+        self.is_cancelled = False
+        self.is_paused = False
+
+    def run(self):
+        if self.mode == 'pdf':
+            self._run_pdf_creation()
+        else:
+            self._run_file_download()
+
+    def cancel(self):
+        self.progress_signal.emit("   Cancellation signal received by Discord thread.")
+        self.is_cancelled = True
+
+    def pause(self):
+        self.progress_signal.emit("   Pausing Discord download...")
+        self.is_paused = True
+
+    def resume(self):
+        self.progress_signal.emit("   Resuming Discord download...")
+        self.is_paused = False
+
+    def _check_events(self):
+        if self.is_cancelled:
+            return True
+        while self.is_paused:
+            time.sleep(0.5)
+            if self.is_cancelled:
+                return True
+        return False
+
+    def _fetch_all_messages(self):
+        all_messages = []
+        last_message_id = None
+        headers = {'Authorization': self.token, 'User-Agent': USERAGENT_FIREFOX}
+
+        while True:
+            if self._check_events(): break
+            
+            endpoint = f"/channels/{self.channel_id}/messages?limit=100"
+            if last_message_id:
+                endpoint += f"&before={last_message_id}"
+            
+            try:
+                resp = self.session.get(f"https://discord.com/api/v10{endpoint}", headers=headers, timeout=30)
+                resp.raise_for_status()
+                message_batch = resp.json()
+            except Exception as e:
+                self.progress_signal.emit(f"   ❌ Error fetching message batch: {e}")
+                break
+
+            if not message_batch:
+                break
+            
+            all_messages.extend(message_batch)
+
+            if self.message_limit and len(all_messages) >= self.message_limit:
+                self.progress_signal.emit(f"   Reached message limit of {self.message_limit}. Halting fetch.")
+                all_messages = all_messages[:self.message_limit]
+                break
+
+            last_message_id = message_batch[-1]['id']
+            self.progress_label_signal.emit(f"Fetched {len(all_messages)} messages...")
+            time.sleep(1) # API Rate Limiting
+        
+        return all_messages
+
+    def _run_pdf_creation(self):
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting Discord PDF export for: {self.api_url}")
+        self.progress_label_signal.emit("Fetching messages...")
+
+        all_messages = self._fetch_all_messages()
+
+        if self.is_cancelled:
+            self.finished_signal.emit(0, 0, True, [])
+            return
+        
+        self.progress_label_signal.emit(f"Collected {len(all_messages)} total messages. Generating PDF...")
+        all_messages.reverse()
+        
+        font_path = os.path.join(self.app_base_dir, 'data', 'dejavu-sans', 'DejaVuSans.ttf')
+        output_filepath = os.path.join(self.output_dir, f"discord_{self.server_id}_{self.channel_id or 'server'}.pdf")
+
+        success = create_pdf_from_discord_messages(
+            all_messages, self.server_id, self.channel_id,
+            output_filepath, font_path, logger=self.progress_signal.emit,
+            cancellation_event=self, pause_event=self
+        )
+        
+        if success:
+            self.progress_label_signal.emit(f"✅ PDF export complete!")
+        elif not self.is_cancelled:
+            self.progress_label_signal.emit(f"❌ PDF export failed. Check log for details.")
+        
+        self.finished_signal.emit(0, len(all_messages), self.is_cancelled, [])
+
+    def _run_file_download(self):
+        download_count = 0
+        skip_count = 0
+        try:
+            self.progress_signal.emit("=" * 40)
+            self.progress_signal.emit(f"🚀 Starting Discord download for channel: {self.channel_id}")
+            self.progress_label_signal.emit("Fetching messages...")
+            all_messages = self._fetch_all_messages()
+
+            if self.is_cancelled:
+                self.finished_signal.emit(0, 0, True, [])
+                return
+
+            self.progress_label_signal.emit(f"Collected {len(all_messages)} messages. Starting downloads...")
+            total_attachments = sum(len(m.get('attachments', [])) for m in all_messages)
+
+            for message in reversed(all_messages):
+                if self._check_events(): break
+                for attachment in message.get('attachments', []):
+                    if self._check_events(): break
+                    
+                    file_url = attachment['url']
+                    original_filename = attachment['filename']
+                    filepath = os.path.join(self.output_dir, original_filename)
+                    filename_to_use = original_filename
+
+                    counter = 1
+                    base_name, extension = os.path.splitext(original_filename)
+                    while os.path.exists(filepath):
+                        filename_to_use = f"{base_name} ({counter}){extension}"
+                        filepath = os.path.join(self.output_dir, filename_to_use)
+                        counter += 1
+                    
+                    if filename_to_use != original_filename:
+                        self.progress_signal.emit(f"   -> Duplicate name '{original_filename}'. Saving as '{filename_to_use}'.")
+
+                    try:
+                        self.progress_signal.emit(f"   Downloading ({download_count+1}/{total_attachments}): '{filename_to_use}'...")
+                        response = requests.get(file_url, stream=True, timeout=60)
+                        response.raise_for_status()
+                        
+                        download_cancelled_mid_file = False
+                        with open(filepath, 'wb') as f:
+                            for chunk in response.iter_content(chunk_size=8192):
+                                if self._check_events():
+                                    download_cancelled_mid_file = True
+                                    break
+                                f.write(chunk)
+                        
+                        if download_cancelled_mid_file:
+                            self.progress_signal.emit(f"   Download cancelled for '{filename_to_use}'. Deleting partial file.")
+                            if os.path.exists(filepath):
+                                os.remove(filepath)
+                            continue
+                        
+                        download_count += 1
+                    except Exception as e:
+                        self.progress_signal.emit(f"   ❌ Failed to download '{filename_to_use}': {e}")
+                        skip_count += 1
+        finally:
+            self.finished_signal.emit(download_count, skip_count, self.is_cancelled, [])

src/ui/classes/downloader_factory.py

@@ -0,0 +1,206 @@
+import re
+import requests
+from urllib.parse import urlparse
+
+# Utility Imports
+from ...utils.network_utils import prepare_cookies_for_request
+from ...utils.file_utils import clean_folder_name 
+
+# Downloader Thread Imports (Alphabetical Order Recommended)
+from .allcomic_downloader_thread import AllcomicDownloadThread
+from .booru_downloader_thread import BooruDownloadThread
+from .bunkr_downloader_thread import BunkrDownloadThread
+from .discord_downloader_thread import DiscordDownloadThread # Official Discord
+from .drive_downloader_thread import DriveDownloadThread
+from .erome_downloader_thread import EromeDownloadThread
+from .external_link_downloader_thread import ExternalLinkDownloadThread
+from .fap_nation_downloader_thread import FapNationDownloadThread
+from .hentai2read_downloader_thread import Hentai2readDownloadThread
+from .kemono_discord_downloader_thread import KemonoDiscordDownloadThread
+from .mangadex_downloader_thread import MangaDexDownloadThread
+from .nhentai_downloader_thread import NhentaiDownloadThread
+from .pixeldrain_downloader_thread import PixeldrainDownloadThread
+from .rule34video_downloader_thread import Rule34VideoDownloadThread
+from .saint2_downloader_thread import Saint2DownloadThread
+from .simp_city_downloader_thread import SimpCityDownloadThread
+from .toonily_downloader_thread import ToonilyDownloadThread
+from .deviantart_downloader_thread import DeviantArtDownloadThread
+from .hentaifox_downloader_thread import HentaiFoxDownloadThread
+
+def create_downloader_thread(main_app, api_url, service, id1, id2, effective_output_dir_for_run):
+    """
+    Factory function to create and configure the correct QThread for a given URL.
+    Returns a configured QThread instance, a specific error string ("COOKIE_ERROR", "FETCH_ERROR"),
+    or None if no special handler is found (indicating fallback to generic BackendDownloadThread).
+    """
+
+
+    # Handler for Booru sites (Danbooru, Gelbooru)
+    if service in ['danbooru', 'gelbooru']:
+        api_key = main_app.api_key_input.text().strip()
+        user_id = main_app.user_id_input.text().strip()
+        return BooruDownloadThread(
+            url=api_url, output_dir=effective_output_dir_for_run,
+            api_key=api_key, user_id=user_id, parent=main_app
+        )
+
+    # Handler for cloud storage sites (Mega, GDrive, Dropbox, GoFile)
+    platform = None
+    if 'mega.nz' in api_url or 'mega.io' in api_url: platform = 'mega'
+    elif 'drive.google.com' in api_url: platform = 'gdrive'
+    elif 'dropbox.com' in api_url: platform = 'dropbox'
+    elif 'gofile.io' in api_url: platform = 'gofile'
+    if platform:
+        use_post_subfolder = main_app.use_subfolder_per_post_checkbox.isChecked()
+        return DriveDownloadThread(
+            api_url, effective_output_dir_for_run, platform, use_post_subfolder,
+            main_app.cancellation_event, main_app.pause_event, main_app.log_signal.emit,
+            parent=main_app # Pass parent for consistency
+        )
+
+    # Handler for Erome
+    if 'erome.com' in api_url:
+        return EromeDownloadThread(api_url, effective_output_dir_for_run, main_app)
+
+    # Handler for MangaDex
+    if 'mangadex.org' in api_url:
+        return MangaDexDownloadThread(api_url, effective_output_dir_for_run, main_app)
+
+    # Handler for Saint2
+    is_saint2_url = service == 'saint2' or 'saint2.su' in api_url or 'saint2.pk' in api_url # Add more domains if needed
+    if is_saint2_url and api_url.strip().lower() != 'saint2.su': # Exclude batch mode trigger if using URL input
+        return Saint2DownloadThread(api_url, effective_output_dir_for_run, main_app)
+
+    # Handler for SimpCity
+    if service == 'simpcity':
+        cookies = prepare_cookies_for_request(
+            use_cookie_flag=True, # SimpCity requires cookies
+            cookie_text_input=main_app.simpcity_cookie_text_input.text(), # Use dedicated input
+            selected_cookie_file_path=main_app.selected_cookie_filepath, # Use shared selection
+            app_base_dir=main_app.app_base_dir,
+            logger_func=main_app.log_signal.emit,
+            target_domain='simpcity.cr' # Specific domain
+        )
+        if not cookies:
+            main_app.log_signal.emit("❌ SimpCity requires valid cookies. Please provide them.")
+            return "COOKIE_ERROR" # Sentinel value for cookie failure
+        return SimpCityDownloadThread(api_url, id2, effective_output_dir_for_run, cookies, main_app)
+
+    # Handler for Rule34Video
+    if service == 'rule34video':
+        main_app.log_signal.emit("ℹ️ Rule34Video.com URL detected. Starting dedicated downloader.")
+        return Rule34VideoDownloadThread(api_url, effective_output_dir_for_run, main_app) # id1 (video_id) is used inside the thread
+
+    # HANDLER FOR KEMONO DISCORD (Place BEFORE official Discord)
+    elif service == 'discord' and any(domain in api_url for domain in ['kemono.cr', 'kemono.su', 'kemono.party']):
+        main_app.log_signal.emit("ℹ️ Kemono Discord URL detected. Starting dedicated downloader.")
+        cookies = prepare_cookies_for_request(
+            use_cookie_flag=main_app.use_cookie_checkbox.isChecked(), # Respect UI setting
+            cookie_text_input=main_app.cookie_text_input.text(),
+            selected_cookie_file_path=main_app.selected_cookie_filepath,
+            app_base_dir=main_app.app_base_dir,
+            logger_func=main_app.log_signal.emit,
+            target_domain='kemono.cr' # Primary Kemono domain, adjust if needed
+        )
+        # KemonoDiscordDownloadThread expects parent for events
+        return KemonoDiscordDownloadThread(
+            server_id=id1,
+            channel_id=id2,
+            output_dir=effective_output_dir_for_run,
+            cookies_dict=cookies,
+            parent=main_app
+        )
+
+    # Handler for official Discord URLs
+    elif service == 'discord' and 'discord.com' in api_url:
+        main_app.log_signal.emit("ℹ️ Official Discord URL detected. Starting dedicated downloader.")
+        token = main_app.remove_from_filename_input.text().strip() # Token is in the "Remove Words" field for Discord
+        if not token:
+             main_app.log_signal.emit("❌ Official Discord requires an Authorization Token in the 'Remove Words' field.")
+             return None # Or a specific error sentinel
+
+        limit_text = main_app.discord_message_limit_input.text().strip()
+        message_limit = int(limit_text) if limit_text.isdigit() else None
+        mode = main_app.discord_download_scope # Should be 'pdf' or 'files'
+
+        return DiscordDownloadThread(
+            mode=mode,
+            session=requests.Session(), # Create a session for this thread
+            token=token,
+            output_dir=effective_output_dir_for_run,
+            server_id=id1,
+            channel_id=id2,
+            url=api_url,
+            app_base_dir=main_app.app_base_dir,
+            limit=message_limit,
+            parent=main_app # Pass main_app for events/signals
+        )
+
+    # Check specific domains or rely on service name if extract_post_info provides it
+    if service == 'allcomic' or 'allcomic.com' in api_url or 'allporncomic.com' in api_url:
+        return AllcomicDownloadThread(api_url, effective_output_dir_for_run, main_app)
+
+    # Handler for Hentai2Read
+    if service == 'hentai2read' or 'hentai2read.com' in api_url:
+        return Hentai2readDownloadThread(api_url, effective_output_dir_for_run, main_app)
+
+    # Handler for Fap-Nation
+    if service == 'fap-nation' or 'fap-nation.com' in api_url or 'fap-nation.org' in api_url:
+        use_post_subfolder = main_app.use_subfolder_per_post_checkbox.isChecked()
+        # Ensure signals are passed correctly if needed by the thread
+        return FapNationDownloadThread(
+            api_url, effective_output_dir_for_run, use_post_subfolder,
+            main_app.pause_event, main_app.cancellation_event, main_app.actual_gui_signals, main_app
+        )
+
+    # Handler for Pixeldrain
+    if service == 'pixeldrain' or 'pixeldrain.com' in api_url:
+        return PixeldrainDownloadThread(api_url, effective_output_dir_for_run, main_app) # URL contains the ID
+
+    # Handler for nHentai
+    if service == 'nhentai':
+        from ...core.nhentai_client import fetch_nhentai_gallery
+        main_app.log_signal.emit(f"ℹ️ nHentai gallery ID {id1} detected. Fetching gallery data...")
+        gallery_data = fetch_nhentai_gallery(id1, main_app.log_signal.emit)
+        if not gallery_data:
+            main_app.log_signal.emit(f"❌ Failed to fetch nHentai gallery data for ID {id1}.")
+            return "FETCH_ERROR" # Sentinel value for fetch failure
+        return NhentaiDownloadThread(gallery_data, effective_output_dir_for_run, main_app)
+
+    # Handler for Toonily
+    if service == 'toonily' or 'toonily.com' in api_url:
+        return ToonilyDownloadThread(api_url, effective_output_dir_for_run, main_app)
+
+    # Handler for Bunkr
+    if service == 'bunkr':
+         # id1 contains the full URL or album ID from extract_post_info
+        return BunkrDownloadThread(id1, effective_output_dir_for_run, main_app)
+
+    # Handler for DeviantArt
+    if service == 'deviantart':
+        main_app.log_signal.emit(f"ℹ️ DeviantArt URL detected. Starting dedicated downloader.")
+        return DeviantArtDownloadThread(
+            url=api_url,
+            output_dir=effective_output_dir_for_run,
+            pause_event=main_app.pause_event,
+            cancellation_event=main_app.cancellation_event,
+            parent=main_app
+        )
+
+    # Handler for HentaiFox (New)
+    if 'hentaifox.com' in api_url or service == 'hentaifox':
+        main_app.log_signal.emit("🦊 HentaiFox URL detected.")
+        return HentaiFoxDownloadThread(
+            url_or_id=api_url,
+            output_dir=effective_output_dir_for_run,
+            parent=main_app
+        )    
+    
+    
+    # ----------------------
+    # --- Fallback ---
+    # If no specific handler matched based on service name or URL pattern, return None.
+    # This signals main_window.py to use the generic BackendDownloadThread/PostProcessorWorker
+    # which uses the standard Kemono/Coomer post API.
+    main_app.log_signal.emit(f"ℹ️ No specialized downloader found for service '{service}' and URL '{api_url[:50]}...'. Using generic downloader.")
+    return None

src/ui/classes/drive_downloader_thread.py

@@ -0,0 +1,77 @@
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...services.drive_downloader import (
+    download_dropbox_file,
+    download_gdrive_file,
+    download_gofile_folder,
+    download_mega_file as drive_download_mega_file,
+)
+
+
+class DriveDownloadThread(QThread):
+    """A dedicated QThread for handling direct Mega, GDrive, and Dropbox links."""
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool, list)
+    overall_progress_signal = pyqtSignal(int, int)
+
+    def __init__(self, url, output_dir, platform, use_post_subfolder, cancellation_event, pause_event, logger_func, parent=None):
+        super().__init__(parent)
+        self.drive_url = url
+        self.output_dir = output_dir
+        self.platform = platform
+        self.use_post_subfolder = use_post_subfolder
+        self.is_cancelled = False
+        self.cancellation_event = cancellation_event
+        self.pause_event = pause_event
+        self.logger_func = logger_func
+
+    def run(self):
+        self.logger_func("=" * 40)
+        self.logger_func(f"🚀 Starting direct {self.platform.capitalize()} Download for: {self.drive_url}")
+        
+        try:
+            if self.platform == 'mega':
+                drive_download_mega_file(
+                    self.drive_url, self.output_dir,
+                    logger_func=self.logger_func,
+                    progress_callback_func=self.file_progress_signal.emit,
+                    overall_progress_callback=self.overall_progress_signal.emit,
+                    cancellation_event=self.cancellation_event,
+                    pause_event=self.pause_event
+                )
+            elif self.platform == 'gdrive':
+                download_gdrive_file(
+                    self.drive_url, self.output_dir,
+                    logger_func=self.logger_func,
+                    progress_callback_func=self.file_progress_signal.emit,
+                    overall_progress_callback=self.overall_progress_signal.emit,
+                    use_post_subfolder=self.use_post_subfolder,
+                    post_title="Google Drive Download"
+                )
+            elif self.platform == 'dropbox':
+                download_dropbox_file(
+                    self.drive_url, self.output_dir,
+                    logger_func=self.logger_func,
+                    progress_callback_func=self.file_progress_signal.emit,
+                    use_post_subfolder=self.use_post_subfolder,
+                    post_title="Dropbox Download"
+                )
+            elif self.platform == 'gofile':
+                download_gofile_folder(
+                    self.drive_url, self.output_dir,
+                    logger_func=self.logger_func,
+                    progress_callback_func=self.file_progress_signal.emit,
+                    overall_progress_callback=self.overall_progress_signal.emit
+                )
+
+            self.finished_signal.emit(1, 0, self.is_cancelled, [])
+
+        except Exception as e:
+            self.logger_func(f"❌ An unexpected error occurred in DriveDownloadThread: {e}")
+            self.finished_signal.emit(0, 1, self.is_cancelled, [])
+
+    def cancel(self):
+        self.is_cancelled = True
+        if self.cancellation_event:
+            self.cancellation_event.set()
+        self.logger_func(f"   Cancellation signal received by {self.platform.capitalize()} thread.")

src/ui/classes/erome_downloader_thread.py

@@ -0,0 +1,106 @@
+import os
+import time
+import requests
+import cloudscraper
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.erome_client import fetch_erome_data
+
+class EromeDownloadThread(QThread):
+    """A dedicated QThread for handling erome.com downloads."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool) # dl_count, skip_count, cancelled
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.erome_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+
+    def run(self):
+        download_count = 0
+        skip_count = 0
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting Erome.com Download for: {self.erome_url}")
+        
+        album_name, files_to_download = fetch_erome_data(self.erome_url, self.progress_signal.emit)
+        
+        if not files_to_download:
+            self.progress_signal.emit("❌ Failed to extract file information from Erome. Aborting.")
+            self.finished_signal.emit(0, 0, self.is_cancelled)
+            return
+
+        album_path = os.path.join(self.output_dir, album_name)
+        try:
+            os.makedirs(album_path, exist_ok=True)
+            self.progress_signal.emit(f"   Saving to folder: '{album_path}'")
+        except OSError as e:
+            self.progress_signal.emit(f"❌ Critical error creating directory: {e}")
+            self.finished_signal.emit(0, len(files_to_download), self.is_cancelled)
+            return
+
+        total_files = len(files_to_download)
+        session = cloudscraper.create_scraper()
+
+        for i, file_data in enumerate(files_to_download):
+            if self.is_cancelled:
+                self.progress_signal.emit("   Download cancelled by user.")
+                skip_count = total_files - download_count
+                break
+
+            filename = file_data.get('filename', f'untitled_{i+1}.mp4')
+            file_url = file_data.get('url')
+            headers = file_data.get('headers')
+            filepath = os.path.join(album_path, filename)
+            
+            if os.path.exists(filepath):
+                self.progress_signal.emit(f"   -> Skip ({i+1}/{total_files}): '{filename}' already exists.")
+                skip_count += 1
+                continue
+
+            self.progress_signal.emit(f"   Downloading ({i+1}/{total_files}): '{filename}'...")
+            
+            try:
+                response = session.get(file_url, stream=True, headers=headers, timeout=60)
+                response.raise_for_status()
+
+                total_size = int(response.headers.get('content-length', 0))
+                downloaded_size = 0
+                last_update_time = time.time()
+
+                with open(filepath, 'wb') as f:
+                    for chunk in response.iter_content(chunk_size=8192):
+                        if self.is_cancelled:
+                            break
+                        if chunk:
+                            f.write(chunk)
+                            downloaded_size += len(chunk)
+                            current_time = time.time()
+                            if total_size > 0 and (current_time - last_update_time) > 0.5:
+                                self.file_progress_signal.emit(filename, (downloaded_size, total_size))
+                                last_update_time = current_time
+                
+                if self.is_cancelled:
+                    if os.path.exists(filepath): os.remove(filepath)
+                    continue
+                
+                if total_size > 0:
+                    self.file_progress_signal.emit(filename, (total_size, total_size))
+
+                download_count += 1
+            except requests.exceptions.RequestException as e:
+                self.progress_signal.emit(f"   ❌ Failed to download '{filename}'. Error: {e}")
+                if os.path.exists(filepath): os.remove(filepath)
+                skip_count += 1
+            except Exception as e:
+                self.progress_signal.emit(f"   ❌ An unexpected error occurred with '{filename}': {e}")
+                if os.path.exists(filepath): os.remove(filepath)
+                skip_count += 1
+        
+        self.file_progress_signal.emit("", None)
+        self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Erome thread.")

src/ui/classes/external_link_downloader_thread.py

@@ -0,0 +1,86 @@
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...services.drive_downloader import (
+    download_dropbox_file,
+    download_gdrive_file,
+    download_mega_file as drive_download_mega_file,
+)
+
+
+class ExternalLinkDownloadThread(QThread):
+    """A QThread to handle downloading multiple external links sequentially."""
+    progress_signal = pyqtSignal(str)
+    file_complete_signal = pyqtSignal(str, bool)
+    finished_signal = pyqtSignal()
+    overall_progress_signal = pyqtSignal(int, int)
+    file_progress_signal = pyqtSignal(str, object)
+
+    def __init__(self, tasks_to_download, download_base_path, parent_logger_func, parent=None, use_post_subfolder=False):
+        super().__init__(parent)
+        self.tasks = tasks_to_download
+        self.download_base_path = download_base_path
+        self.parent_logger_func = parent_logger_func
+        self.is_cancelled = False
+        self.use_post_subfolder = use_post_subfolder
+
+    def run(self):
+        total_tasks = len(self.tasks)
+        self.progress_signal.emit(f"ℹ️ Starting external link download thread for {total_tasks} link(s).")
+        self.overall_progress_signal.emit(total_tasks, 0)
+
+        for i, task_info in enumerate(self.tasks):
+            if self.is_cancelled:
+                self.progress_signal.emit("External link download cancelled by user.")
+                break
+
+            self.overall_progress_signal.emit(total_tasks, i + 1)
+            
+            platform = task_info.get('platform', 'unknown').lower()
+            full_url = task_info['url']
+            post_title = task_info['title']
+
+            self.progress_signal.emit(f"Download ({i + 1}/{total_tasks}): Starting '{post_title}' ({platform.upper()}) from {full_url}")
+
+            try:
+                if platform == 'mega':
+                    drive_download_mega_file(
+                        full_url,
+                        self.download_base_path,
+                        logger_func=self.parent_logger_func,
+                        progress_callback_func=self.file_progress_signal.emit,
+                        overall_progress_callback=self.overall_progress_signal.emit
+                    )
+                elif platform == 'google drive':
+                    download_gdrive_file(
+                        full_url,
+                        self.download_base_path,
+                        logger_func=self.parent_logger_func,
+                        progress_callback_func=self.file_progress_signal.emit,
+                        overall_progress_callback=self.overall_progress_signal.emit,
+                        use_post_subfolder=self.use_post_subfolder,
+                        post_title=post_title
+                    )
+                elif platform == 'dropbox':
+                    download_dropbox_file(
+                        full_url,
+                        self.download_base_path,
+                        logger_func=self.parent_logger_func,
+                        progress_callback_func=self.file_progress_signal.emit,
+                        use_post_subfolder=self.use_post_subfolder,
+                        post_title=post_title
+                    )
+                else:
+                    self.progress_signal.emit(f"⚠️ Unsupported platform '{platform}' for link: {full_url}")
+                    self.file_complete_signal.emit(full_url, False)
+                    continue
+                self.file_complete_signal.emit(full_url, True)
+            except Exception as e:
+                self.progress_signal.emit(f"❌ Error downloading ({platform.upper()}) link '{full_url}': {e}")
+                self.file_complete_signal.emit(full_url, False)
+
+        self.finished_signal.emit()
+
+    def cancel(self):
+        """Sets the cancellation flag to stop the thread gracefully."""
+        self.progress_signal.emit("   [External Links] Cancellation signal received by thread.")
+        self.is_cancelled = True

src/ui/classes/fap_nation_downloader_thread.py

@@ -0,0 +1,162 @@
+import os
+import sys
+import re
+import threading
+import time
+from PyQt5.QtCore import QThread, pyqtSignal, QProcess
+import cloudscraper
+
+from ...core.fap_nation_client import fetch_fap_nation_data
+from ...services.multipart_downloader import download_file_in_parts
+
+class FapNationDownloadThread(QThread):
+    """
+    A dedicated QThread for Fap-Nation that uses a hybrid approach, choosing
+    between yt-dlp for HLS streams and a multipart downloader for direct links.
+    """
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool)
+    overall_progress_signal = pyqtSignal(int, int)
+
+    def __init__(self, url, output_dir, use_post_subfolder, pause_event, cancellation_event, gui_signals, parent=None):
+        super().__init__(parent)
+        self.album_url = url
+        self.output_dir = output_dir
+        self.use_post_subfolder = use_post_subfolder
+        self.is_cancelled = False
+        self.process = None
+        self.current_filename = "Unknown File"
+        self.album_name = "fap-nation_album"
+        self.pause_event = pause_event
+        self.cancellation_event = cancellation_event
+        self.gui_signals = gui_signals
+        self._is_finished = False
+        
+        self.process = QProcess(self)
+        self.process.readyReadStandardOutput.connect(self.handle_ytdlp_output)
+
+    def run(self):
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting Fap-Nation Download for: {self.album_url}")
+        
+        self.album_name, files_to_download = fetch_fap_nation_data(self.album_url, self.progress_signal.emit)
+        
+        if self.is_cancelled or not files_to_download:
+            self.progress_signal.emit("❌ Failed to extract file information. Aborting.")
+            self.finished_signal.emit(0, 1, self.is_cancelled)
+            return
+
+        self.overall_progress_signal.emit(1, 0)
+
+        save_path = self.output_dir
+        if self.use_post_subfolder:
+            save_path = os.path.join(self.output_dir, self.album_name)
+            self.progress_signal.emit(f"   Subfolder per Post is ON. Saving to: '{self.album_name}'")
+        os.makedirs(save_path, exist_ok=True)
+        
+        file_data = files_to_download[0]
+        self.current_filename = file_data.get('filename')
+        download_url = file_data.get('url')
+        link_type = file_data.get('type')
+        filepath = os.path.join(save_path, self.current_filename)
+        
+        if os.path.exists(filepath):
+            self.progress_signal.emit(f"   -> Skip: '{self.current_filename}' already exists.")
+            self.overall_progress_signal.emit(1, 1)
+            self.finished_signal.emit(0, 1, self.is_cancelled)
+            return
+
+        if link_type == 'hls':
+            self.download_with_ytdlp(filepath, download_url)
+        elif link_type == 'direct':
+            self.download_with_multipart(filepath, download_url) 
+        else:
+            self.progress_signal.emit(f"   ❌ Unknown link type '{link_type}'. Aborting.")
+            self._on_ytdlp_finished(-1)
+
+    def download_with_ytdlp(self, filepath, playlist_url):
+        self.progress_signal.emit(f"   Downloading (HLS Stream): '{self.current_filename}' using yt-dlp...")
+        try:
+            if getattr(sys, 'frozen', False):
+                base_path = sys._MEIPASS
+                ytdlp_path = os.path.join(base_path, "yt-dlp.exe")
+            else:
+                ytdlp_path = "yt-dlp.exe"
+
+            if not os.path.exists(ytdlp_path):
+                 self.progress_signal.emit(f"   ❌ ERROR: yt-dlp.exe not found at '{ytdlp_path}'.")
+                 self._on_ytdlp_finished(-1)
+                 return
+
+            command = [ytdlp_path, '--no-warnings', '--progress', '--output', filepath, '--merge-output-format', 'mp4', playlist_url]
+            
+            self.process.start(command[0], command[1:])
+            self.process.waitForFinished(-1) 
+            self._on_ytdlp_finished(self.process.exitCode())
+
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ Failed to start yt-dlp: {e}")
+            self._on_ytdlp_finished(-1)
+
+    def download_with_multipart(self, filepath, direct_url):
+        self.progress_signal.emit(f"   Downloading (Direct Link): '{self.current_filename}' using multipart downloader...")
+        try:
+            session = cloudscraper.create_scraper()
+            head_response = session.head(direct_url, allow_redirects=True, timeout=20)
+            head_response.raise_for_status()
+            total_size = int(head_response.headers.get('content-length', 0))
+
+            success, _, _, _ = download_file_in_parts(
+                file_url=direct_url, save_path=filepath, total_size=total_size, num_parts=5,
+                headers=session.headers, api_original_filename=self.current_filename,
+                emitter_for_multipart=self.gui_signals,
+                cookies_for_chunk_session=session.cookies, 
+                cancellation_event=self.cancellation_event,
+                skip_event=None, logger_func=self.progress_signal.emit, pause_event=self.pause_event
+            )
+            self._on_ytdlp_finished(0 if success else 1)
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ Multipart download failed: {e}")
+            self._on_ytdlp_finished(1)
+
+    def handle_ytdlp_output(self):
+        if not self.process:
+            return
+            
+        output = self.process.readAllStandardOutput().data().decode('utf-8', errors='ignore')
+        for line in reversed(output.strip().splitlines()):
+            line = line.strip()
+            progress_match = re.search(r'\[download\]\s+([\d.]+)%\s+of\s+~?\s*([\d.]+\w+B)', line)
+            if progress_match:
+                percent, size = progress_match.groups()
+                self.file_progress_signal.emit("yt-dlp:", f"{percent}% of {size}")
+                break
+
+    def _on_ytdlp_finished(self, exit_code):
+        if self._is_finished:
+            return
+        self._is_finished = True
+        
+        download_count, skip_count = 0, 0
+        
+        if self.is_cancelled:
+            self.progress_signal.emit(f"   Download of '{self.current_filename}' was cancelled.")
+            skip_count = 1
+        elif exit_code == 0:
+            self.progress_signal.emit(f"   ✅ Download process finished successfully for '{self.current_filename}'.")
+            download_count = 1
+        else:
+            self.progress_signal.emit(f"   ❌ Download process exited with an error (Code: {exit_code}) for '{self.current_filename}'.")
+            skip_count = 1
+        
+        self.overall_progress_signal.emit(1, 1)
+        self.process = None
+        self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.cancellation_event.set()
+        if self.process and self.process.state() == QProcess.Running:
+            self.progress_signal.emit("   Cancellation signal received, terminating yt-dlp process.")
+            self.process.kill()

src/ui/classes/hentai2read_downloader_thread.py

@@ -0,0 +1,51 @@
+import threading
+import time
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.Hentai2read_client import run_hentai2read_download as h2r_run_download
+
+
+class Hentai2readDownloadThread(QThread):
+    """
+    A dedicated QThread that calls the self-contained Hentai2Read client to
+    perform scraping and downloading.
+    """
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool)
+    overall_progress_signal = pyqtSignal(int, int)
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.start_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+        self.pause_event = parent.pause_event if hasattr(parent, 'pause_event') else threading.Event()
+
+    def _check_pause(self):
+        """Helper to handle pausing and cancellation events."""
+        if self.is_cancelled: return True
+        if self.pause_event and self.pause_event.is_set():
+            self.progress_signal.emit("   Download paused...")
+            while self.pause_event.is_set():
+                if self.is_cancelled: return True
+                time.sleep(0.5)
+            self.progress_signal.emit("   Download resumed.")
+        return self.is_cancelled
+
+    def run(self):
+        """
+        Executes the main download logic by calling the dedicated client function.
+        """
+        downloaded, skipped = h2r_run_download(
+            start_url=self.start_url,
+            output_dir=self.output_dir,
+            progress_callback=self.progress_signal.emit,
+            overall_progress_callback=self.overall_progress_signal.emit,
+            check_pause_func=self._check_pause
+        )
+        
+        self.finished_signal.emit(downloaded, skipped, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True

src/ui/classes/hentaifox_downloader_thread.py

@@ -0,0 +1,136 @@
+import os
+import time
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+from ...core.hentaifox_client import get_gallery_metadata, get_image_link_for_page, get_gallery_id
+from ...utils.file_utils import clean_folder_name
+
+class HentaiFoxDownloadThread(QThread):
+    progress_signal = pyqtSignal(str)  # Log messages
+    file_progress_signal = pyqtSignal(str, object) # filename, (current_bytes, total_bytes)
+    # finished_signal: (downloaded_count, skipped_count, was_cancelled, kept_files_list)
+    finished_signal = pyqtSignal(int, int, bool, list) 
+
+    def __init__(self, url_or_id, output_dir, parent=None):
+        super().__init__(parent)
+        self.gallery_id = get_gallery_id(url_or_id)
+        self.output_dir = output_dir
+        self.is_running = True
+        self.downloaded_count = 0
+        self.skipped_count = 0
+
+    def run(self):
+        try:
+            self.progress_signal.emit(f"🔍 [HentaiFox] Fetching metadata for ID: {self.gallery_id}...")
+            
+            # 1. Get Info
+            try:
+                data = get_gallery_metadata(self.gallery_id)
+            except Exception as e:
+                self.progress_signal.emit(f"❌ [HentaiFox] Failed to fetch metadata: {e}")
+                self.finished_signal.emit(0, 0, False, [])
+                return
+
+            title = clean_folder_name(data['title'])
+            total_pages = data['total_pages']
+            
+            # 2. Setup Folder
+            save_folder = os.path.join(self.output_dir, f"[{self.gallery_id}] {title}")
+            os.makedirs(save_folder, exist_ok=True)
+            
+            self.progress_signal.emit(f"📂 Saving to: {save_folder}")
+            self.progress_signal.emit(f"📄 Found {total_pages} pages. Starting download...")
+
+            # 3. Iterate and Download
+            for i in range(1, total_pages + 1):
+                if not self.is_running: 
+                    self.progress_signal.emit("🛑 Download cancelled by user.")
+                    break
+                
+                # Fetch image link for this specific page
+                try:
+                    img_url = get_image_link_for_page(self.gallery_id, i)
+                    
+                    if img_url:
+                        ext = img_url.split('.')[-1]
+                        filename = f"{i:03d}.{ext}"
+                        filepath = os.path.join(save_folder, filename)
+                        
+                        # Check if exists
+                        if os.path.exists(filepath):
+                            self.progress_signal.emit(f"⚠️ [{i}/{total_pages}] Skipped (Exists): {filename}")
+                            self.skipped_count += 1
+                        else:
+                            self.progress_signal.emit(f"⬇️ [{i}/{total_pages}] Downloading: {filename}")
+                            
+                            # CALL NEW DOWNLOAD FUNCTION
+                            success = self.download_image_with_progress(img_url, filepath, filename)
+                            
+                            if success:
+                                self.progress_signal.emit(f"✅ [{i}/{total_pages}] Finished: {filename}")
+                                self.downloaded_count += 1
+                            else:
+                                self.progress_signal.emit(f"❌ [{i}/{total_pages}] Failed: {filename}")
+                                self.skipped_count += 1
+                    else:
+                        self.progress_signal.emit(f"❌ [{i}/{total_pages}] Error: No image link found.")
+                        self.skipped_count += 1
+
+                except Exception as e:
+                    self.progress_signal.emit(f"❌ [{i}/{total_pages}] Exception: {e}")
+                    self.skipped_count += 1
+
+                time.sleep(0.5) 
+
+            # 4. Final Summary
+            summary = (
+                f"\n🏁 [HentaiFox] Task Complete!\n"
+                f"   - Total: {total_pages}\n"
+                f"   - Downloaded: {self.downloaded_count}\n"
+                f"   - Skipped: {self.skipped_count}\n"
+            )
+            self.progress_signal.emit(summary)
+
+        except Exception as e:
+            self.progress_signal.emit(f"❌ Critical Error: {str(e)}")
+        
+        self.finished_signal.emit(self.downloaded_count, self.skipped_count, not self.is_running, [])
+
+    def download_image_with_progress(self, url, path, filename):
+        """Downloads file while emitting byte-level progress signals."""
+        headers = {
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
+            "Referer": "https://hentaifox.com/"
+        }
+        
+        try:
+            # stream=True is required to get size before downloading body
+            r = requests.get(url, headers=headers, stream=True, timeout=20)
+            if r.status_code != 200:
+                return False
+            
+            # Get Total Size (in bytes)
+            total_size = int(r.headers.get('content-length', 0))
+            downloaded_size = 0
+            
+            chunk_size = 1024 # 1KB chunks
+            
+            with open(path, 'wb') as f:
+                for chunk in r.iter_content(chunk_size):
+                    if not self.is_running:
+                        r.close()
+                        return False
+                        
+                    if chunk:
+                        f.write(chunk)
+                        downloaded_size += len(chunk)
+                        
+                        self.file_progress_signal.emit(filename, (downloaded_size, total_size))
+            
+            return True
+        except Exception as e:
+            print(f"Download Error: {e}")
+            return False
+
+    def stop(self):
+        self.is_running = False

src/ui/classes/kemono_discord_downloader_thread.py

@@ -0,0 +1,549 @@
+# kemono_discord_downloader_thread.py
+import os
+import time
+import uuid
+import threading
+import cloudscraper
+import requests
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from PyQt5.QtCore import QThread, pyqtSignal
+
+# --- Assuming these files are in the correct relative path ---
+# Adjust imports if your project structure is different
+try:
+    from ...core.discord_client import fetch_server_channels, fetch_channel_messages
+    from ...utils.file_utils import clean_filename
+except ImportError as e:
+    # Basic fallback logging if signals aren't ready
+    print(f"ERROR: Failed to import required modules for Kemono Discord thread: {e}")
+    # Re-raise to prevent the thread from being created incorrectly
+    raise
+
+# Custom exception for clean cancellation/pausing
+class InterruptedError(Exception):
+    """Custom exception for handling cancellations/pausing gracefully within download loops."""
+    pass
+
+class KemonoDiscordDownloadThread(QThread):
+    """
+    A dedicated QThread for downloading files from Kemono Discord server/channel pages,
+    using the Kemono API via discord_client and multithreading for file downloads.
+    Includes a single retry attempt after a 15-second delay for specific errors.
+    """
+    # --- Signals ---
+    progress_signal = pyqtSignal(str)              # General log messages
+    progress_label_signal = pyqtSignal(str)        # Update main progress label (e.g., "Fetching messages...")
+    file_progress_signal = pyqtSignal(str, object) # Update file progress bar (filename, (downloaded_bytes, total_bytes | None))
+    permanent_file_failed_signal = pyqtSignal(list) # To report failures to main window
+    finished_signal = pyqtSignal(int, int, bool, list) # (downloaded_count, skipped_count, was_cancelled, [])
+
+    def __init__(self, server_id, channel_id, output_dir, cookies_dict, parent):
+        """
+        Initializes the Kemono Discord downloader thread.
+
+        Args:
+            server_id (str): The Discord server ID from Kemono.
+            channel_id (str | None): The specific Discord channel ID from Kemono, if provided.
+            output_dir (str): The base directory to save downloaded files.
+            cookies_dict (dict | None): Cookies to use for requests.
+            parent (QWidget): The parent widget (main_app) to access events/settings.
+        """
+        super().__init__(parent)
+        self.server_id = server_id
+        self.target_channel_id = channel_id # The specific channel from URL, if any
+        self.output_dir = output_dir
+        self.cookies_dict = cookies_dict
+        self.parent_app = parent # Access main app's events and settings
+
+        # --- Shared Events & Internal State ---
+        self.cancellation_event = getattr(parent, 'cancellation_event', threading.Event())
+        self.pause_event = getattr(parent, 'pause_event', threading.Event())
+        self._is_cancelled_internal = False # Internal flag for quick breaking
+
+        # --- Thread-Safe Counters ---
+        self.download_count = 0
+        self.skip_count = 0
+        self.count_lock = threading.Lock()
+
+        # --- List to Store Failure Details ---
+        self.permanently_failed_details = []
+
+        # --- Multithreading Configuration ---
+        self.num_file_threads = 1 # Default
+        try:
+            use_mt = getattr(self.parent_app, 'use_multithreading_checkbox', None)
+            thread_input = getattr(self.parent_app, 'thread_count_input', None)
+            if use_mt and use_mt.isChecked() and thread_input:
+                 thread_count_ui = int(thread_input.text().strip())
+                 # Apply a reasonable cap specific to this downloader type (adjust as needed)
+                 self.num_file_threads = max(1, min(thread_count_ui, 20)) # Cap at 20 file threads
+        except (ValueError, AttributeError, TypeError):
+             try: self.progress_signal.emit("⚠️ Warning: Could not read thread count setting, defaulting to 1.")
+             except: pass
+             self.num_file_threads = 1 # Fallback on error getting setting
+
+        # --- Network Client ---
+        try:
+            self.scraper = cloudscraper.create_scraper(browser={'browser': 'firefox', 'platform': 'windows', 'mobile': False})
+        except Exception as e:
+             try: self.progress_signal.emit(f"❌ ERROR: Failed to initialize cloudscraper: {e}")
+             except: pass
+             self.scraper = None
+
+    # --- Control Methods (cancel, pause, resume - same as before) ---
+    def cancel(self):
+        self._is_cancelled_internal = True
+        self.cancellation_event.set()
+        try: self.progress_signal.emit("   Cancellation requested for Kemono Discord download.")
+        except: pass
+
+    def pause(self):
+        if not self.pause_event.is_set():
+            self.pause_event.set()
+            try: self.progress_signal.emit("   Pausing Kemono Discord download...")
+            except: pass
+
+    def resume(self):
+        if self.pause_event.is_set():
+            self.pause_event.clear()
+            try: self.progress_signal.emit("   Resuming Kemono Discord download...")
+            except: pass
+
+    # --- Helper: Check Cancellation/Pause (same as before) ---
+    def _check_events(self):
+        if self._is_cancelled_internal or self.cancellation_event.is_set():
+            if not self._is_cancelled_internal:
+                self._is_cancelled_internal = True
+                try: self.progress_signal.emit("   Cancellation detected by Kemono Discord thread check.")
+                except: pass
+            return True # Cancelled
+
+        was_paused = False
+        while self.pause_event.is_set():
+            if not was_paused:
+                 try: self.progress_signal.emit("   Kemono Discord operation paused...")
+                 except: pass
+                 was_paused = True
+            if self.cancellation_event.is_set():
+                self._is_cancelled_internal = True
+                try: self.progress_signal.emit("   Cancellation detected while paused.")
+                except: pass
+                return True
+            time.sleep(0.5)
+        return False
+
+    # --- REVISED Helper: Download Single File with ONE Retry ---
+    def _download_single_kemono_file(self, file_info):
+        """
+        Downloads a single file, handles collisions after download,
+        and automatically retries ONCE after 15s for specific network errors.
+
+        Returns:
+            tuple: (bool_success, dict_error_details_or_None)
+        """
+        # --- Constants for Retry Logic ---
+        MAX_ATTEMPTS = 2 # 1 initial attempt + 1 retry
+        RETRY_DELAY_SECONDS = 15
+
+        # --- Extract info ---
+        channel_dir = file_info['channel_dir']
+        original_filename = file_info['original_filename']
+        file_url = file_info['file_url']
+        channel_id = file_info['channel_id']
+        post_title = file_info.get('post_title', f"Message in channel {channel_id}")
+        original_post_id_for_log = file_info.get('message_id', 'N/A')
+        base_kemono_domain = "kemono.cr"
+
+        if not self.scraper:
+             try: self.progress_signal.emit(f"   ❌ Cannot download '{original_filename}': Cloudscraper not initialized.")
+             except: pass
+             failure_details = { 'file_info': {'url': file_url, 'name': original_filename}, 'post_title': post_title, 'original_post_id_for_log': original_post_id_for_log, 'target_folder_path': channel_dir, 'error': 'Cloudscraper not initialized', 'service': 'discord', 'user_id': self.server_id }
+             return False, failure_details
+
+        if self._check_events(): return False, None # Interrupted before start
+
+        # --- Determine filenames ---
+        cleaned_original_filename = clean_filename(original_filename)
+        intended_final_filename = cleaned_original_filename
+        unique_suffix = uuid.uuid4().hex[:8]
+        temp_filename = f"{intended_final_filename}.{unique_suffix}.part"
+        temp_filepath = os.path.join(channel_dir, temp_filename)
+
+        # --- Download Attempt Loop ---
+        download_successful = False
+        last_exception = None
+        should_retry = False # Flag to indicate if the first attempt failed with a retryable error
+
+        for attempt in range(1, MAX_ATTEMPTS + 1):
+            response = None
+            try:
+                # --- Pre-attempt checks ---
+                if self._check_events(): raise InterruptedError("Cancelled/Paused before attempt")
+                if attempt == 2 and should_retry: # Only delay *before* the retry
+                    try: self.progress_signal.emit(f"   ⏳ Retrying '{original_filename}' (Attempt {attempt}/{MAX_ATTEMPTS}) after {RETRY_DELAY_SECONDS}s...")
+                    except: pass
+                    for _ in range(RETRY_DELAY_SECONDS):
+                        if self._check_events(): raise InterruptedError("Cancelled/Paused during retry delay")
+                        time.sleep(1)
+                # If it's attempt 2 but should_retry is False, it means the first error was non-retryable, so skip
+                elif attempt == 2 and not should_retry:
+                    break # Exit loop, failure already determined
+
+                # --- Log attempt ---
+                log_prefix = f"   ⬇️ Downloading:" if attempt == 1 else f"   🔄 Retrying:"
+                try: self.progress_signal.emit(f"{log_prefix} '{original_filename}' (Attempt {attempt}/{MAX_ATTEMPTS})...")
+                except: pass
+                if attempt == 1:
+                    try: self.file_progress_signal.emit(original_filename, (0, 0))
+                    except: pass
+
+                # --- Perform Download ---
+                headers = { 'User-Agent': 'Mozilla/5.0 ...', 'Referer': f'https://{base_kemono_domain}/discord/channel/{channel_id}'} # Shortened for brevity
+                response = self.scraper.get(file_url, headers=headers, cookies=self.cookies_dict, stream=True, timeout=(15, 120))
+                response.raise_for_status()
+
+                total_size = int(response.headers.get('content-length', 0))
+                downloaded_size = 0
+                last_progress_emit_time = time.time()
+
+                with open(temp_filepath, 'wb') as f:
+                    for chunk in response.iter_content(chunk_size=1024*1024):
+                        if self._check_events(): raise InterruptedError("Cancelled/Paused during chunk writing")
+                        if chunk:
+                            f.write(chunk)
+                            downloaded_size += len(chunk)
+                            current_time = time.time()
+                            if total_size > 0 and (current_time - last_progress_emit_time > 0.5 or downloaded_size == total_size):
+                                try: self.file_progress_signal.emit(original_filename, (downloaded_size, total_size))
+                                except: pass
+                                last_progress_emit_time = current_time
+                            elif total_size == 0 and (current_time - last_progress_emit_time > 0.5):
+                                try: self.file_progress_signal.emit(original_filename, (downloaded_size, 0))
+                                except: pass
+                                last_progress_emit_time = current_time
+                response.close()
+
+                # --- Verification ---
+                if self._check_events(): raise InterruptedError("Cancelled/Paused after download completion")
+
+                if total_size > 0 and downloaded_size != total_size:
+                    try: self.progress_signal.emit(f"   ⚠️ Size mismatch on attempt {attempt} for '{original_filename}'. Expected {total_size}, got {downloaded_size}.")
+                    except: pass
+                    last_exception = IOError(f"Size mismatch: Expected {total_size}, got {downloaded_size}")
+                    if os.path.exists(temp_filepath):
+                         try: os.remove(temp_filepath)
+                         except OSError: pass
+                    should_retry = (attempt == 1) # Only retry if it was the first attempt
+                    continue # Try again if attempt 1, otherwise loop finishes
+                else:
+                    download_successful = True
+                    break # Success!
+
+            # --- Error Handling within Loop ---
+            except InterruptedError as e:
+                last_exception = e
+                should_retry = False # Don't retry if interrupted
+                break
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError, cloudscraper.exceptions.CloudflareException) as e:
+                last_exception = e
+                try: self.progress_signal.emit(f"   ❌ Network/Cloudflare error on attempt {attempt} for '{original_filename}': {e}")
+                except: pass
+                should_retry = (attempt == 1) # Retry only if first attempt
+            except requests.exceptions.RequestException as e:
+                status_code = getattr(e.response, 'status_code', None)
+                if status_code and 500 <= status_code <= 599: # Retry on 5xx
+                    last_exception = e
+                    try: self.progress_signal.emit(f"   ❌ Server error ({status_code}) on attempt {attempt} for '{original_filename}'. Will retry...")
+                    except: pass
+                    should_retry = (attempt == 1) # Retry only if first attempt
+                else: # Don't retry on 4xx or other request errors
+                    last_exception = e
+                    try: self.progress_signal.emit(f"   ❌ Non-retryable HTTP error for '{original_filename}': {e}")
+                    except: pass
+                    should_retry = False
+                    break
+            except OSError as e:
+                last_exception = e
+                try: self.progress_signal.emit(f"   ❌ OS error during download attempt {attempt} for '{original_filename}': {e}")
+                except: pass
+                should_retry = False
+                break
+            except Exception as e:
+                last_exception = e
+                try: self.progress_signal.emit(f"   ❌ Unexpected error on attempt {attempt} for '{original_filename}': {e}")
+                except: pass
+                should_retry = False
+                break
+            finally:
+                if response:
+                    try: response.close()
+                    except Exception: pass
+        # --- End Download Attempt Loop ---
+
+        try: self.file_progress_signal.emit(original_filename, None) # Clear progress
+        except: pass
+
+        # --- Post-Download Processing ---
+        if download_successful:
+            # --- Rename Logic ---
+            final_filename_to_use = intended_final_filename
+            final_filepath_on_disk = os.path.join(channel_dir, final_filename_to_use)
+            counter = 1
+            base_name, extension = os.path.splitext(intended_final_filename)
+            while os.path.exists(final_filepath_on_disk):
+                final_filename_to_use = f"{base_name} ({counter}){extension}"
+                final_filepath_on_disk = os.path.join(channel_dir, final_filename_to_use)
+                counter += 1
+            if final_filename_to_use != intended_final_filename:
+                 try: self.progress_signal.emit(f"   -> Name conflict for '{intended_final_filename}'. Renaming to '{final_filename_to_use}'.")
+                 except: pass
+            try:
+                os.rename(temp_filepath, final_filepath_on_disk)
+                try: self.progress_signal.emit(f"   ✅ Saved: '{final_filename_to_use}'")
+                except: pass
+                return True, None # SUCCESS
+            except OSError as e:
+                try: self.progress_signal.emit(f"   ❌ OS error renaming temp file to '{final_filename_to_use}': {e}")
+                except: pass
+                if os.path.exists(temp_filepath):
+                     try: os.remove(temp_filepath)
+                     except OSError: pass
+                # ---> RETURN FAILURE TUPLE (Rename Failed) <---
+                failure_details = { 'file_info': {'url': file_url, 'name': original_filename}, 'post_title': post_title, 'original_post_id_for_log': original_post_id_for_log, 'target_folder_path': channel_dir, 'intended_filename': intended_final_filename, 'error': f"Rename failed: {e}", 'service': 'discord', 'user_id': self.server_id }
+                return False, failure_details
+        else:
+            # Download failed or was interrupted
+            if not isinstance(last_exception, InterruptedError):
+                try: self.progress_signal.emit(f"   ❌ FAILED to download '{original_filename}' after {MAX_ATTEMPTS} attempts. Last error: {last_exception}")
+                except: pass
+            if os.path.exists(temp_filepath):
+                try: os.remove(temp_filepath)
+                except OSError as e_rem:
+                     try: self.progress_signal.emit(f"    (Failed to remove temp file '{temp_filename}': {e_rem})")
+                     except: pass
+            # ---> RETURN FAILURE TUPLE (Download Failed/Interrupted) <---
+            # Only generate details if it wasn't interrupted by user
+            failure_details = None
+            if not isinstance(last_exception, InterruptedError):
+                failure_details = {
+                    'file_info': {'url': file_url, 'name': original_filename},
+                    'post_title': post_title, 'original_post_id_for_log': original_post_id_for_log,
+                    'target_folder_path': channel_dir, 'intended_filename': intended_final_filename,
+                    'error': f"Failed after {MAX_ATTEMPTS} attempts: {last_exception}",
+                    'service': 'discord', 'user_id': self.server_id,
+                    'forced_filename_override': intended_final_filename,
+                    'file_index_in_post': file_info.get('file_index', 0),
+                    'num_files_in_this_post': file_info.get('num_files', 1)
+                }
+            return False, failure_details # Return None details if interrupted
+
+    # --- Main Thread Execution ---
+    def run(self):
+        """Main execution logic: Fetches channels/messages and dispatches file downloads."""
+        self.download_count = 0
+        self.skip_count = 0
+        self._is_cancelled_internal = False
+        self.permanently_failed_details = [] # Reset failed list
+
+        if not self.scraper:
+             try: self.progress_signal.emit("❌ Aborting Kemono Discord download: Cloudscraper failed to initialize.")
+             except: pass
+             self.finished_signal.emit(0, 0, False, [])
+             return
+
+        try:
+            # --- Log Start ---
+            try:
+                self.progress_signal.emit("=" * 40)
+                self.progress_signal.emit(f"🚀 Starting Kemono Discord download for server: {self.server_id}")
+                self.progress_signal.emit(f"   Using {self.num_file_threads} thread(s) for file downloads.")
+            except: pass
+
+            # --- Channel Fetching (same as before) ---
+            channels_to_process = []
+            # ... (logic to populate channels_to_process using fetch_server_channels or target_channel_id) ...
+            if self.target_channel_id:
+                channels_to_process.append({'id': self.target_channel_id, 'name': self.target_channel_id})
+                try: self.progress_signal.emit(f"   Targeting specific channel: {self.target_channel_id}")
+                except: pass
+            else:
+                try: self.progress_label_signal.emit("Fetching server channels via Kemono API...")
+                except: pass
+                channels_data = fetch_server_channels(self.server_id, logger=self.progress_signal.emit, cookies_dict=self.cookies_dict)
+                if self._check_events(): return
+                if channels_data is not None:
+                    channels_to_process = channels_data
+                    try: self.progress_signal.emit(f"   Found {len(channels_to_process)} channels.")
+                    except: pass
+                else:
+                    try: self.progress_signal.emit(f"   ❌ Failed to fetch channels for server {self.server_id} via Kemono API.")
+                    except: pass
+                    return
+
+            # --- Process Each Channel ---
+            for channel in channels_to_process:
+                if self._check_events(): break
+
+                channel_id = channel['id']
+                channel_name = clean_filename(channel.get('name', channel_id))
+                channel_dir = os.path.join(self.output_dir, channel_name)
+                try:
+                    os.makedirs(channel_dir, exist_ok=True)
+                except OSError as e:
+                    try: self.progress_signal.emit(f"   ❌ Failed to create directory for channel '{channel_name}': {e}. Skipping channel.")
+                    except: pass
+                    continue
+
+                try:
+                    self.progress_signal.emit(f"\n--- Processing Channel: #{channel_name} ({channel_id}) ---")
+                    self.progress_label_signal.emit(f"Fetching messages for #{channel_name}...")
+                except: pass
+
+                # --- Collect File Download Tasks ---
+                file_tasks = []
+                message_generator = fetch_channel_messages(
+                    channel_id, logger=self.progress_signal.emit,
+                    cancellation_event=self.cancellation_event, pause_event=self.pause_event,
+                    cookies_dict=self.cookies_dict
+                )
+
+                try:
+                    message_index = 0
+                    for message_batch in message_generator:
+                        if self._check_events(): break
+                        for message in message_batch:
+                            message_id = message.get('id', f'msg_{message_index}')
+                            post_title_context = (message.get('content') or f"Message {message_id}")[:50] + "..."
+                            attachments = message.get('attachments', [])
+                            file_index_in_message = 0
+                            num_files_in_message = len(attachments)
+
+                            for attachment in attachments:
+                                if self._check_events(): raise InterruptedError
+                                file_path = attachment.get('path')
+                                original_filename = attachment.get('name')
+                                if file_path and original_filename:
+                                    base_kemono_domain = "kemono.cr"
+                                    if not file_path.startswith('/'): file_path = '/' + file_path
+                                    file_url = f"https://{base_kemono_domain}/data{file_path}"
+                                    file_tasks.append({
+                                        'channel_dir': channel_dir, 'original_filename': original_filename,
+                                        'file_url': file_url, 'channel_id': channel_id,
+                                        'message_id': message_id, 'post_title': post_title_context,
+                                        'file_index': file_index_in_message, 'num_files': num_files_in_message
+                                    })
+                                    file_index_in_message += 1
+                            message_index += 1
+                            if self._check_events(): raise InterruptedError
+                        if self._check_events(): raise InterruptedError
+                except InterruptedError:
+                     try: self.progress_signal.emit("   Interrupted while collecting file tasks.")
+                     except: pass
+                     break # Exit channel processing
+                except Exception as e_msg:
+                     try: self.progress_signal.emit(f"   ❌ Error fetching messages for channel {channel_name}: {e_msg}")
+                     except: pass
+                     continue # Continue to next channel
+
+                if self._check_events(): break
+
+                if not file_tasks:
+                    try: self.progress_signal.emit("   No downloadable file attachments found in this channel's messages.")
+                    except: pass
+                    continue
+
+                try:
+                    self.progress_signal.emit(f"   Found {len(file_tasks)} potential file attachments. Starting downloads...")
+                    self.progress_label_signal.emit(f"Downloading {len(file_tasks)} files for #{channel_name}...")
+                except: pass
+
+                # --- Execute Downloads Concurrently ---
+                files_processed_in_channel = 0
+                with ThreadPoolExecutor(max_workers=self.num_file_threads, thread_name_prefix=f"KDC_{channel_id[:4]}_") as executor:
+                    futures = {executor.submit(self._download_single_kemono_file, task): task for task in file_tasks}
+                    try:
+                        for future in as_completed(futures):
+                            files_processed_in_channel += 1
+                            task_info = futures[future]
+                            try:
+                                success, details = future.result() # Unpack result
+                                with self.count_lock:
+                                    if success:
+                                        self.download_count += 1
+                                    else:
+                                        self.skip_count += 1
+                                        if details: # Append details if the download permanently failed
+                                            self.permanently_failed_details.append(details)
+                            except Exception as e_future:
+                                filename = task_info.get('original_filename', 'unknown file')
+                                try: self.progress_signal.emit(f"   ❌ System error processing download future for '{filename}': {e_future}")
+                                except: pass
+                                with self.count_lock:
+                                    self.skip_count += 1
+                                # Append details on system failure
+                                failure_details = { 'file_info': {'url': task_info.get('file_url'), 'name': filename}, 'post_title': task_info.get('post_title', 'N/A'), 'original_post_id_for_log': task_info.get('message_id', 'N/A'), 'target_folder_path': task_info.get('channel_dir'), 'error': f"Future execution error: {e_future}", 'service': 'discord', 'user_id': self.server_id, 'forced_filename_override': clean_filename(filename), 'file_index_in_post': task_info.get('file_index', 0), 'num_files_in_this_post': task_info.get('num_files', 1) }
+                                self.permanently_failed_details.append(failure_details)
+
+                            try: self.progress_label_signal.emit(f"#{channel_name}: {files_processed_in_channel}/{len(file_tasks)} files processed")
+                            except: pass
+
+                            if self._check_events():
+                                 try: self.progress_signal.emit("   Cancelling remaining file downloads for this channel...")
+                                 except: pass
+                                 executor.shutdown(wait=False, cancel_futures=True)
+                                 break # Exit as_completed loop
+                    except InterruptedError:
+                         try: self.progress_signal.emit("   Download processing loop interrupted.")
+                         except: pass
+                         executor.shutdown(wait=False, cancel_futures=True)
+
+                if self._check_events(): break # Check between channels
+
+            # --- End Channel Loop ---
+
+        except Exception as e:
+            # Catch unexpected errors in the main run logic
+            try:
+                self.progress_signal.emit(f"❌ Unexpected critical error in Kemono Discord thread run loop: {e}")
+                import traceback
+                self.progress_signal.emit(traceback.format_exc())
+            except: pass # Avoid errors if signals fail at the very end
+        finally:
+            # --- Final Cleanup and Signal ---
+            try:
+                try: self.progress_signal.emit("=" * 40)
+                except: pass
+                cancelled = self._is_cancelled_internal or self.cancellation_event.is_set()
+
+                # --- EMIT FAILED FILES SIGNAL ---
+                if self.permanently_failed_details:
+                    try:
+                        self.progress_signal.emit(f"   Reporting {len(self.permanently_failed_details)} permanently failed files...")
+                        self.permanent_file_failed_signal.emit(list(self.permanently_failed_details)) # Emit a copy
+                    except Exception as e_emit_fail:
+                         print(f"ERROR emitting permanent_file_failed_signal: {e_emit_fail}")
+
+                # Log final status
+                try:
+                    if cancelled and not self._is_cancelled_internal:
+                        self.progress_signal.emit("   Kemono Discord download cancelled externally.")
+                    elif self._is_cancelled_internal:
+                        self.progress_signal.emit("   Kemono Discord download finished due to cancellation.")
+                    else:
+                         self.progress_signal.emit("✅ Kemono Discord download process finished.")
+                except: pass
+
+                # Clear file progress
+                try: self.file_progress_signal.emit("", None)
+                except: pass
+
+                # Get final counts safely
+                with self.count_lock:
+                     final_download_count = self.download_count
+                     final_skip_count = self.skip_count
+
+                # Emit finished signal
+                self.finished_signal.emit(final_download_count, final_skip_count, cancelled, [])
+            except Exception as e_final:
+                 # Log final signal emission error if possible
+                 print(f"ERROR in KemonoDiscordDownloadThread finally block: {e_final}")

src/ui/classes/mangadex_downloader_thread.py

@@ -0,0 +1,45 @@
+import threading
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.mangadex_client import fetch_mangadex_data
+
+
+class MangaDexDownloadThread(QThread):
+    """A wrapper QThread for running the MangaDex client function."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool)
+    overall_progress_signal = pyqtSignal(int, int)
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.start_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+        self.pause_event = parent.pause_event if hasattr(parent, 'pause_event') else threading.Event()
+        self.cancellation_event = parent.cancellation_event if hasattr(parent, 'cancellation_event') else threading.Event()
+
+    def run(self):
+        downloaded = 0
+        skipped = 0
+        try:
+            downloaded, skipped = fetch_mangadex_data(
+                self.start_url,
+                self.output_dir,
+                logger_func=self.progress_signal.emit,
+                file_progress_callback=self.file_progress_signal,
+                overall_progress_callback=self.overall_progress_signal,
+                pause_event=self.pause_event,
+                cancellation_event=self.cancellation_event
+            )
+        except Exception as e:
+            self.progress_signal.emit(f"❌ A critical error occurred in the MangaDex thread: {e}")
+            skipped = 1 # Mark as skipped if there was a critical failure
+        finally:
+            self.finished_signal.emit(downloaded, skipped, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        if self.cancellation_event:
+            self.cancellation_event.set()
+        self.progress_signal.emit("   Cancellation signal received by MangaDex thread.")

src/ui/classes/nhentai_downloader_thread.py

@@ -0,0 +1,117 @@
+import os
+import time
+import requests 
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...utils.file_utils import clean_folder_name
+
+
+class NhentaiDownloadThread(QThread):
+    progress_signal = pyqtSignal(str)
+    finished_signal = pyqtSignal(int, int, bool)
+
+    IMAGE_SERVERS = [
+        "https://i.nhentai.net", "https://i2.nhentai.net", "https://i3.nhentai.net",
+        "https://i5.nhentai.net", "https://i7.nhentai.net"
+    ]
+    
+    EXTENSION_MAP = {'j': 'jpg', 'p': 'png', 'g': 'gif', 'w': 'webp' }
+
+    # 1. Update init to initialize self.proxies
+    def __init__(self, gallery_data, output_dir, parent=None):
+        super().__init__(parent)
+        self.gallery_data = gallery_data
+        self.output_dir = output_dir
+        self.is_cancelled = False
+        self.proxies = None  # Placeholder, will be injected by main_window
+
+    def run(self):
+        # 2. Log Proxy Usage
+        if self.proxies:
+            self.progress_signal.emit(f"   🌍 Network: Using Proxy {self.proxies}")
+        else:
+            self.progress_signal.emit("   🌍 Network: Direct Connection (No Proxy)")
+
+        title = self.gallery_data.get("title", {}).get("english", f"gallery_{self.gallery_data.get('id')}")
+        gallery_id = self.gallery_data.get("id")
+        media_id = self.gallery_data.get("media_id")
+        pages_info = self.gallery_data.get("pages", [])
+
+        folder_name = clean_folder_name(title)
+        save_path = os.path.join(self.output_dir, folder_name)
+        
+        try:
+            os.makedirs(save_path, exist_ok=True)
+            self.progress_signal.emit(f"   Saving to: {folder_name}")
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ Error creating directory: {e}")
+            self.finished_signal.emit(0, len(pages_info), False)
+            return
+
+        download_count = 0
+        skip_count = 0
+        total_pages = len(pages_info)
+
+        # 3. Use requests.Session instead of cloudscraper
+        scraper = requests.Session()
+        
+        # 4. Smart timeout logic
+        img_timeout = (30, 120) if self.proxies else 60
+
+        for i, page_data in enumerate(pages_info):
+            if self.is_cancelled: break
+            
+            file_ext = self.EXTENSION_MAP.get(page_data.get('t'), 'jpg')
+            local_filename = f"{i+1:03d}.{file_ext}"
+            filepath = os.path.join(save_path, local_filename)
+
+            if os.path.exists(filepath):
+                self.progress_signal.emit(f"   Skipping {local_filename} (already exists).")
+                skip_count += 1
+                continue
+
+            download_successful = False
+            
+            # Try servers until one works
+            for server in self.IMAGE_SERVERS:
+                if self.is_cancelled: break
+                
+                # Construct URL: server/galleries/media_id/page_num.ext
+                full_url = f"{server}/galleries/{media_id}/{i+1}.{file_ext}"
+                
+                try:
+                    self.progress_signal.emit(f"   Downloading page {i+1}/{total_pages}...")
+                    
+                    headers = {
+                        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
+                        'Referer': f'https://nhentai.net/g/{gallery_id}/'
+                    }
+
+                    # 5. Add proxies, verify=False, and timeout
+                    response = scraper.get(full_url, headers=headers, timeout=img_timeout, stream=True, proxies=self.proxies, verify=False)
+                    
+                    if response.status_code == 200:
+                        with open(filepath, 'wb') as f:
+                            for chunk in response.iter_content(chunk_size=8192):
+                                f.write(chunk)
+                        download_count += 1
+                        download_successful = True
+                        break # Stop trying servers
+                    else:
+                        # self.progress_signal.emit(f"      -> {server} returned status {response.status_code}...")
+                        pass 
+
+                except Exception as e:
+                    # self.progress_signal.emit(f"      -> {server} failed: {e}")
+                    pass
+            
+            if not download_successful:
+                self.progress_signal.emit(f"   ❌ Failed to download {local_filename} from all servers.")
+                skip_count += 1
+
+            time.sleep(0.5)
+
+        self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True

src/ui/classes/pixeldrain_downloader_thread.py

@@ -0,0 +1,101 @@
+import os
+import time
+import requests
+import cloudscraper
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.pixeldrain_client import fetch_pixeldrain_data
+from ...utils.file_utils import clean_folder_name
+
+
+class PixeldrainDownloadThread(QThread):
+    """A dedicated QThread for handling pixeldrain.com downloads."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool) # dl_count, skip_count, cancelled
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.pixeldrain_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+
+    def run(self):
+        download_count = 0
+        skip_count = 0
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting Pixeldrain.com Download for: {self.pixeldrain_url}")
+
+        album_title_raw, files_to_download = fetch_pixeldrain_data(self.pixeldrain_url, self.progress_signal.emit)
+
+        if not files_to_download:
+            self.progress_signal.emit("❌ Failed to extract file information from Pixeldrain. Aborting.")
+            self.finished_signal.emit(0, 0, self.is_cancelled)
+            return
+
+        album_folder_name = clean_folder_name(album_title_raw)
+        album_path = os.path.join(self.output_dir, album_folder_name)
+        try:
+            os.makedirs(album_path, exist_ok=True)
+            self.progress_signal.emit(f"   Saving to folder: '{album_path}'")
+        except OSError as e:
+            self.progress_signal.emit(f"❌ Critical error creating directory: {e}")
+            self.finished_signal.emit(0, len(files_to_download), self.is_cancelled)
+            return
+
+        total_files = len(files_to_download)
+        session = cloudscraper.create_scraper()
+
+        for i, file_data in enumerate(files_to_download):
+            if self.is_cancelled:
+                self.progress_signal.emit("   Download cancelled by user.")
+                skip_count = total_files - download_count
+                break
+
+            filename = file_data.get('filename')
+            file_url = file_data.get('url')
+            filepath = os.path.join(album_path, filename)
+
+            if os.path.exists(filepath):
+                self.progress_signal.emit(f"   -> Skip ({i+1}/{total_files}): '{filename}' already exists.")
+                skip_count += 1
+                continue
+
+            self.progress_signal.emit(f"   Downloading ({i+1}/{total_files}): '{filename}'...")
+
+            try:
+                response = session.get(file_url, stream=True, timeout=90)
+                response.raise_for_status()
+
+                total_size = int(response.headers.get('content-length', 0))
+                downloaded_size = 0
+                last_update_time = time.time()
+
+                with open(filepath, 'wb') as f:
+                    for chunk in response.iter_content(chunk_size=8192):
+                        if self.is_cancelled:
+                            break
+                        if chunk:
+                            f.write(chunk)
+                            downloaded_size += len(chunk)
+                            current_time = time.time()
+                            if total_size > 0 and (current_time - last_update_time) > 0.5:
+                                self.file_progress_signal.emit(filename, (downloaded_size, total_size))
+                                last_update_time = current_time
+
+                if self.is_cancelled:
+                    if os.path.exists(filepath): os.remove(filepath)
+                    continue
+
+                download_count += 1
+            except requests.exceptions.RequestException as e:
+                self.progress_signal.emit(f"   ❌ Failed to download '{filename}'. Error: {e}")
+                if os.path.exists(filepath): os.remove(filepath)
+                skip_count += 1
+
+        self.file_progress_signal.emit("", None)
+        self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Pixeldrain thread.")

src/ui/classes/rule34video_downloader_thread.py

@@ -0,0 +1,87 @@
+import os
+import time
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+import cloudscraper
+
+from ...core.rule34video_client import fetch_rule34video_data
+from ...utils.file_utils import clean_folder_name
+
+class Rule34VideoDownloadThread(QThread):
+    """A dedicated QThread for handling rule34video.com downloads."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool) # dl_count, skip_count, cancelled
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.video_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+
+    def run(self):
+        download_count = 0
+        skip_count = 0
+
+        video_title, final_video_url = fetch_rule34video_data(self.video_url, self.progress_signal.emit)
+
+        if not final_video_url:
+            self.progress_signal.emit("❌ Failed to get video data. Aborting.")
+            self.finished_signal.emit(0, 1, self.is_cancelled)
+            return
+
+        # Create a safe filename from the title, defaulting if needed
+        safe_title = clean_folder_name(video_title if video_title else "rule34video_file")
+        filename = f"{safe_title}.mp4"
+        filepath = os.path.join(self.output_dir, filename)
+
+        if os.path.exists(filepath):
+            self.progress_signal.emit(f"   -> Skip: '{filename}' already exists.")
+            self.finished_signal.emit(0, 1, self.is_cancelled)
+            return
+
+        self.progress_signal.emit(f"   Downloading: '{filename}'...")
+        try:
+            scraper = cloudscraper.create_scraper()
+            # The CDN link might not require special headers, but a referer is good practice
+            headers = {'Referer': 'https://rule34video.com/'}
+            response = scraper.get(final_video_url, stream=True, headers=headers, timeout=90)
+            response.raise_for_status()
+
+            total_size = int(response.headers.get('content-length', 0))
+            downloaded_size = 0
+            last_update_time = time.time()
+
+            with open(filepath, 'wb') as f:
+                # Use a larger chunk size for video files
+                for chunk in response.iter_content(chunk_size=8192 * 4):
+                    if self.is_cancelled:
+                        break
+                    if chunk:
+                        f.write(chunk)
+                        downloaded_size += len(chunk)
+                        current_time = time.time()
+                        if total_size > 0 and (current_time - last_update_time) > 0.5:
+                            self.file_progress_signal.emit(filename, (downloaded_size, total_size))
+                            last_update_time = current_time
+            
+            if self.is_cancelled:
+                if os.path.exists(filepath):
+                    os.remove(filepath)
+                skip_count = 1
+                self.progress_signal.emit(f"   Download cancelled for '{filename}'.")
+            else:
+                download_count = 1
+        
+        except Exception as e:
+            self.progress_signal.emit(f"   ❌ Failed to download '{filename}': {e}")
+            if os.path.exists(filepath):
+                os.remove(filepath)
+            skip_count = 1
+        
+        self.file_progress_signal.emit("", None)
+        self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Rule34Video thread.")

src/ui/classes/saint2_downloader_thread.py

@@ -0,0 +1,105 @@
+import os
+import time
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.saint2_client import fetch_saint2_data
+
+class Saint2DownloadThread(QThread):
+    """A dedicated QThread for handling saint2.su downloads."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool) # dl_count, skip_count, cancelled
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.saint2_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+
+    def run(self):
+        download_count = 0
+        skip_count = 0
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting Saint2.su Download for: {self.saint2_url}")
+        
+        album_name, files_to_download = fetch_saint2_data(self.saint2_url, self.progress_signal.emit)
+        
+        if not files_to_download:
+            self.progress_signal.emit("❌ Failed to extract file information from Saint2. Aborting.")
+            self.finished_signal.emit(0, 0, self.is_cancelled)
+            return
+
+        album_path = os.path.join(self.output_dir, album_name)
+        try:
+            os.makedirs(album_path, exist_ok=True)
+            self.progress_signal.emit(f"   Saving to folder: '{album_path}'")
+        except OSError as e:
+            self.progress_signal.emit(f"❌ Critical error creating directory: {e}")
+            self.finished_signal.emit(0, len(files_to_download), self.is_cancelled)
+            return
+
+        total_files = len(files_to_download)
+        session = requests.Session()
+
+        for i, file_data in enumerate(files_to_download):
+            if self.is_cancelled:
+                self.progress_signal.emit("   Download cancelled by user.")
+                skip_count = total_files - download_count
+                break
+
+            filename = file_data.get('filename', f'untitled_{i+1}.mp4')
+            file_url = file_data.get('url')
+            headers = file_data.get('headers')
+            filepath = os.path.join(album_path, filename)
+            
+            if os.path.exists(filepath):
+                self.progress_signal.emit(f"   -> Skip ({i+1}/{total_files}): '{filename}' already exists.")
+                skip_count += 1
+                continue
+
+            self.progress_signal.emit(f"   Downloading ({i+1}/{total_files}): '{filename}'...")
+            
+            try:
+                response = session.get(file_url, stream=True, headers=headers, timeout=60)
+                response.raise_for_status()
+
+                total_size = int(response.headers.get('content-length', 0))
+                downloaded_size = 0
+                last_update_time = time.time()
+
+                with open(filepath, 'wb') as f:
+                    for chunk in response.iter_content(chunk_size=8192):
+                        if self.is_cancelled:
+                            break
+                        if chunk:
+                            f.write(chunk)
+                            downloaded_size += len(chunk)
+                            current_time = time.time()
+                            if total_size > 0 and (current_time - last_update_time) > 0.5:
+                                self.file_progress_signal.emit(filename, (downloaded_size, total_size))
+                                last_update_time = current_time
+                
+                if self.is_cancelled:
+                    if os.path.exists(filepath): os.remove(filepath)
+                    continue
+                
+                if total_size > 0:
+                    self.file_progress_signal.emit(filename, (total_size, total_size))
+
+                download_count += 1
+            except requests.exceptions.RequestException as e:
+                self.progress_signal.emit(f"   ❌ Failed to download '{filename}'. Error: {e}")
+                if os.path.exists(filepath): os.remove(filepath)
+                skip_count += 1
+            except Exception as e:
+                self.progress_signal.emit(f"   ❌ An unexpected error occurred with '{filename}': {e}")
+                if os.path.exists(filepath): os.remove(filepath)
+                skip_count += 1
+        
+        self.file_progress_signal.emit("", None)
+        self.finished_signal.emit(download_count, skip_count, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Saint2 thread.")

src/ui/classes/simp_city_downloader_thread.py

@@ -0,0 +1,386 @@
+import os
+import queue
+import re
+import threading
+import time
+from collections import Counter
+from concurrent.futures import ThreadPoolExecutor
+from urllib.parse import urlparse
+
+import cloudscraper
+import requests
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.bunkr_client import fetch_bunkr_data
+from ...core.pixeldrain_client import fetch_pixeldrain_data
+from ...core.saint2_client import fetch_saint2_data
+from ...core.simpcity_client import fetch_single_simpcity_page
+from ...services.drive_downloader import (
+    download_mega_file as drive_download_mega_file,
+    download_gofile_folder  
+)
+from ...utils.file_utils import clean_folder_name
+
+
+class SimpCityDownloadThread(QThread):
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool, list)
+    overall_progress_signal = pyqtSignal(int, int)
+
+    def __init__(self, url, post_id, output_dir, cookies, parent=None):
+        super().__init__(parent)
+        self.start_url = url
+        self.post_id = post_id
+        self.output_dir = output_dir
+        self.cookies = cookies
+        self.is_cancelled = False
+        self.parent_app = parent
+        self.image_queue = queue.Queue()
+        self.service_queue = queue.Queue()
+        self.counter_lock = threading.Lock()
+        self.total_dl_count = 0
+        self.total_skip_count = 0
+        self.total_jobs_found = 0
+        self.total_jobs_processed = 0
+        self.processed_job_urls = set()
+
+    def cancel(self):
+        self.is_cancelled = True
+
+    class _ServiceLoggerAdapter:
+        """Wraps the progress signal to provide .info(), .error(), .warning() methods for other clients."""
+        def __init__(self, signal_emitter, prefix=""):
+            self.emit = signal_emitter
+            self.prefix = prefix
+
+        def __call__(self, msg, *args, **kwargs):
+            # Make the logger callable, defaulting to the info method.
+            self.info(msg, *args, **kwargs)
+            
+        def info(self, msg, *args, **kwargs): self.emit(f"{self.prefix}{str(msg) % args}")
+        def error(self, msg, *args, **kwargs): self.emit(f"{self.prefix}❌ ERROR: {str(msg) % args}")
+        def warning(self, msg, *args, **kwargs): self.emit(f"{self.prefix}⚠️ WARNING: {str(msg) % args}")
+
+    def _log_interceptor(self, message):
+        """Filters out verbose log messages from the simpcity_client."""
+        if "[SimpCity] Scraper found" in message or "[SimpCity] Scraping page" in message:
+            pass
+        else:
+            self.progress_signal.emit(message)
+
+    def _get_enriched_jobs(self, jobs_to_check):
+        """Performs a pre-flight check on jobs to get an accurate total file count and summary."""
+        if not jobs_to_check:
+            return []
+            
+        enriched_jobs = []
+        
+        bunkr_logger = self._ServiceLoggerAdapter(self.progress_signal.emit, prefix="      ")
+        pixeldrain_logger = self._ServiceLoggerAdapter(self.progress_signal.emit, prefix="      ")
+        saint2_logger = self._ServiceLoggerAdapter(self.progress_signal.emit, prefix="      ")
+        
+        for job in jobs_to_check:
+            job_type = job.get('type')
+            job_url = job.get('url')
+
+            if job_type in ['image', 'saint2_direct']:
+                enriched_jobs.append(job)
+            elif (job_type == 'bunkr' and self.should_dl_bunkr) or \
+                 (job_type == 'pixeldrain' and self.should_dl_pixeldrain) or \
+                 (job_type == 'saint2' and self.should_dl_saint2):
+                self.progress_signal.emit(f"   -> Checking {job_type} album for file count...")
+                
+                fetch_map = {
+                    'bunkr': (fetch_bunkr_data, bunkr_logger),
+                    'pixeldrain': (fetch_pixeldrain_data, pixeldrain_logger),
+                    'saint2': (fetch_saint2_data, saint2_logger)
+                }
+                fetch_func, logger_adapter = fetch_map[job_type]
+                album_name, files = fetch_func(job_url, logger_adapter)
+                
+                if files:
+                    job['prefetched_files'] = files
+                    job['prefetched_album_name'] = album_name
+                    enriched_jobs.append(job)
+        
+        if enriched_jobs:
+            summary_counts = Counter()
+            current_page_file_count = 0
+            for job in enriched_jobs:
+                if job.get('prefetched_files'):
+                    file_count = len(job['prefetched_files'])
+                    summary_counts[job['type']] += file_count
+                    current_page_file_count += file_count
+                else:
+                    summary_counts[job['type']] += 1
+                    current_page_file_count += 1
+            
+            summary_parts = [f"{job_type} ({count})" for job_type, count in summary_counts.items()]
+            self.progress_signal.emit(f"   [SimpCity] Content Found: {' | '.join(summary_parts)}")
+            
+            with self.counter_lock: self.total_jobs_found += current_page_file_count
+            self.overall_progress_signal.emit(self.total_jobs_found, self.total_jobs_processed)
+
+        return enriched_jobs
+
+    def _download_single_image(self, job, album_path, session):
+        """Downloads one image file; this is run by the image thread pool."""
+        filename = job['filename']
+        filepath = os.path.join(album_path, filename)
+        try:
+            if os.path.exists(filepath):
+                self.progress_signal.emit(f"   -> Skip (Image): '{filename}'")
+                with self.counter_lock: self.total_skip_count += 1
+                return
+            self.progress_signal.emit(f"   -> Downloading (Image): '{filename}'...")
+            # --- START MODIFICATION ---
+            response = session.get(job['url'], stream=True, timeout=180, headers={'Referer': self.start_url})
+            # --- END MODIFICATION ---
+            response.raise_for_status()
+            with open(filepath, 'wb') as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    if self.is_cancelled: break
+                    f.write(chunk)
+            if not self.is_cancelled:
+                with self.counter_lock: self.total_dl_count += 1
+        except Exception as e:
+            self.progress_signal.emit(f"      -> ❌ Image download failed for '{filename}': {e}")
+            with self.counter_lock: self.total_skip_count += 1
+        finally:
+            if not self.is_cancelled:
+                with self.counter_lock: self.total_jobs_processed += 1
+                self.overall_progress_signal.emit(self.total_jobs_found, self.total_jobs_processed)
+
+    def _image_worker(self, album_path):
+        """Target function for the image thread pool that pulls jobs from the queue."""
+        session = cloudscraper.create_scraper()
+        while True:
+            if self.is_cancelled: break
+            try:
+                job = self.image_queue.get(timeout=1)
+                if job is None: break
+                self._download_single_image(job, album_path, session)
+                self.image_queue.task_done()
+            except queue.Empty:
+                continue
+
+    def _service_worker(self, album_path):
+        """Target function for the single service thread, ensuring sequential downloads."""
+        while True:
+            if self.is_cancelled: break
+            try:
+                job = self.service_queue.get(timeout=1)
+                if job is None: break
+                
+                job_type = job['type']
+                job_url = job['url']
+                
+                if job_type in ['pixeldrain', 'saint2', 'bunkr']:
+                    if (job_type == 'pixeldrain' and self.should_dl_pixeldrain) or \
+                       (job_type == 'saint2' and self.should_dl_saint2) or \
+                       (job_type == 'bunkr' and self.should_dl_bunkr):
+                        self.progress_signal.emit(f"\n--- Processing Service ({job_type.capitalize()}): {job_url} ---")
+                        self._download_album(job.get('prefetched_files', []), job_url, album_path)
+                elif job_type == 'mega' and self.should_dl_mega:
+                    self.progress_signal.emit(f"\n--- Processing Service (Mega): {job_url} ---")
+                    drive_download_mega_file(job_url, album_path, self.progress_signal.emit, self.file_progress_signal.emit)
+                elif job_type == 'gofile' and self.should_dl_gofile:
+                    self.progress_signal.emit(f"\n--- Processing Service (Gofile): {job_url} ---")
+                    download_gofile_folder(job_url, album_path, self.progress_signal.emit, self.file_progress_signal.emit)
+                elif job_type == 'saint2_direct' and self.should_dl_saint2:
+                    self.progress_signal.emit(f"\n--- Processing Service (Saint2 Direct): {job_url} ---")
+                    try:
+                        filename = os.path.basename(urlparse(job_url).path)
+                        filepath = os.path.join(album_path, filename)
+                        if os.path.exists(filepath):
+                            with self.counter_lock: self.total_skip_count += 1
+                        else:
+                            response = cloudscraper.create_scraper().get(job_url, stream=True, timeout=120, headers={'Referer': self.start_url})
+                            response.raise_for_status()
+                            with open(filepath, 'wb') as f:
+                                for chunk in response.iter_content(chunk_size=8192):
+                                    if self.is_cancelled: break
+                                    f.write(chunk)
+                            if not self.is_cancelled:
+                                with self.counter_lock: self.total_dl_count += 1
+                    except Exception as e:
+                        with self.counter_lock: self.total_skip_count += 1
+                    finally:
+                        if not self.is_cancelled:
+                            with self.counter_lock: self.total_jobs_processed += 1
+                            self.overall_progress_signal.emit(self.total_jobs_found, self.total_jobs_processed)
+                
+                self.service_queue.task_done()
+            except queue.Empty:
+                continue
+
+    def _download_album(self, files_to_process, source_url, album_path):
+        """Helper to download all files from a pre-fetched album list."""
+        if not files_to_process: return
+        session = cloudscraper.create_scraper()
+        for file_data in files_to_process:
+            if self.is_cancelled: return
+            filename = file_data.get('filename') or file_data.get('name')
+            filepath = os.path.join(album_path, filename)
+            try:
+                if os.path.exists(filepath):
+                    with self.counter_lock: self.total_skip_count += 1
+                else:
+                    self.progress_signal.emit(f"       -> Downloading: '{filename}'...")
+                    headers = file_data.get('headers', {'Referer': source_url})
+                    # --- START MODIFICATION ---
+                    response = session.get(file_data.get('url'), stream=True, timeout=180, headers=headers)
+                    # --- END MODIFICATION ---
+                    response.raise_for_status()
+                    with open(filepath, 'wb') as f:
+                        for chunk in response.iter_content(chunk_size=8192):
+                            if self.is_cancelled: break
+                            f.write(chunk)
+                    if not self.is_cancelled:
+                        with self.counter_lock: self.total_dl_count += 1
+            except Exception as e:
+                with self.counter_lock: self.total_skip_count += 1
+            finally:
+                if not self.is_cancelled:
+                    with self.counter_lock: self.total_jobs_processed += 1
+                    self.overall_progress_signal.emit(self.total_jobs_found, self.total_jobs_processed)
+    
+    def run(self):
+        """Main entry point for the thread, orchestrates the entire download."""
+        self.progress_signal.emit("=" * 40)
+        self.progress_signal.emit(f"🚀 Starting SimpCity Download for: {self.start_url}")
+
+        self.should_dl_pixeldrain = self.parent_app.simpcity_dl_pixeldrain_cb.isChecked()
+        self.should_dl_saint2 = self.parent_app.simpcity_dl_saint2_cb.isChecked()
+        self.should_dl_mega = self.parent_app.simpcity_dl_mega_cb.isChecked()
+        self.should_dl_images = self.parent_app.simpcity_dl_images_cb.isChecked()
+        self.should_dl_bunkr = self.parent_app.simpcity_dl_bunkr_cb.isChecked()
+        self.should_dl_gofile = self.parent_app.simpcity_dl_gofile_cb.isChecked()
+        
+        is_single_post_mode = self.post_id or '/post-' in self.start_url
+        album_path = ""
+        
+        try:
+            if is_single_post_mode:
+                self.progress_signal.emit("   Mode: Single Post detected.")
+                album_title, _, _ = fetch_single_simpcity_page(self.start_url, self._log_interceptor, cookies=self.cookies, post_id=self.post_id)
+                album_path = os.path.join(self.output_dir, clean_folder_name(album_title or "simpcity_post"))
+            else:
+                self.progress_signal.emit("   Mode: Full Thread detected.")
+                first_page_url = re.sub(r'(/page-\d+)|(/post-\d+)', '', self.start_url).split('#')[0].strip('/')
+                album_title, _, _ = fetch_single_simpcity_page(first_page_url, self._log_interceptor, cookies=self.cookies)
+                album_path = os.path.join(self.output_dir, clean_folder_name(album_title or "simpcity_album"))
+            os.makedirs(album_path, exist_ok=True)
+            self.progress_signal.emit(f"   Saving all content to folder: '{os.path.basename(album_path)}'")
+        except Exception as e:
+            self.progress_signal.emit(f"❌ Could not process the initial page. Aborting. Error: {e}")
+            self.finished_signal.emit(0, 0, self.is_cancelled, []); return
+            
+        service_thread = threading.Thread(target=self._service_worker, args=(album_path,), daemon=True)
+        service_thread.start()
+        num_image_threads = 15
+        image_executor = ThreadPoolExecutor(max_workers=num_image_threads, thread_name_prefix='SimpCityImage')
+        for _ in range(num_image_threads): image_executor.submit(self._image_worker, album_path)
+
+        try:
+            if is_single_post_mode:
+                _, jobs, _ = fetch_single_simpcity_page(self.start_url, self._log_interceptor, cookies=self.cookies, post_id=self.post_id)
+                enriched_jobs = self._get_enriched_jobs(jobs)
+                if enriched_jobs:
+                    for job in enriched_jobs:
+                        if job['type'] == 'image': 
+                            if self.should_dl_images: self.image_queue.put(job)
+                        else: self.service_queue.put(job)         
+         
+            else:
+                base_url = re.sub(r'(/page-\d+)|(/post-\d+)', '', self.start_url).split('#')[0].strip('/')
+                page_counter = 1; end_of_thread = False; MAX_RETRIES = 3
+                while not end_of_thread:
+                    if self.is_cancelled: break
+                    page_url = f"{base_url}/page-{page_counter}"; retries = 0; page_fetch_successful = False
+                    while retries < MAX_RETRIES:
+                        if self.is_cancelled: end_of_thread = True; break
+                        self.progress_signal.emit(f"\n--- Analyzing page {page_counter} (Attempt {retries + 1}/{MAX_RETRIES}) ---")
+                        try:
+                            page_title, jobs_on_page, final_url = fetch_single_simpcity_page(page_url, self._log_interceptor, cookies=self.cookies)
+                            
+                            # --- START: MODIFIED REDIRECT LOGIC ---
+                            if final_url != page_url:
+                                self.progress_signal.emit(f"   -> Redirect detected from {page_url} to {final_url}")
+                                try:
+                                    req_page_match = re.search(r'/page-(\d+)', page_url)
+                                    final_page_match = re.search(r'/page-(\d+)', final_url)
+
+                                    if req_page_match:
+                                        req_page_num = int(req_page_match.group(1))
+
+                                        # Scenario 1: Redirect to an earlier page (e.g., page-11 -> page-10)
+                                        if final_page_match and int(final_page_match.group(1)) < req_page_num:
+                                            self.progress_signal.emit(f"   -> Redirected to an earlier page ({final_page_match.group(0)}). Reached end of thread.")
+                                            end_of_thread = True
+                                        
+                                        # Scenario 2: Redirect to base URL (e.g., page-11 -> /)
+                                        # We check req_page_num > 1 because page-1 often redirects to base URL, which is normal.
+                                        elif not final_page_match and req_page_num > 1:
+                                            self.progress_signal.emit(f"   -> Redirected to base thread URL. Reached end of thread.")
+                                            end_of_thread = True
+
+                                except (ValueError, TypeError):
+                                    pass # Ignore parsing errors
+                            # --- END: MODIFIED REDIRECT LOGIC ---
+                            
+                            if end_of_thread:
+                                page_fetch_successful = True; break
+
+                            if page_counter > 1 and not page_title:
+                                self.progress_signal.emit(f"   -> Page {page_counter} is invalid or has no title. Reached end of thread.")
+                                end_of_thread = True
+                            elif not jobs_on_page: 
+                                self.progress_signal.emit(f"   -> Page {page_counter} has no content. Reached end of thread.")
+                                end_of_thread = True
+                            else:
+                                new_jobs = [job for job in jobs_on_page if job.get('url') not in self.processed_job_urls]
+                                if not new_jobs and page_counter > 1: 
+                                    self.progress_signal.emit(f"   -> Page {page_counter} contains no new content. Reached end of thread.")
+                                    end_of_thread = True
+                                else:
+                                    enriched_jobs = self._get_enriched_jobs(new_jobs)
+                                    if not enriched_jobs and not new_jobs:
+                                        # This can happen if all new_jobs were e.g. pixeldrain and it's disabled
+                                        self.progress_signal.emit(f"   -> Page {page_counter} content was filtered out. Reached end of thread.")
+                                        end_of_thread = True
+
+                                    else:
+                                        for job in enriched_jobs:
+                                            self.processed_job_urls.add(job.get('url'))
+                                            if job['type'] == 'image':
+                                                if self.should_dl_images: self.image_queue.put(job)
+                                            else: self.service_queue.put(job)
+
+                            page_fetch_successful = True; break
+                        except requests.exceptions.HTTPError as e:
+                            if e.response.status_code in [403, 404]: 
+                                self.progress_signal.emit(f"   -> Page {page_counter} returned {e.response.status_code}. Reached end of thread.")
+                                end_of_thread = True; break
+                            elif e.response.status_code == 429: 
+                                self.progress_signal.emit(f"   -> Rate limited (429). Waiting...")
+                                time.sleep(5 * (retries + 2)); retries += 1
+                            else: 
+                                self.progress_signal.emit(f"   -> HTTP Error {e.response.status_code} on page {page_counter}. Stopping crawl.")
+                                end_of_thread = True; break
+                        except Exception as e:
+                            self.progress_signal.emit(f"   Stopping crawl due to error on page {page_counter}: {e}"); end_of_thread = True; break
+                    if not page_fetch_successful and not end_of_thread: 
+                        self.progress_signal.emit(f"   -> Failed to fetch page {page_counter} after {MAX_RETRIES} attempts. Stopping crawl.")
+                        end_of_thread = True
+                    if not end_of_thread: page_counter += 1
+        except Exception as e:
+            self.progress_signal.emit(f"❌ A critical error occurred during the main fetch phase: {e}")
+
+        self.progress_signal.emit("\n--- All pages analyzed. Waiting for background downloads to complete... ---")
+        for _ in range(num_image_threads): self.image_queue.put(None)
+        self.service_queue.put(None)
+        image_executor.shutdown(wait=True)
+        service_thread.join()
+        self.finished_signal.emit(self.total_dl_count, self.total_skip_count, self.is_cancelled, [])

src/ui/classes/toonily_downloader_thread.py

@@ -0,0 +1,128 @@
+import os
+import threading
+import time
+from urllib.parse import urlparse
+
+import cloudscraper
+from PyQt5.QtCore import QThread, pyqtSignal
+
+from ...core.toonily_client import (
+    fetch_chapter_data as toonily_fetch_data,
+    get_chapter_list as toonily_get_list
+)
+from ...utils.file_utils import clean_folder_name
+
+
+class ToonilyDownloadThread(QThread):
+    """A dedicated QThread for handling toonily.com series or single chapters."""
+    progress_signal = pyqtSignal(str)
+    file_progress_signal = pyqtSignal(str, object)
+    finished_signal = pyqtSignal(int, int, bool) 
+    overall_progress_signal = pyqtSignal(int, int) # Signal for chapter progress
+
+    def __init__(self, url, output_dir, parent=None):
+        super().__init__(parent)
+        self.start_url = url
+        self.output_dir = output_dir
+        self.is_cancelled = False
+        # Get access to the pause event from the main app
+        self.pause_event = parent.pause_event if hasattr(parent, 'pause_event') else threading.Event()
+
+    def _check_pause(self):
+        # Helper function to check for pause/cancel events
+        if self.is_cancelled: return True
+        if self.pause_event and self.pause_event.is_set():
+            self.progress_signal.emit("   Download paused...")
+            while self.pause_event.is_set():
+                if self.is_cancelled: return True
+                time.sleep(0.5)
+            self.progress_signal.emit("   Download resumed.")
+        return self.is_cancelled
+
+    def run(self):
+        grand_total_dl = 0
+        grand_total_skip = 0
+
+        # Check if the URL is a series or a chapter
+        if '/chapter-' in self.start_url:
+            # It's a single chapter URL
+            chapters_to_download = [self.start_url]
+            self.progress_signal.emit("ℹ️ Single Toonily chapter URL detected.")
+        else:
+            # It's a series URL, so get all chapters
+            chapters_to_download = toonily_get_list(self.start_url, self.progress_signal.emit)
+
+        if not chapters_to_download:
+            self.progress_signal.emit("❌ No chapters found to download.")
+            self.finished_signal.emit(0, 0, self.is_cancelled)
+            return
+
+        self.progress_signal.emit(f"--- Starting download of {len(chapters_to_download)} chapter(s) ---")
+        self.overall_progress_signal.emit(len(chapters_to_download), 0)
+        
+        scraper = cloudscraper.create_scraper()
+
+        for chapter_idx, chapter_url in enumerate(chapters_to_download):
+            if self._check_pause(): break
+            
+            self.progress_signal.emit(f"\n-- Processing Chapter {chapter_idx + 1}/{len(chapters_to_download)} --")
+            series_title, chapter_title, image_urls = toonily_fetch_data(chapter_url, self.progress_signal.emit, scraper)
+            
+            if not image_urls:
+                self.progress_signal.emit(f"❌ Failed to get data for chapter. Skipping.")
+                continue
+
+            # Create folders like: /Downloads/Series Name/Chapter 01/
+            series_folder_name = clean_folder_name(series_title)
+            # Make a safe folder name from the full chapter title
+            chapter_folder_name = clean_folder_name(chapter_title)
+            final_save_path = os.path.join(self.output_dir, series_folder_name, chapter_folder_name)
+            
+            try:
+                os.makedirs(final_save_path, exist_ok=True)
+                self.progress_signal.emit(f"   Saving to folder: '{os.path.join(series_folder_name, chapter_folder_name)}'")
+            except OSError as e:
+                self.progress_signal.emit(f"❌ Critical error creating directory: {e}")
+                grand_total_skip += len(image_urls)
+                continue
+
+            for i, img_url in enumerate(image_urls):
+                if self._check_pause(): break
+                
+                try:
+                    file_extension = os.path.splitext(urlparse(img_url).path)[1] or '.jpg'
+                    filename = f"{i+1:03d}{file_extension}"
+                    filepath = os.path.join(final_save_path, filename)
+
+                    if os.path.exists(filepath):
+                        self.progress_signal.emit(f"   -> Skip ({i+1}/{len(image_urls)}): '{filename}' already exists.")
+                        grand_total_skip += 1
+                    else:
+                        self.progress_signal.emit(f"   Downloading ({i+1}/{len(image_urls)}): '{filename}'...")
+                        response = scraper.get(img_url, stream=True, timeout=60, headers={'Referer': chapter_url})
+                        response.raise_for_status()
+                        
+                        with open(filepath, 'wb') as f:
+                            for chunk in response.iter_content(chunk_size=8192):
+                                if self._check_pause(): break
+                                f.write(chunk)
+                        
+                        if self._check_pause():
+                            if os.path.exists(filepath): os.remove(filepath)
+                            break
+                        
+                        grand_total_dl += 1
+                        time.sleep(0.2)
+                except Exception as e:
+                    self.progress_signal.emit(f"   ❌ Failed to download '{filename}': {e}")
+                    grand_total_skip += 1
+
+            self.overall_progress_signal.emit(len(chapters_to_download), chapter_idx + 1)
+            time.sleep(1) # Wait a second between chapters
+
+        self.file_progress_signal.emit("", None)
+        self.finished_signal.emit(grand_total_dl, grand_total_skip, self.is_cancelled)
+
+    def cancel(self):
+        self.is_cancelled = True
+        self.progress_signal.emit("   Cancellation signal received by Toonily thread.")

src/ui/dialogs/CustomFilenameDialog.py

@@ -7,7 +7,6 @@ from PyQt5.QtCore import Qt
 class CustomFilenameDialog(QDialog):
     """A dialog for creating a custom filename format string."""
     
-    # --- REPLACE THE 'AVAILABLE_KEYS' LIST WITH THIS DICTIONARY ---
     DISPLAY_KEY_MAP = {
         "PostID": "id",
         "CreatorName": "creator_name",  
@@ -19,7 +18,10 @@ class CustomFilenameDialog(QDialog):
         "name": "name"
     }
 
-    def __init__(self, current_format, current_date_format, parent=None):
+    # STRICT LIST: Only these three will be clickable for DeviantArt
+    DA_ALLOWED_KEYS = ["creator_name", "title", "published"]
+
+    def __init__(self, current_format, current_date_format, parent=None, is_deviantart=False):
         super().__init__(parent)
         self.setWindowTitle("Custom Filename Format")
         self.setMinimumWidth(500)
@@ -31,9 +33,11 @@ class CustomFilenameDialog(QDialog):
         layout = QVBoxLayout(self)
 
         # --- Description ---
-        description_label = QLabel(
-            "Create a filename format using placeholders. The date/time values for 'added', 'published', and 'edited' will be automatically shortened to your specified format."
-        )
+        desc_text = "Create a filename format using placeholders. The date/time values will be automatically formatted."
+        if is_deviantart:
+            desc_text += "\n\n(DeviantArt Mode: Only Creator Name, Title, and Upload Date are available. Other buttons are disabled.)"
+            
+        description_label = QLabel(desc_text)
         description_label.setWordWrap(True)
         layout.addWidget(description_label)
         
@@ -42,15 +46,20 @@ class CustomFilenameDialog(QDialog):
         layout.addWidget(format_label)
         self.format_input = QLineEdit(self)
         self.format_input.setText(self.current_format)
-        self.format_input.setPlaceholderText("e.g., {published} {title} {id}")
+        
+        if is_deviantart:
+            self.format_input.setPlaceholderText("e.g., {published} {title} {creator_name}")
+        else:
+            self.format_input.setPlaceholderText("e.g., {published} {title} {id}")
+            
         layout.addWidget(self.format_input)
 
         # --- Date Format Input ---
-        date_format_label = QLabel("Date Format (for {added}, {published}, {edited}):")
+        date_format_label = QLabel("Date Format (for {published}):")
         layout.addWidget(date_format_label)
         self.date_format_input = QLineEdit(self)
         self.date_format_input.setText(self.current_date_format)
-        self.date_format_input.setPlaceholderText("e.g., YYYY-MM-DD or DD-MM-YYYY")
+        self.date_format_input.setPlaceholderText("e.g., YYYY-MM-DD")
         layout.addWidget(self.date_format_input)
 
         # --- Available Keys Display ---
@@ -62,7 +71,20 @@ class CustomFilenameDialog(QDialog):
         
         for display_key, internal_key in self.DISPLAY_KEY_MAP.items():
             key_button = QPushButton(f"{{{display_key}}}")
-            # Use a lambda to pass the correct internal key when the button is clicked
+            
+# --- DeviantArt Logic ---
+            if is_deviantart:
+                if internal_key in self.DA_ALLOWED_KEYS:
+                    # Active buttons: Bold text, enabled
+                    key_button.setStyleSheet("font-weight: bold; color: black;")
+                    key_button.setEnabled(True)
+                else:
+                    # Inactive buttons: Disabled (Cannot be clicked)
+                    key_button.setEnabled(False) 
+                    key_button.setToolTip("Not available for DeviantArt")
+            # ------------------------
+            
+            # Use a lambda to pass the correct internal key when clicked
             key_button.clicked.connect(lambda checked, key=internal_key: self.add_key_to_input(key))
             keys_layout.addWidget(key_button)
         keys_layout.addStretch()
@@ -81,9 +103,7 @@ class CustomFilenameDialog(QDialog):
         self.format_input.setFocus()
 
     def get_format_string(self):
-        """Returns the final format string from the input field."""
         return self.format_input.text().strip()
 
     def get_date_format_string(self):
-        """Returns the date format string from its input field."""
-        return self.date_format_input.text().strip()
+        return self.date_format_input.text().strip()

src/ui/dialogs/EmptyPopupDialog.py

@@ -22,6 +22,8 @@ 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
+# --- IMPORT THE NEW DIALOG ---
+from .UpdateCheckDialog import UpdateCheckDialog
 
 
 class PostsFetcherThread (QThread ):
@@ -138,7 +140,7 @@ class EmptyPopupDialog (QDialog ):
     SCOPE_CREATORS ="Creators"
 
 
-    def __init__ (self ,app_base_dir ,parent_app_ref ,parent =None ):
+    def __init__ (self ,user_data_path ,parent_app_ref ,parent =None ):
         super ().__init__ (parent )
         self.parent_app = parent_app_ref
 
@@ -146,13 +148,21 @@ class EmptyPopupDialog (QDialog ):
         
         self.setMinimumSize(int(400 * scale_factor), int(300 * scale_factor))
         self.current_scope_mode = self.SCOPE_CREATORS
-        self .app_base_dir =app_base_dir 
+        self.user_data_path = user_data_path
 
         app_icon =get_app_icon_object ()
         if app_icon and not app_icon .isNull ():
             self .setWindowIcon (app_icon )
+        
+        # --- MODIFIED: Store a list of profiles now ---
+        self.update_profiles_list = None
+        # --- NEW: Flag to indicate if settings should load to UI ---
+        self.load_settings_into_ui_requested = False
+        
+        # --- DEPRECATED (kept for compatibility if needed, but new logic won't use them) ---
         self.update_profile_data = None
         self.update_creator_name = None
+        
         self .selected_creators_for_queue =[]
         self .globally_selected_creators ={}
         self .fetched_posts_data ={}
@@ -321,29 +331,37 @@ class EmptyPopupDialog (QDialog ):
                 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")
+        """
+        --- MODIFIED FUNCTION ---
+        Opens the new UpdateCheckDialog instead of a QFileDialog.
+        If a profile is selected, it sets the dialog's result properties
+        and accepts the dialog, just like the old file dialog logic did.
+        """
+        # --- NEW BEHAVIOR ---
+        # Pass the app_base_dir and a reference to the main app (for translations/theme)
+        dialog = UpdateCheckDialog(self.user_data_path, self.parent_app, self)
         
-        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}")
+        if dialog.exec_() == QDialog.Accepted:
+            # --- MODIFIED: Get a list of profiles now ---
+            selected_profiles = dialog.get_selected_profiles()
+            # --- NEW: Get the checkbox state ---
+            self.load_settings_into_ui_requested = dialog.should_load_into_ui()
+            
+            if selected_profiles:
+                try:
+                    # --- MODIFIED: Store the list ---
+                    self.update_profiles_list = selected_profiles
+                    
+                    # --- Set deprecated single-profile fields for backward compatibility (optional) ---
+                    # --- This helps if other parts of the main window still expect one profile ---
+                    self.update_profile_data = selected_profiles[0]['data']
+                    self.update_creator_name = selected_profiles[0]['name']
+                    
+                    self.accept() # Close EmptyPopupDialog and signal success to main_window
+                except Exception as e:
+                    QMessageBox.critical(self, "Error Loading Profile",
+                                         f"Could not process the selected profile data:\n\n{e}")
+        # --- END OF NEW BEHAVIOR ---
 
     def _handle_fetch_posts_click (self ):
         selected_creators =list (self .globally_selected_creators .values ())
@@ -981,9 +999,14 @@ class EmptyPopupDialog (QDialog ):
     def _handle_posts_close_view (self ):
         self .right_pane_widget .hide ()
         self .main_splitter .setSizes ([self .width (),0 ])
-        self .posts_list_widget .itemChanged .disconnect (self ._handle_post_item_check_changed )
+        
+        # --- MODIFIED: Added check before disconnect ---
         if hasattr (self ,'_handle_post_item_check_changed'):
-            self .posts_title_list_widget .itemChanged .disconnect (self ._handle_post_item_check_changed )
+            try:
+                self .posts_title_list_widget .itemChanged .disconnect (self ._handle_post_item_check_changed )
+            except TypeError:
+                pass # Already disconnected
+        
         self .posts_search_input .setVisible (False )
         self .posts_search_input .clear ()
         self .globally_selected_post_ids .clear ()
@@ -1035,4 +1058,4 @@ class EmptyPopupDialog (QDialog ):
         else :
             if unique_key in self .globally_selected_creators :
                 del self .globally_selected_creators [unique_key ]
-        self .fetch_posts_button .setEnabled (bool (self .globally_selected_creators ))
+        self .fetch_posts_button .setEnabled (bool (self .globally_selected_creators ))

src/ui/dialogs/FutureSettingsDialog.py

@@ -5,9 +5,11 @@ import sys
 
 # --- PyQt5 Imports ---
 from PyQt5.QtCore import Qt, QStandardPaths, QTimer
+from PyQt5.QtGui import QIntValidator  # <--- NEW: Added for Port validation
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
-    QGroupBox, QComboBox, QMessageBox, QGridLayout, QCheckBox, QLineEdit
+    QGroupBox, QComboBox, QMessageBox, QGridLayout, QCheckBox, QLineEdit,
+    QTabWidget, QWidget, QFileDialog
 )
 # --- Local Application Imports ---
 from ...i18n.translator import get_translation
@@ -20,7 +22,9 @@ from ...config.constants import (
     RESOLUTION_KEY, UI_SCALE_KEY, SAVE_CREATOR_JSON_KEY,
     DATE_PREFIX_FORMAT_KEY, 
     COOKIE_TEXT_KEY, USE_COOKIE_KEY,
-    FETCH_FIRST_KEY, DISCORD_TOKEN_KEY, POST_DOWNLOAD_ACTION_KEY
+    FETCH_FIRST_KEY, DISCORD_TOKEN_KEY, POST_DOWNLOAD_ACTION_KEY,
+    PROXY_ENABLED_KEY, PROXY_HOST_KEY, PROXY_PORT_KEY, 
+    PROXY_USERNAME_KEY, PROXY_PASSWORD_KEY
 )
 from ...services.updater import UpdateChecker, UpdateDownloader
 
@@ -111,21 +115,21 @@ class CountdownMessageBox(QDialog):
 class FutureSettingsDialog(QDialog):
     """
     A dialog for managing application-wide settings like theme, language,
-    and display options, with an organized layout.
+    and display options, using a tabbed layout.
     """
     def __init__(self, parent_app_ref, parent=None):
         super().__init__(parent)
         self.parent_app = parent_app_ref
         self.setModal(True)
-        self.update_downloader_thread = None # To keep a reference
+        self.update_downloader_thread = None 
 
         app_icon = get_app_icon_object()
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
 
         screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 800
-        scale_factor = screen_height / 800.0
-        base_min_w, base_min_h = 420, 520 # Increased height for new options
+        scale_factor = screen_height / 1000.0 
+        base_min_w, base_min_h = 550, 450 # <--- TWEAK: Slightly increased width for better layout
         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)
@@ -133,71 +137,167 @@ class FutureSettingsDialog(QDialog):
         self._init_ui()
         self._retranslate_ui()
         self._apply_theme()
+        
+        # <--- NEW: Load proxy settings on init
+        self._load_proxy_settings()
 
     def _init_ui(self):
         """Initializes all UI components and layouts for the dialog."""
         main_layout = QVBoxLayout(self)
+        
+        # --- Create Tab Widget ---
+        self.tab_widget = QTabWidget()
+        main_layout.addWidget(self.tab_widget)
 
-        self.interface_group_box = QGroupBox()
-        interface_layout = QGridLayout(self.interface_group_box)
+        # --- Create Tabs ---
+        self.display_tab = QWidget()
+        self.downloads_tab = QWidget()
+        self.network_tab = QWidget() # <--- NEW: Network Tab
+        self.updates_tab = QWidget()
+
+        # Add tabs to the widget
+        self.tab_widget.addTab(self.display_tab, "Display")
+        self.tab_widget.addTab(self.downloads_tab, "Downloads")
+        self.tab_widget.addTab(self.network_tab, "Proxy/Network") # <--- NEW
+        self.tab_widget.addTab(self.updates_tab, "Updates")
+
+        # [Display Tab Code (Unchanged) ...]
+        display_tab_layout = QVBoxLayout(self.display_tab)
+        self.display_group_box = QGroupBox()
+        display_layout = QGridLayout(self.display_group_box)
 
         self.theme_label = QLabel()
         self.theme_toggle_button = QPushButton()
         self.theme_toggle_button.clicked.connect(self._toggle_theme)
-        interface_layout.addWidget(self.theme_label, 0, 0)
-        interface_layout.addWidget(self.theme_toggle_button, 0, 1)
+        display_layout.addWidget(self.theme_label, 0, 0)
+        display_layout.addWidget(self.theme_toggle_button, 0, 1)
 
         self.ui_scale_label = QLabel()
         self.ui_scale_combo_box = QComboBox()
         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)
+        display_layout.addWidget(self.ui_scale_label, 1, 0)
+        display_layout.addWidget(self.ui_scale_combo_box, 1, 1)
 
         self.language_label = QLabel()
         self.language_combo_box = QComboBox()
         self.language_combo_box.currentIndexChanged.connect(self._language_selection_changed)
-        interface_layout.addWidget(self.language_label, 2, 0)
-        interface_layout.addWidget(self.language_combo_box, 2, 1)
+        display_layout.addWidget(self.language_label, 2, 0)
+        display_layout.addWidget(self.language_combo_box, 2, 1)
 
-        main_layout.addWidget(self.interface_group_box)
-
-        self.download_window_group_box = QGroupBox()
-        download_window_layout = QGridLayout(self.download_window_group_box)
-        
         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)
+        display_layout.addWidget(self.window_size_label, 3, 0)
+        display_layout.addWidget(self.resolution_combo_box, 3, 1)
+        
+        display_tab_layout.addWidget(self.display_group_box)
+        display_tab_layout.addStretch(1) 
+
+        # [Downloads Tab Code (Unchanged) ...]
+        downloads_tab_layout = QVBoxLayout(self.downloads_tab)
+        self.download_settings_group_box = QGroupBox()
+        download_settings_layout = QGridLayout(self.download_settings_group_box)
 
         self.default_path_label = QLabel()
         self.save_path_button = QPushButton()
         self.save_path_button.clicked.connect(self._save_settings)
-        download_window_layout.addWidget(self.default_path_label, 1, 0)
-        download_window_layout.addWidget(self.save_path_button, 1, 1)
-
-        self.date_prefix_format_label = QLabel()
-        self.date_prefix_format_input = QLineEdit()
-        self.date_prefix_format_input.textChanged.connect(self._date_prefix_format_changed)
-        download_window_layout.addWidget(self.date_prefix_format_label, 2, 0)
-        download_window_layout.addWidget(self.date_prefix_format_input, 2, 1)
+        download_settings_layout.addWidget(self.default_path_label, 0, 0)
+        download_settings_layout.addWidget(self.save_path_button, 0, 1)
 
         self.post_download_action_label = QLabel()
         self.post_download_action_combo = QComboBox()
         self.post_download_action_combo.currentIndexChanged.connect(self._post_download_action_changed)
-        download_window_layout.addWidget(self.post_download_action_label, 3, 0)
-        download_window_layout.addWidget(self.post_download_action_combo, 3, 1)
+        download_settings_layout.addWidget(self.post_download_action_label, 1, 0)
+        download_settings_layout.addWidget(self.post_download_action_combo, 1, 1)
+
+        self.date_prefix_format_label = QLabel()
+        self.date_prefix_format_input = QLineEdit()
+        self.date_prefix_format_input.textChanged.connect(self._date_prefix_format_changed)
+        download_settings_layout.addWidget(self.date_prefix_format_label, 2, 0)
+        download_settings_layout.addWidget(self.date_prefix_format_input, 2, 1)
 
         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, 4, 0, 1, 2)
+        download_settings_layout.addWidget(self.save_creator_json_checkbox, 3, 0, 1, 2)
         
         self.fetch_first_checkbox = QCheckBox()
         self.fetch_first_checkbox.stateChanged.connect(self._fetch_first_setting_changed)
-        download_window_layout.addWidget(self.fetch_first_checkbox, 5, 0, 1, 2)
+        download_settings_layout.addWidget(self.fetch_first_checkbox, 4, 0, 1, 2)
 
-        main_layout.addWidget(self.download_window_group_box)
+        settings_file_layout = QHBoxLayout()
+        self.load_settings_button = QPushButton()
+        self.save_settings_button = QPushButton()
+        settings_file_layout.addWidget(self.load_settings_button)
+        settings_file_layout.addWidget(self.save_settings_button)
+        settings_file_layout.addStretch(1)
+        
+        download_settings_layout.addLayout(settings_file_layout, 5, 0, 1, 2)
+        
+        self.load_settings_button.clicked.connect(self._handle_load_settings)
+        self.save_settings_button.clicked.connect(self._handle_save_settings)
 
+        downloads_tab_layout.addWidget(self.download_settings_group_box)
+        downloads_tab_layout.addStretch(1) 
+
+        # --- START: Network Tab (NEW) ---
+        network_tab_layout = QVBoxLayout(self.network_tab)
+        self.proxy_group_box = QGroupBox()
+        proxy_layout = QGridLayout(self.proxy_group_box)
+
+        # Enable Checkbox
+        self.proxy_enabled_checkbox = QCheckBox()
+        self.proxy_enabled_checkbox.stateChanged.connect(self._proxy_setting_changed)
+        proxy_layout.addWidget(self.proxy_enabled_checkbox, 0, 0, 1, 2)
+
+        # Proxy Type Dropdown
+        self.proxy_type_label = QLabel("Proxy Type:") 
+        self.proxy_type_combo = QComboBox()
+        self.proxy_type_combo.addItems(["HTTP", "SOCKS4", "SOCKS5"])
+        self.proxy_type_combo.currentIndexChanged.connect(self._proxy_setting_changed)
+        proxy_layout.addWidget(self.proxy_type_label, 1, 0)
+        proxy_layout.addWidget(self.proxy_type_combo, 1, 1)
+
+
+        # Host / IP
+        self.proxy_host_label = QLabel()
+        self.proxy_host_input = QLineEdit()
+        self.proxy_host_input.setPlaceholderText("127.0.0.1")
+        self.proxy_host_input.editingFinished.connect(self._proxy_setting_changed)
+        proxy_layout.addWidget(self.proxy_host_label, 2, 0) # Changed row to 2
+        proxy_layout.addWidget(self.proxy_host_input, 2, 1)
+
+        # Port
+        self.proxy_port_label = QLabel()
+        self.proxy_port_input = QLineEdit()
+        self.proxy_port_input.setPlaceholderText("8080")
+        self.proxy_port_input.setValidator(QIntValidator(1, 65535, self)) # Only numbers
+        self.proxy_port_input.editingFinished.connect(self._proxy_setting_changed)
+        proxy_layout.addWidget(self.proxy_port_label, 3, 0)
+        proxy_layout.addWidget(self.proxy_port_input, 3, 1)
+
+        # Username
+        self.proxy_user_label = QLabel()
+        self.proxy_user_input = QLineEdit()
+        self.proxy_user_input.setPlaceholderText("(Optional)")
+        self.proxy_user_input.editingFinished.connect(self._proxy_setting_changed)
+        proxy_layout.addWidget(self.proxy_user_label, 4, 0)
+        proxy_layout.addWidget(self.proxy_user_input, 4, 1)
+
+        # Password
+        self.proxy_pass_label = QLabel()
+        self.proxy_pass_input = QLineEdit()
+        self.proxy_pass_input.setPlaceholderText("(Optional)")
+        self.proxy_pass_input.setEchoMode(QLineEdit.Password) # Mask input
+        self.proxy_pass_input.editingFinished.connect(self._proxy_setting_changed)
+        proxy_layout.addWidget(self.proxy_pass_label, 5, 0)
+        proxy_layout.addWidget(self.proxy_pass_input, 5, 1)
+
+        network_tab_layout.addWidget(self.proxy_group_box)
+        network_tab_layout.addStretch(1)
+        # --- END: Network Tab (NEW) ---
+
+        # [Updates Tab Code (Unchanged) ...]
+        updates_tab_layout = QVBoxLayout(self.updates_tab)
         self.update_group_box = QGroupBox()
         update_layout = QGridLayout(self.update_group_box)
         self.version_label = QLabel()
@@ -207,29 +307,40 @@ class FutureSettingsDialog(QDialog):
         update_layout.addWidget(self.version_label, 0, 0)
         update_layout.addWidget(self.update_status_label, 0, 1)
         update_layout.addWidget(self.check_update_button, 1, 0, 1, 2)
-        main_layout.addWidget(self.update_group_box)
-
-        main_layout.addStretch(1)
+        
+        updates_tab_layout.addWidget(self.update_group_box)
+        updates_tab_layout.addStretch(1)
 
+        # --- OK Button (outside tabs) ---
+        button_layout = QHBoxLayout()
+        button_layout.addStretch(1)
         self.ok_button = QPushButton()
         self.ok_button.clicked.connect(self.accept)
-        main_layout.addWidget(self.ok_button, 0, Qt.AlignRight | Qt.AlignBottom)
+        button_layout.addWidget(self.ok_button)
+        main_layout.addLayout(button_layout)
+
 
     def _retranslate_ui(self):
         self.setWindowTitle(self._tr("settings_dialog_title", "Settings"))
-        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"))
+        
+        # --- Tab Titles ---
+        self.tab_widget.setTabText(0, self._tr("settings_tab_display", "Display"))
+        self.tab_widget.setTabText(1, self._tr("settings_tab_downloads", "Downloads"))
+        self.tab_widget.setTabText(2, self._tr("settings_tab_network", "Proxy/Network")) # <--- NEW
+        self.tab_widget.setTabText(3, self._tr("settings_tab_updates", "Updates"))
+
+        # [Display Tab (Unchanged) ...]
+        self.display_group_box.setTitle(self._tr("display_settings_group_title", "Display Settings"))
         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:"))
-
         self.window_size_label.setText(self._tr("window_size_label", "Window Size:"))
-        self.default_path_label.setText(self._tr("default_path_label", "Default Path:"))
 
+        # [Downloads Tab (Unchanged) ...]
+        self.download_settings_group_box.setTitle(self._tr("download_settings_group_title", "Download Settings"))
+        self.default_path_label.setText(self._tr("default_path_label", "Default Path:"))
         self.date_prefix_format_label.setText(self._tr("date_prefix_format_label", "Post Subfolder Format:"))
-        # Update placeholder to include {post}
         self.date_prefix_format_input.setPlaceholderText(self._tr("date_prefix_format_placeholder", "e.g., YYYY-MM-DD {post} {postid}"))
-        # Add the tooltip to explain usage
         self.date_prefix_format_input.setToolTip(self._tr(
             "date_prefix_format_tooltip", 
             "Create a custom folder name using placeholders:\n"
@@ -238,24 +349,35 @@ class FutureSettingsDialog(QDialog):
             "• {postid}: for the post's unique ID\n\n"
             "Example: {post} [{postid}] [YYYY-MM-DD]"
         ))
-
-        
-        self.post_download_action_label.setText(self._tr("post_download_action_label", "Action After Download:"))
-
         self.post_download_action_label.setText(self._tr("post_download_action_label", "Action After Download:"))
         self.save_creator_json_checkbox.setText(self._tr("save_creator_json_label", "Save Creator.json file"))
         self.fetch_first_checkbox.setText(self._tr("fetch_first_label", "Fetch First (Download after all pages are found)"))
         self.fetch_first_checkbox.setToolTip(self._tr("fetch_first_tooltip", "If checked, the downloader will find all posts from a creator first before starting any downloads.\nThis can be slower to start but provides a more accurate progress bar."))
-        self._update_theme_toggle_button_text()
         self.save_path_button.setText(self._tr("settings_save_all_button", "Save Path + Cookie + Token"))
         self.save_path_button.setToolTip(self._tr("settings_save_all_tooltip", "Save the current 'Download Location', Cookie, and Discord Token settings for future sessions."))
-        self.ok_button.setText(self._tr("ok_button", "OK"))
+        self.load_settings_button.setText(self._tr("load_settings_button", "Load Settings..."))
+        self.load_settings_button.setToolTip(self._tr("load_settings_tooltip", "Load all download settings from a .json file."))
+        self.save_settings_button.setText(self._tr("save_settings_button", "Save Settings..."))
+        self.save_settings_button.setToolTip(self._tr("save_settings_tooltip", "Save all current download settings to a .json file."))
+        
+        # --- START: Network Tab (NEW) ---
+        self.proxy_group_box.setTitle(self._tr("proxy_settings_group_title", "Proxy Configuration"))
+        self.proxy_enabled_checkbox.setText(self._tr("proxy_enabled_label", "Enable Proxy"))
+        self.proxy_host_label.setText(self._tr("proxy_host_label", "Host / IP:"))
+        self.proxy_port_label.setText(self._tr("proxy_port_label", "Port:"))
+        self.proxy_user_label.setText(self._tr("proxy_user_label", "Username (Optional):"))
+        self.proxy_pass_label.setText(self._tr("proxy_pass_label", "Password (Optional):"))
+        # --- END: Network Tab (NEW) ---
 
+        # [Updates Tab (Unchanged) ...]
         self.update_group_box.setTitle(self._tr("update_group_title", "Application Updates"))
         current_version = self.parent_app.windowTitle().split(' v')[-1]
         self.version_label.setText(self._tr("current_version_label", f"Current Version: v{current_version}"))
         self.update_status_label.setText(self._tr("update_status_ready", "Ready to check."))
         self.check_update_button.setText(self._tr("check_for_updates_button", "Check for Updates"))
+
+        self._update_theme_toggle_button_text()
+        self.ok_button.setText(self._tr("ok_button", "OK"))
         
         self._populate_display_combo_boxes()
         self._populate_language_combo_box()
@@ -263,6 +385,82 @@ class FutureSettingsDialog(QDialog):
         self._load_date_prefix_format()
         self._load_checkbox_states()
 
+    # --- START: New Proxy Logic ---
+    def _load_proxy_settings(self):
+        """Loads proxy settings from QSettings into the UI."""
+        # Block signals to prevent triggering auto-save while loading
+        self.proxy_enabled_checkbox.blockSignals(True)
+        self.proxy_type_combo.blockSignals(True)  # <--- NEW
+        self.proxy_host_input.blockSignals(True)
+        self.proxy_port_input.blockSignals(True)
+        self.proxy_user_input.blockSignals(True)
+        self.proxy_pass_input.blockSignals(True)
+
+        # Load values
+        enabled = self.parent_app.settings.value(PROXY_ENABLED_KEY, False, type=bool)
+        proxy_type = self.parent_app.settings.value("proxy_type", "HTTP", type=str) # <--- NEW
+        host = self.parent_app.settings.value(PROXY_HOST_KEY, "", type=str)
+        port = self.parent_app.settings.value(PROXY_PORT_KEY, "", type=str)
+        user = self.parent_app.settings.value(PROXY_USERNAME_KEY, "", type=str)
+        password = self.parent_app.settings.value(PROXY_PASSWORD_KEY, "", type=str)
+
+        # Apply values to UI
+        self.proxy_enabled_checkbox.setChecked(enabled)
+        
+        # <--- NEW: Set the dropdown selection
+        index = self.proxy_type_combo.findText(proxy_type)
+        if index >= 0:
+            self.proxy_type_combo.setCurrentIndex(index)
+        else:
+            self.proxy_type_combo.setCurrentIndex(0) # Default to first item if not found
+
+        self.proxy_host_input.setText(host)
+        self.proxy_port_input.setText(port)
+        self.proxy_user_input.setText(user)
+        self.proxy_pass_input.setText(password)
+
+        self._update_proxy_fields_state(enabled)
+
+        # Unblock signals
+        self.proxy_enabled_checkbox.blockSignals(False)
+        self.proxy_type_combo.blockSignals(False) # <--- NEW
+        self.proxy_host_input.blockSignals(False)
+        self.proxy_port_input.blockSignals(False)
+        self.proxy_user_input.blockSignals(False)
+        self.proxy_pass_input.blockSignals(False)
+
+    def _proxy_setting_changed(self):
+        """Saves the current proxy UI state to QSettings."""
+        enabled = self.proxy_enabled_checkbox.isChecked()
+        proxy_type = self.proxy_type_combo.currentText() # <--- NEW
+        host = self.proxy_host_input.text().strip()
+        port = self.proxy_port_input.text().strip()
+        user = self.proxy_user_input.text().strip()
+        password = self.proxy_pass_input.text().strip()
+
+        self.parent_app.settings.setValue(PROXY_ENABLED_KEY, enabled)
+        self.parent_app.settings.setValue("proxy_type", proxy_type) # <--- NEW
+        self.parent_app.settings.setValue(PROXY_HOST_KEY, host)
+        self.parent_app.settings.setValue(PROXY_PORT_KEY, port)
+        self.parent_app.settings.setValue(PROXY_USERNAME_KEY, user)
+        self.parent_app.settings.setValue(PROXY_PASSWORD_KEY, password)
+        
+        self.parent_app.settings.sync()
+
+        self._update_proxy_fields_state(enabled)
+        
+        # Optional: Notify main app that network settings changed if needed
+        # self.parent_app.reload_proxy_settings() 
+
+    def _update_proxy_fields_state(self, enabled):
+        """Enables or disables input fields based on the checkbox."""
+        self.proxy_type_combo.setEnabled(enabled)
+        self.proxy_host_input.setEnabled(enabled)
+        self.proxy_port_input.setEnabled(enabled)
+        self.proxy_user_input.setEnabled(enabled)
+        self.proxy_pass_input.setEnabled(enabled)
+    # --- END: New Proxy Logic ---
+
     def _check_for_updates(self):
         self.check_update_button.setEnabled(False)
         self.update_status_label.setText(self._tr("update_status_checking", "Checking..."))
@@ -331,7 +529,38 @@ class FutureSettingsDialog(QDialog):
     def _apply_theme(self):
         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))
+            base_stylesheet = get_dark_theme(scale)
+            
+            # --- START: Tab Styling Fix ---
+            tab_stylesheet = """
+                QTabWidget::pane {
+                    border-top: 1px solid #444;
+                    margin-top: -1px; /* Overlap with tab bar */
+                    background-color: #2D2D2D;
+                }
+                QTabBar::tab {
+                    background-color: #3D3D3D;
+                    color: #BBBBBB;
+                    border: 1px solid #444;
+                    border-bottom: none; /* No bottom border for tabs */
+                    padding: 6px 12px;
+                    margin-right: 2px;
+                    border-top-left-radius: 4px;
+                    border-top-right-radius: 4px;
+                }
+                QTabBar::tab:selected {
+                    background-color: #2D2D2D; /* Same as pane background */
+                    color: #EEEEEE;
+                    border-bottom: 1px solid #2D2D2D; /* Hides the pane top border */
+                    margin-bottom: -1px; /* Pulls tab down to cover pane border */
+                }
+                QTabBar::tab:!selected:hover {
+                    background-color: #4A4A4A;
+                }
+            """
+            # --- END: Tab Styling Fix ---
+            
+            self.setStyleSheet(base_stylesheet + tab_stylesheet)
         else:
             self.setStyleSheet("")
 
@@ -490,4 +719,98 @@ class FutureSettingsDialog(QDialog):
         if path_saved or cookie_saved or token_saved:
             QMessageBox.information(self, "Settings Saved", "Settings have been saved successfully.")
         else:
-            QMessageBox.warning(self, "Nothing to Save", "No valid settings were found to save.")
+            QMessageBox.warning(self, "Nothing to Save", "No valid settings were found to save.")
+
+    # --- START: New functions for Save/Load ---
+    def _get_settings_dir(self):
+        """Helper to get a consistent directory for saving/loading profiles."""
+        if hasattr(self.parent_app, 'user_data_path'):
+            # We use 'user_data_path' which should point to 'appdata'
+            settings_dir = os.path.join(self.parent_app.user_data_path, "settings_profiles")
+            os.makedirs(settings_dir, exist_ok=True)
+            return settings_dir
+        # Fallback if user_data_path isn't available
+        return QStandardPaths.writableLocation(QStandardPaths.DocumentsLocation)
+
+    def _handle_save_settings(self):
+        """
+        Calls the main app to get all settings, then saves them to a user-chosen JSON file.
+        """
+        if not hasattr(self.parent_app, '_get_current_ui_settings_as_dict'):
+            QMessageBox.critical(self, self._tr("generic_error_title", "Error"),
+                                 self._tr("settings_missing_save_func_error", "Parent application is missing the required save function."))
+            return
+
+        settings_dir = self._get_settings_dir()
+        filepath, _ = QFileDialog.getSaveFileName(
+            self,
+            self._tr("save_settings_dialog_title", "Save Settings Profile"),
+            settings_dir,
+            self._tr("json_files_filter", "JSON Files (*.json)")
+        )
+        
+        if filepath:
+            if not filepath.endswith('.json'):
+                filepath += '.json'
+            
+            try:
+                # Get all settings from the main window
+                settings_data = self.parent_app._get_current_ui_settings_as_dict()
+                
+                with open(filepath, 'w', encoding='utf-8') as f:
+                    json.dump(settings_data, f, indent=2)
+                
+                QMessageBox.information(self, 
+                    self._tr("save_settings_success_title", "Settings Saved"),
+                    self._tr("save_settings_success_msg", "Settings successfully saved to:\n{filename}")
+                    .format(filename=os.path.basename(filepath)))
+            except Exception as e:
+                QMessageBox.critical(self,
+                    self._tr("save_settings_error_title", "Error Saving Settings"),
+                    str(e))
+
+    def _handle_load_settings(self):
+        """
+        Lets the user pick a JSON file, loads it, and applies the settings to the main app.
+        """
+        if not hasattr(self.parent_app, '_load_ui_from_settings_dict') or \
+           not hasattr(self.parent_app, '_update_all_ui_states'):
+            QMessageBox.critical(self, self._tr("generic_error_title", "Error"),
+                                 self._tr("settings_missing_load_func_error", "Parent application is missing the required load functions."))
+            return
+
+        settings_dir = self._get_settings_dir()
+        filepath, _ = QFileDialog.getOpenFileName(
+            self,
+            self._tr("load_settings_dialog_title", "Load Settings Profile"),
+            settings_dir,
+            self._tr("json_files_filter", "JSON Files (*.json)")
+        )
+        
+        if filepath:
+            try:
+                with open(filepath, 'r', encoding='utf-8') as f:
+                    settings_data = json.load(f)
+                
+                if not isinstance(settings_data, dict):
+                    raise ValueError(self._tr("settings_invalid_json_error", "File is not a valid settings dictionary."))
+                
+                # Apply all settings to the main window
+                self.parent_app._load_ui_from_settings_dict(settings_data)
+                
+                # Refresh the main window UI to show changes
+                self.parent_app._update_all_ui_states()
+                
+                QMessageBox.information(self,
+                    self._tr("load_settings_success_title", "Settings Loaded"),
+                    self._tr("load_settings_success_msg", "Successfully loaded settings from:\n{filename}")
+                    .format(filename=os.path.basename(filepath)))
+                
+                # Close the settings dialog after loading
+                self.accept()
+                
+            except Exception as e:
+                QMessageBox.critical(self,
+                    self._tr("load_settings_error_title", "Error Loading Settings"),
+                    str(e))
+    # --- END: New functions for Save/Load ---

src/ui/dialogs/HelpGuideDialog.py

@@ -6,7 +6,6 @@ from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
     QStackedWidget, QListWidget, QFrame, QWidget, QScrollArea
 )
-from ...i18n.translator import get_translation
 from ..main_window import get_app_icon_object
 from ...utils.resolution import get_dark_theme
 
@@ -26,7 +25,8 @@ class TourStepWidget(QWidget):
 
         title_label = QLabel(title_text)
         title_label.setAlignment(Qt.AlignCenter)
-        title_label.setStyleSheet(f"font-size: {title_font_size}pt; font-weight: bold; color: #E0E0E0; padding-bottom: 15px;")
+        # Use a consistent color for titles regardless of theme
+        title_label.setStyleSheet(f"font-size: {title_font_size}pt; font-weight: bold; color: #87CEEB; padding-bottom: 15px;")
         layout.addWidget(title_label)
         
         scroll_area = QScrollArea()
@@ -41,17 +41,505 @@ class TourStepWidget(QWidget):
         content_label.setAlignment(Qt.AlignLeft | Qt.AlignTop)
         content_label.setTextFormat(Qt.RichText)
         content_label.setOpenExternalLinks(True)
-        content_label.setStyleSheet(f"font-size: {content_font_size}pt; color: #C8C8C8; line-height: 1.8;")
+        # Set a base line-height and color
+        content_label.setStyleSheet(f"font-size: {content_font_size}pt; color: #C8C8C8; line-height: 1.5;")
         scroll_area.setWidget(content_label)
         layout.addWidget(scroll_area, 1)
 
 
 class HelpGuideDialog(QDialog):
     """A multi-page dialog for displaying the feature guide with a navigation list."""
+    
     def __init__(self, steps_data, parent_app, parent=None):
-        super().__init__(parent)
-        self.steps_data = steps_data
-        self.parent_app = parent_app
+        super().__init__(parent_app) 
+        
+        self.parent_app = parent_app # This is the main_window instance
+        
+
+        self.steps_data = [
+            ("Welcome!",
+             """
+             <p style='font-size: 12pt;'>Welcome to the Kemono Downloader! This guide will walk you through the key features to get you started.</p>
+             
+             <h3 style='color: #E0E0E0;'>Wide Range of Support</h3>
+             <p>This application provides full, direct download support for several popular sites, including:</p>
+             <ul>
+                 <li>Kemono</li>
+                 <li>Coomer</li>
+                 <li>Bunkr</li>
+                 <li>Erome</li>
+                 <li>Saint2.su</li>
+                 <li>nhentai.net/</li>
+                 <li>fap-nation.org/</li>
+                 <li>Discord</li>
+                 <li>allporncomic.com</li>
+                 <li>hentai2read.com</li>
+                 <li>mangadex.org</li>
+                 <li>Simpcity</li>
+                 <li>gelbooru.com</li>
+                 <li>Toonily.com</li>                 
+             </ul>
+             
+             <h3 style='color: #E0E0E0;'>Powerful Batch Mode</h3>
+             <p>Save time by downloading hundreds of URLs at once. Simply type <b>nhentai.net</b> or <b>saint2.su</b> into the URL bar. The app will look for a <b>nhentai.txt</b> or <b>saint2.su.txt</b> file in your 'appdata' folder and process all the URLs inside it.</p>
+             
+             <h3 style='color: #E0E0E0;'>Advanced Discord Support</h3>
+             <p>Go beyond simple file downloading. The app can connect directly to the Discord API to:</p>
+             <ul>
+                 <li>Download all files from a specific channel.</li>
+                 <li>Save an entire channel's message history as a fully formatted PDF.</li>
+             </ul>
+             """),
+            
+            ("Advanced Filtering",
+             """
+             <p>Control exactly what content you download, from broad categories to specific keywords.</p>
+             
+             <h3 style='color: #E0E0E0;'>Content Type Filters</h3>
+             <p>These radio buttons let you select the main <i>type</i> of content you want:</p>
+             <ul>
+                 <li><b>All:</b> Downloads everything (default).</li>
+                 <li><b>Images/GIFs:</b> Only downloads static images and GIFs.</li>
+                 <li><b>Videos:</b> Only downloads video files (MP4, WEBM, MOV, etc.).</li>
+                 <li><b>Only Archives:</b> Exclusively downloads .zip and .rar files.</li>
+                 <li><b>Only Links:</b> Extracts external links (Mega, Google Drive) from post descriptions instead of downloading.</li>
+                 <li><b>Only Audio:</b> Only downloads audio files (MP3, WAV, etc.).</li>
+                 <li><b>More:</b> Opens a dialog to download post descriptions or comments as text/PDF.</li>
+             </ul>
+             
+             <h3 style='color: #E0E0E0;'>Character Filtering</h3>
+             <p>The <b>"Filter by Character(s)"</b> input is your most powerful tool for targeting content.</p>
+             <ul>
+                 <li><b>Basic Use:</b> Enter names, separated by commas (e.g., <code>Tifa, Aerith</code>). This will create folders for "Tifa" and "Aerith" and download posts matching those names.</li>
+                 <li><b>Grouped Aliases:</b> Use parentheses to group aliases for a single character (e.g., <code>(Tifa, Lockhart)</code>). This still creates a "Tifa" folder, but it will also match posts that just say "Lockhart".</li>
+             </ul>
+             <p>The <b>"Filter: [Scope]"</b> button changes <i>what</i> is scanned:</p>
+             <ul>
+                 <li><b>Filter: Title (Default):</b> Scans only the post's main title.</li>
+                 <li><b>Filter: Files:</b> Scans the <i>filenames</i> within the post.</li>
+                 <li><b>Filter: Both:</b> Scans both the title and the filenames.</li>
+                 <li><b>Filter: Comments (Beta):</b> Scans the post's comment section for the keywords.</li>
+             </ul>
+             
+             <h3 style='color: #E0E0E0;'>Skip Filters (Avoid Content)</h3>
+             <p>The <b>"Skip with Words"</b> input lets you avoid content you don't want.</p>
+             <p>The <b>"Scope: [Scope]"</b> button changes <i>how</i> it skips:</p>
+             <ul>
+                 <li><b>Scope: Posts (Default):</b> Skips the <i>entire post</i> if the post's title contains a skip word (e.g., <code>WIP, sketch</code>).</li>
+                 <li><b>Scope: Files:</b> Scans and skips <i>individual files</i> if their filename contains a skip word.</li>
+                 <li><b>Scope: Both:</b> Skips the post if the title matches, and if not, still checks individual files.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Other Content Options</h3>
+             <ul>
+                 <li><b>Skip .zip:</b> A quick toggle to ignore all archive files.</li>
+                 <li><b>Download Thumbnails Only:</b> Downloads the small preview image instead of the full-resolution file.</li>
+                 <li><b>Scan Content for Images:</b> Scans the post's text description for <code>&lt;img&gt;</code> tags. Useful for embedded images not in the post's attachment list.</li>
+                 <li><b>Keep Duplicates:</b> By default, the app skips files with identical content (hash). Check this to open a dialog and configure it to keep duplicate files.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Filename Control</h3>
+             <p>The <b>"Remove Words from name"</b> input cleans up filenames. Any text you enter here (comma-separated) will be removed from the final saved filename (e.g., <code>patreon, exclusive</code>).</p>
+             """),
+            
+            ("Folder Management (Known.txt)",
+             """
+             <p>This feature, enabled by the <b>"Separate Folders by Known.txt"</b> checkbox, automatically sorts your downloads. It's designed mainly for <b>Kemono</b>, where creators often tag posts with character names in the title.</p>
+             
+             <p>When you download from a creator, this feature checks each <b>post title</b> against your `Known.txt` list. If a name matches, a folder is created for that name, and all posts from that creator mentioning the name will be <b>grouped together</b> in that single folder.</p>
+
+             <h3 style='color: #E0E0E0;'>Folder Naming Priority</h3>
+             <p>When "Separate Folders" is checked, the app uses this priority to name folders:</p>
+             <ol>
+                 <li><b>Character Filter:</b> If you use the <b>"Filter by Character(s)"</b> input (e.g., <code>Tifa</code>), that name is <b>always</b> used as the folder name. This overrides all other rules.</li>
+                 <li><b>Known.txt (Post Title):</b> If no filter is used, it checks the <b>post's title</b> for a name in `Known.txt`. (This is the most common use case).</li>
+                 <li><b>Known.txt (Filename):</b> If the title doesn't match, it checks all <b>filenames</b> in the post for a match in `Known.txt`.</li>
+                 <li><b>Fallback:</b> If no match is found, it creates a generic folder from the post's title.</li>
+             </ol>
+             
+             <h3 style='color: #E0E0E0;'>Editing Your Known.txt File</h3>
+             <p>You can manage this list using the panel on the right of the main window or by clicking <b>"Open Known.txt"</b> to edit it directly. There are two formats:</p>
+             <ul>
+                 <li><b>Simple Name:</b><br>
+                     <code>Tifa</code><br>
+                     This creates a folder named "Tifa" and matches posts/files named "Tifa".
+                 </li>
+                 <br>
+                 <li><b>Grouped Aliases:</b><br>
+                     <code>(Tifa, Lockhart)</code><br>
+                     This is the most powerful format. It creates a folder named <b>"Tifa Lockhart"</b> and will match posts/files that contain either "Tifa" <i>or</i> "Lockhart". This is perfect for characters with multiple names.
+                 </li>
+             </ul>
+             
+             <h3 style='color: #E0E0E0;'>Important Note:</h3>
+             <p>This automatic sorting <b>only works if the creator includes the character names or keywords in the post title</b> (or filename). If they don't, the app has no way of knowing how to sort the post, and it will fall back to a generic folder name.</p>
+             """),
+            
+            ("Renaming Mode",
+             """
+             <p>This mode is designed for downloading comics, manga, or any multi-file post where you need files to be in a specific, sequential order. When active, it downloads posts from <b>oldest to newest</b>.</p>
+             
+             <p>Activate it by checking the <b>"Renaming Mode"</b> checkbox. This reveals a new button: <b>"Name: [Style]"</b>. Clicking this button cycles through all available naming conventions.</p>
+             
+             <h3 style='color: #E0E0E0;'>Available Naming Styles</h3>
+             <ul>
+                 <li><b>Post Title:</b> (Default) Files are named after the post's title, with a number for multi-file posts (e.g., <code>My Comic Page_1.jpg</code>, <code>My Comic Page_2.jpg</code>).</li>
+                 
+                 <li><b>Date + Original:</b> Prepends the post's date to the original filename (e.g., <code>2025-11-16_original_file_name.jpg</code>).</li>
+                 
+                 <li><b>Date + Title:</b> Prepends the date to the post title (e.g., <code>2025-11-16_My Comic Page_1.jpg</code>).</li>
+
+                 <li><b>Post ID:</b> Names files using the post's unique ID and the file index (e.g., <code>9876543_0.jpg</code>, <code>9876543_1.jpg</code>).</li>
+
+                 <li><b>Date Based:</b> Renames all files to a simple, sequential number (e.g., <code>001.jpg</code>, <code>002.jpg</code>). You can add a prefix in the text box that appears (e.g., "Chapter 1 " to get <code>Chapter 1 001.jpg</code>).
+                 <br><b style='color: #f0ad4e;'>Note: This mode disables multithreading to guarantee correct file order.</b></li>
+
+                 <li><b>Title + G.Num (Global Numbering):</b> Names files by title, but with a *global* counter (e.g., <code>Post A_001.jpg</code>, <code>Post B_002.jpg</code>).
+                 <br><b style='color: #f0ad4e;'>Note: This mode also disables multithreading.</b></li>
+                 
+                 <li><b>Custom:</b> Lets you design your own filename using a format string. A <b>"..."</b> button will appear to open the custom format dialog.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Custom Format Placeholders</h3>
+             <p>When using the "Custom" style, you can use these placeholders (click the buttons in the dialog to add them):</p>
+             <ul>
+                <li><code>{id}</code> - The unique ID of the post.</li>
+                <li><code>{creator_name}</code> - The creator's name.</li>
+                <li><code>{service}</code> - The service (e.g., Patreon, Pixiv Fanbox, etc).</li>
+                <li><code>{title}</code> - The title of the post.</li>
+                <li><code>{added}</code> - Date the post was added.</li>
+                <li><code>{published}</code> - Date the post was published.</li>
+                <li><code>{edited}</code> - Date the post was last edited.</li>
+                <li><code>{name}</code> - The original name of the file.</li>
+             </ul>
+             <p>You can also set a custom <b>Date Format</b> (e.g., <code>YYYY-MM-DD</code>) that will apply to the {added}, {published}, and {edited} placeholders.</p>
+             """),
+
+            ("Batch Downloading",
+             """
+             <p>This feature allows you to download hundreds of URLs from a text file, which is much faster than queuing them one by one.</p>
+             
+             <h3 style='color: #E0E0E0;'>How It Works (Step-by-Step)</h3>
+             <ol>
+                 <li><b>Find your 'appdata' folder:</b> This is in the same directory as the downloader's <code>.exe</code> file.</li>
+                 <li><b>Create a .txt file:</b> Inside the 'appdata' folder, create a text file for the site you want to batch from. The name must be exact. (eg.. nhentai.txt, hentai2read.txt, etc.. )</li>
+                 <li><b>Add URLs:</b> Open the <code>.txt</code> file and paste one download URL on each line. Save the file.</li>
+                 <li><b>Start the Batch:</b> In the downloader's main URL bar, type the <b>site's domain name</b> (e.g., <code>nhentai.net</code>) and click "Start Download".</li>
+             </ol>
+             <p>The app will automatically find your text file, read all the URLs, and download them sequentially.</p>
+
+             <h3 style='color: #E0E0E0;'>Supported Sites and Filenames</h3>
+             <p>The <code>.txt</code> file name must match the site you are triggering:</p>
+             <ul>
+                 <li><b>To trigger, type:</b> <code>allporncomic.com</code><br>
+                     <b>Text file name:</b> <code>allporncomic.txt</code></li>
+                 
+                 <li><b>To trigger, type:</b> <code>nhentai.net</code><br>
+                     <b>Text file name:</b> <code>nhentai.txt</code></li>
+                 
+                 <li><b>To trigger, type:</b> <code>fap-nation.com</code> or <code>fap-nation.org</code><br>
+                     <b>Text file name:</b> <code>fap-nation.txt</code></li>
+                 
+                 <li><b>To trigger, type:</b> <code>saint2.su</code><br>
+                     <b>Text file name:</b> <code>saint2.su.txt</code></li>
+                 
+                 <li><b>To trigger, type:</b> <code>hentai2read.com</code><br>
+                     <b>Text file name:</b> <code>hentai2read.txt</code></li>
+                 
+                 <li><b>To trigger, type:</b> <code>rule34video.com</code><br>
+                     <b>Text file name:</b> <code>rule34video.txt</code></li>
+             </ul>
+             """),
+
+            ("Special Modes: Text & Links",
+             """
+             <p>These two modes completely change the downloader's function from downloading files to extracting information.</p>
+             
+             <h3 style='color: #E0E0E0;'>🔗 Only Links Mode</h3>
+             <p>When you select this, the app <b>stops downloading files</b>. Instead, it scans the post's description for any external URLs (like Mega, Google Drive, Dropbox, etc.) and lists them in the main log.</p>
+             <p>This mode also reveals a new set of tools above the log:</p>
+             <ul>
+                 <li><b>Search Bar:</b> Lets you filter the extracted links by keyword (e.g., "mega", "part 1").</li>
+                 <li><b>Export Links Button:</b> Opens a dialog to save all the found links to a <code>.txt</code> file.</li>
+                 <li><b>Download Button:</b> Opens a new dialog that lets you selectively download from the supported links (Mega, Google Drive, Dropbox) that were found.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>📄 More (Text Export Mode)</h3>
+             <p>This mode downloads the <b>text content</b> from posts instead of the files. When you select it, a dialog appears asking for more details:</p>
+             <ul>
+                 <li><b>Scope:</b>
+                     <ul>
+                         <li><b>Description/Content:</b> Saves the text from the post's main body.</li>
+                         <li><b>Comments:</b> Fetches and saves all the comments from the post.</li>
+                     </ul>
+                 </li>
+                 <li><b>Export as:</b> You can choose to save the text as a <b>PDF</b>, <b>DOCX</b>, or <b>TXT</b> file.</li>
+                 <li><b>Single PDF:</b> (Only available for PDF format) This powerful option stops the app from saving individual PDF files. Instead, it collects the text from <i>all</i> matching posts, sorts them by date, and compiles them into <b>one single, large PDF file</b> at the end of the download session.</li>
+             </ul>
+             """),
+
+            ("Add to Queue",
+             """
+             <p>This feature allows you to queue up multiple distinct downloads with different settings and run them all sequentially.</p>
+
+             <h3 style='color: #E0E0E0;'>Step 1: Prepare the Download</h3>
+             <p>Before clicking add, configure the download exactly how you want it processed for this specific link:</p>
+             <ul>
+                 <li><b>Select Directory:</b> Choose where you want the files to go.</li>
+                 <li><b>Configure Options:</b> Check/uncheck boxes (e.g., "Separate Folders", "Use Cookie", "Manga Mode").</li>
+                 <li><b>Paste URL:</b> Enter the link for the creator or post you want to download.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Step 2: Add to Queue</h3>
+             <ol>
+                 <li>Click the <b>Add to Queue</b> button (located near the Start Download).</li>
+                 <li><b>Confirmation:</b> You will see a popup message and the log will print <code>✅ Job added to queue</code>.</li>
+                 <li>The URL box will clear, allowing you to immediately paste the next link.</li>
+             </ol>
+
+             <h3 style='color: #E0E0E0;'>Step 3: Repeat & Start</h3>
+             <p>You can repeat steps 1 and 2 as many times as you like. You can even change settings (like the download folder) between adds; the queue remembers the specific settings for each individual link.</p>
+             <p>To start processing the queue:</p>
+             <ol>
+                 <li>In the Link Input box, type exactly: <code>start queue</code></li>
+                 <li>The main "Start Download" button will change to <b>"🚀 Execute Queue"</b>.</li>
+                 <li>Click that button to begin.</li>
+             </ol>
+
+             <h3 style='color: #E0E0E0;'>Processing Behavior</h3>
+             <p>Once started, the app will lock the UI, load the first job, download it until finished, and automatically move to the next until the queue is empty.</p>
+
+             <h3 style='color: #E0E0E0;'>Special Case: Creator Selection Popup</h3>
+             <p>If you use the <b>Creator Selection</b> popup (the 🎨 button):</p>
+             <ul>
+                 <li>Select multiple creators in that popup and click <b>"Queue Selected"</b>.</li>
+                 <li>The app internally adds them to a temporary list.</li>
+                 <li>When you click the main <b>"Add to Queue"</b> button on the main window, it will detect that list and automatically bulk-create job files for all the creators you selected.</li>
+             </ul>
+             """),
+
+            ("Special Commands",
+             """
+             <p>You can add special commands to the <b>"Filter by Character(s)"</b> input field to change download behavior for a single task. Commands are keywords wrapped in square brackets <code>[]</code>.</p>
+             <p><b>Example:</b> <code>Tifa, (Cloud, Zack) [ao] [sfp-10]</code></p>
+             
+             <h3 style='color: #E0E0E0;'>Filter Commands (in "Filter by Character(s)" input)</h3>
+             <ul>
+                 <li><b><code>[ao]</code> (Archive Only Priority)</b><br>
+                 This command prioritizes archives.
+                 <ul>
+                    <li>If a post contains <b>only images/videos</b>, it will download them normally.</li>
+                    <li>If a post contains <b>both archives AND images/videos</b>, this command tells the app to <b>only download the archives</b> and skip the other files for that post.</li>
+                 </ul>
+                 </li>
+                 <br>
+                 <li><b><code>[sfp-N]</code> (Subfolder Per Post Threshold)</b><br>
+                 This is an override for when "Subfolder per Post" is <b>OFF</b> (and "Separate Folders by Known.txt" is <b>ON</b>).<br>
+                 For example, if you set <code>[sfp-10]</code>:
+                 <ul>
+                    <li>Posts with <b>less than 10 files</b> will download normally into the main folder (e.g., <code>/ArtistName/</code>).</li>
+                    <li>When a post with <b>10 or more files</b> is found, this command will <b>force a subfolder to be created for that one post</b> (e.g., <code>/ArtistName/Comic_Title/</code>) to keep its files grouped together.</li>
+                 </ul>
+                 </li>
+                 <br>
+                 <li><b><code>[unknown]</code> (Handle Unknown)</b><br>
+                 Changes how sorting works when "Separate Folders by Known.txt" is on. If a post title doesn't match any name in your <code>Known.txt</code> list, this command will create a folder using the post's title instead of a generic fallback folder.
+                 </li>
+                 <br>
+                 <li><b><code>[.domain]</code> (Domain Override)</b><br>
+                 An advanced command. For example, <code>[.st]</code> forces the app to download from <code>coomer.st</code>, and <code>[.cr]</code> forces it to download from <code>kemono.cr</code>. This can be useful if one domain is blocked or slow.
+                 </li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Skip Command (in "Skip with Words" input)</h3>
+             <p>This command is different and goes into the <b>"Skip with Words"</b> input field, along with any other skip words.</p>
+             <ul>
+                 <li><b><code>[N]</code> (Skip File by Size)</b><br>
+                 This command skips any file that is <b>smaller</b> than <code>N</code> megabytes (MB).<br>
+                 <b>Example:</b> Entering <code>WIP, sketch, [200]</code> into the "Skip with Words" input will skip files with "WIP" or "sketch" in their name, AND it will also skip any file smaller than 200MB.
+                 </li>
+             </ul>
+             """),
+
+            ("Cloud Storage & Direct Links",
+             """
+             <p>The downloader has built-in support for popular cloud storage and direct-link sites. You can use this in two main ways.</p>
+             
+             <h3 style='color: #E0E0E0;'>Method 1: Direct URL Download</h3>
+             <p>You can paste a direct link from these services into the main URL bar and hit "Start Download" just like a Kemono link.</p>
+             <ul>
+                 <li><b>Pixeldrain:</b> Supports single files (<code>/u/...</code>), albums (<code>/l/...</code>), and folders (<code>/d/...</code>).</li>
+                 <li><b>Mega.nz:</b> Supports both single file links (<code>/file/...</code>) and folder links (<code>/folder/...</code>).</li>
+                 <li><b>Gofile.io:</b> Supports folder links (<code>/d/...</code>).</li>
+                 <li><b>Google Drive:</b> Supports shared folder links.</li>
+                 <li><b>Dropbox:</b> Supports shared <code>.zip</code> file links. It will automatically download, extract, and delete the <code>.zip</code> file.</li>
+             </ul>
+             
+             <h3 style='color: #E0E0E0;'>Method 2: "Only Links" Mode Downloader</h3>
+             <p>This is a two-step process for handling posts that have many cloud links in their description.</p>
+             <ol>
+                 <li><b>Step 1: Extract Links</b><br>
+                 Select the <b>"🔗 Only Links"</b> radio button and run a download on a creator or post page. The app will scan all posts and list the external links (Mega, GDrive, etc.) it finds in the log.
+                 </li>
+                 <br>
+                 <li><b>Step 2: Download Links</b><br>
+                 After extraction, a <b>"Download"</b> button (next to "Export Links") will become active. This opens a new window where you can selectively download from the supported links (Mega, Google Drive, Dropbox) that were found.
+                 </li>
+             </ol>
+
+             <h3 style='color: #E0E0E0;'>Note: SimpCity Integration</h3>
+             <p>SimpCity support relies heavily on this feature. When you download from a SimpCity thread, the app <b>automatically</b> scans the page for links to services like <b>Pixeldrain, Bunkr, Saint2, Mega, and Gofile</b> and then downloads them just as if you had put in those links directly. You can control which of these services are downloaded from the checkboxes in the "SimpCity Settings" section of the main window.</p>
+             """), 
+
+            ("Creator Selection & Updates",
+             """
+             <p>Clicking the <b>🎨 button</b> (next to the URL bar) opens the <b>Creator Selection</b> dialog. This is your control for managing creators you've already downloaded from.</p>
+
+             <h3 style='color: #E0E0E0;'>Main List & Searching</h3>
+             <p>The main list shows all creators from your <code>creators.json</code> file. You can:</p>
+             <ul>
+                 <li><b>Search:</b> The top search bar filters your creators by name, service, or even a direct URL.</li>
+                 <li><b>Select:</b> Check the boxes next to creators to select them for an action.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Action Buttons</h3>
+             
+             <p><b>Check for Updates</b></p>
+             <p>This button opens a new window, "Check for Updates," which lists all your <b>Creator Profiles</b> (the <code>.json</code> files saved in your <code>appdata/creator_profiles</code> folder). These profiles are created automatically when you download a full creator page.</p>
+             <p>From this dialog, you can check multiple creators at once. The app will scan all of them and then show a final "Start Download" button on the main window to download <i>only</i> the new posts, using the same settings you used for each creator last time.</p>
+             
+             <p><b>Add Selected</b></p>
+             <p>This is the simplest action. It takes all the creators you've checked, puts their names in the main URL bar, and closes the dialog. This is a quick way to add multiple creators to the download queue for a download.</p>
+             
+             <p><b>Fetch Posts</b></p>
+             <p>This is a powerful tool for finding specific posts. When you click it:</p>
+             <ol>
+                <li>The dialog expands, and a new panel appears on the right.</li>
+                <li>The app fetches <i>every single post</i> from all the creators you selected. This may take time.</li>
+                <li>The right panel fills with a list of all posts, grouped by creator.</li>
+                <li>You can now search this list and check the boxes next to the <i>individual posts</i> you want.</li>
+                <li>Clicking <b>"Add Selected Posts to Queue"</b> adds only those specific posts to the download queue.</li>
+             </ol>
+             """),
+
+            ("⭐ Favorite Mode",
+             """
+             <p>This mode is a powerful feature for downloading directly from your personal <b>Kemono</b> and <b>Coomer</b> favorites lists. It requires you to be logged in on your browser and to provide your cookies to the app.</p>
+             
+             <p><b style='color: #f0ad4e;'>Important:</b> You <b>must</b> check the <b>"Use Cookie"</b> box and provide a valid cookie for this mode to work. If cookies are missing or invalid, the app will show you a help dialog.</p>
+
+             <h3 style='color: #E0E0E0;'>How to Use Favorite Mode</h3>
+             <ol>
+                 <li>Check the <b>"⭐ Favorite Mode"</b> checkbox on the main window. This will lock the URL bar and show two new buttons.</li>
+                 <li>Click either <b>"🖼️ Favorite Artists"</b> or <b>"📄 Favorite Posts"</b>.</li>
+                 <li>A new dialog will open and begin fetching all your favorites from both Kemono and Coomer at the same time.</li>
+                 <li>Once loaded, you can search, filter, and select the artists or posts you want to download.</li>
+                 <li>Click "Download Selected" to add them to the main download queue and begin processing.</li>
+             </ol>
+             
+             <h3 style='color: #E0E0E0;'>Favorite Artists</h3>
+             <p>The <b>"Favorite Artists"</b> dialog will load your list of followed creators. When you download from here, the app treats it as a full creator download, just as if you had pasted in that artist's URL.</p>
+             
+             <h3 style='color: #E0E0E0;'>Favorite Posts</h3>
+             <p>The <b>"Favorite Posts"</b> dialog loads a list of every individual post you have favorited. This dialog has some extra features:</p>
+             <ul>
+                 <li><b>Creator Name Resolution:</b> It attempts to match the post's creator ID with the names in your <code>creators.json</code> file to show you a recognizable name.</li>
+                 <li><b>Known.txt Matching:</b> It highlights posts by showing <code>[Known - Tifa]</code> in the title if the post title matches an entry in your <code>Known.txt</code> list, helping you find specific content.</li>
+                 <li><b>Grouping:</b> Posts are automatically grouped by creator to keep the list organized.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Download Scope (Artist Folders)</h3>
+             <p>In Favorite Mode, the <b>"Scope: [Location]"</b> button becomes very important. It controls <i>where</i> your favorited items are saved:</p>
+             <ul>
+                 <li><b>Scope: Selected Location (Default):</b> Downloads all selected items directly into the main "Download Location" folder you have set.</li>
+                 <li><b>Scope: Artist Folders:</b> This automatically creates a new subfolder for each artist inside your main "Download Location" (e.g., <code>/Downloads/ArtistName/</code>). This is the best way to keep your favorites organized.</li>
+             </ul>
+             """),
+
+            ("File & Download Options",
+             """
+             <p>These checkboxes give you fine-grained control over which files are downloaded and how they are processed.</p>
+             
+             <h3 style='color: #E0E0E0;'>File Type & Content</h3>
+             <ul>
+                 <li><b>Skip .zip:</b> A simple toggle. When checked, the downloader will skip all <code>.zip</code> and <code>.rar</code> archive files it finds.</li>
+                 <br>
+                 <li><b>Scan Content for Images:</b> This is a powerful feature for posts where images are embedded in the description (<code>&lt;img&gt;</code> tags) but not listed as attachments. When checked, the app will scan the post's HTML content and try to find and download these embedded images.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Image Processing</h3>
+             <ul>
+                 <li><b>Download Thumbnails Only:</b> Saves bandwidth and time by downloading the small preview/thumbnail version of an image instead of the full-resolution file.</li>
+                 <br>
+                 <li><b>Compress to WebP:</b> If an image is over 1.5MB, this option will automatically convert it to the <code>.webp</code> format during the download, which significantly reduces file size while maintaining high quality.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Duplicate Handling</h3>
+             <ul>
+                 <li><b>Keep Duplicates:</b> By default, the app checks the <i>content</i> (hash) of a file and will not re-download a file it already has. Checking this box opens a dialog with more options:
+                    <ul>
+                        <li><b>Hash (Default):</b> The standard behavior.</li>
+                        <li><b>Keep Everything:</b> Disables all duplicate checks and downloads every file from the API, even if you already have it.</li>
+                        <li><b>Limit:</b> Lets you set a limit (e.g., 2) to how many times a file with the same content can be downloaded.</li>
+                    </ul>
+                 </li>
+             </ul>
+             """),
+
+            ("Utility & Advanced Options",
+             """
+             <p>These features provide advanced control over your downloads, sessions, and application settings.</p>
+
+             <h3 style='color: #E0E0E0;'>🛡️ Proxy Support </h3>
+             <p>You can now configure a proxy to bypass region blocks or ISP restrictions (e.g., for AllComic or Nhentai).</p>
+             <p>Go to <b>Settings ⚙️ > Proxy Tab</b> to set it up:</p>
+             <ul>
+                 <li><b>Protocols:</b> Full support for <b>HTTP</b>, <b>SOCKS4</b>, and <b>SOCKS5</b>.</li>
+                 <li><b>Authentication:</b> Supports username and password for private proxies.</li>
+                 <li><b>Global Effect:</b> Once enabled, all app connections (including API fetches and file downloads) will route through this proxy.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Use Cookie</h3>
+             <p>This is essential for downloading from sites that require a login (like <b>SimpCity</b> or accessing your <b>favorites</b> on Kemono/Coomer). You can either:</p>
+             <ul>
+                 <li><b>Paste a cookie string:</b> Copy the "cookie" value from your browser's developer tools and paste it into the text field.</li>
+                 <li><b>Use a file:</b> Click the "Browse" button to select a <code>cookies.txt</code> file exported from your browser.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Page Range</h3>
+             <p>When downloading from a creator's main page (not a single post), these "Start" and "End" fields let you limit the download. For example, entering <code>Start: 1</code> and <code>End: 5</code> will only download posts from the first five pages.</p>
+             
+             <h3 style='color: #E0E0E0;'>Multi-part Download</h3>
+             <p>Clicking the <b>"Multi-part: OFF"</b> button opens a dialog to enable high-speed downloads for large files. It will split a large file into multiple parts and download them at the same time. You can choose to apply this to videos, archives, or both, and set the minimum file size to trigger it.</p>
+             
+             <h3 style='color: #E0E0E0;'>Download History</h3>
+             <p>The <b>"History"</b> button opens a dialog showing two lists:</p>
+             <ul>
+                 <li><b>Last 3 Files:</b> The last 3 individual files you successfully downloaded.</li>
+                 <li><b>First 3 Posts:</b> The first 3 posts Processed from your *most recent* download session.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Settings (Gear Icon)</h3>
+             <p>The <b>Gear</b> icon ⚙️ opens the main application settings, which is now organized into tabs:</p>
+             <ul>
+                 <li><b>Display Tab:</b> Change the app's <b>Theme</b> (Light/Dark), <b>Language</b>, <b>UI Scale</b>, and default <b>Window Size</b>.</li>
+                 <li><b>Downloads Tab:</b>
+                     <ul>
+                         <li>Save your current <b>Download Path</b>, <b>Cookie</b>, and <b>Discord Token</b> for future sessions using the "Save Path + Cookie + Token" button.</li>
+                         <li>Set an <b>Action After Download</b> (e.g., Notify, Sleep, Shutdown).</li>
+                         <li>Customize the <b>Post Subfolder Format</b> for when the date prefix is used (e.g., <code>YYYY-MM-DD {post}</code>).</li>
+                         <li>Toggle <b>"Save Creator.json file"</b> (which enables the "Check for Updates" feature).</li>
+                         <li>Toggle <b>"Fetch First"</b> (to find all posts from a creator before starting any downloads).</li>
+                     </ul>
+                 </li>
+                 <li><b>Proxy Tab:</b> Configure HTTP/SOCKS proxies and authentication.</li>
+                 <li><b>Updates Tab:</b> Check for and install new application updates.</li>
+             </ul>
+
+             <h3 style='color: #E0E0E0;'>Reset Button</h3> 
+             <p>The <b>"Reset"</b> button (bottom right) is a soft reset. It clears all input fields (except your Download Location), clears the logs, and resets all download options and filters back to their default state. It does <b>not</b> clear your Download History or saved Settings.</p>
+             """)        
+             ]
 
         scale = self.parent_app.scale_factor if hasattr(self.parent_app, 'scale_factor') else 1.0
 
@@ -66,7 +554,38 @@ class HelpGuideDialog(QDialog):
         
         current_theme_style = ""
         if hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark":
-            current_theme_style = get_dark_theme(scale)
+            base_style = get_dark_theme(scale)
+
+            list_widget_style = f"""
+                QListWidget {{
+                    background-color: #2E2E2E;
+                    border: 1px solid #4A4A4A;
+                    border-radius: 4px;
+                    font-size: {int(11 * scale)}pt;
+                    color: #DCDCDC;
+                }}
+                QListWidget::item {{
+                    padding: 10px;
+                    border-bottom: 1px solid #4A4A4A;
+                }}
+                QListWidget::item:selected {{
+                    background-color: #87CEEB;
+                    color: #1E1E1E;
+                    font-weight: bold;
+                }}
+                QListWidget::item:hover:!selected {{
+                    background-color: #3A3A3A;
+                }}
+                
+                /* Style for the TourStepWidget content */
+                TourStepWidget QLabel {{
+                    color: #DCDCDC;
+                }}
+                TourStepWidget QScrollArea {{
+                    background-color: transparent;
+                }}
+            """
+            current_theme_style = base_style + list_widget_style
         else:
             # Basic light theme fallback
             current_theme_style = f"""
@@ -83,29 +602,50 @@ class HelpGuideDialog(QDialog):
                 }}
                 QPushButton:hover {{ background-color: #CACACA; }}
                 QPushButton:pressed {{ background-color: #B0B0B0; }}
+                QListWidget {{
+                    background-color: #FFFFFF;
+                    border: 1px solid #C0C0C0;
+                    border-radius: 4px;
+                    font-size: {int(11 * scale)}pt;
+                    color: #1E1E1E;
+                }}
+                QListWidget::item {{
+                    padding: 10px;
+                    border-bottom: 1px solid #E0E0E0;
+                }}
+                QListWidget::item:selected {{
+                    background-color: #0078D7;
+                    color: #FFFFFF;
+                    font-weight: bold;
+                }}
+                QListWidget::item:hover:!selected {{
+                    background-color: #F0F0F0;
+                }}
+                TourStepWidget QLabel {{
+                    color: #1E1E1E;
+                }}
+                TourStepWidget h3 {{
+                    color: #005A9E;
+                }}
             """
 
         self.setStyleSheet(current_theme_style)
         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:
-            return get_translation(self.parent_app.current_selected_language, key, default_text)
-        return default_text
-
     def _init_ui(self):
         main_layout = QVBoxLayout(self)
         main_layout.setContentsMargins(15, 15, 15, 15)
         main_layout.setSpacing(10)
 
         # Title
-        title_label = QLabel(self._tr("help_guide_dialog_title", "Kemono Downloader - Feature Guide"))
+        title_label = QLabel("Kemono Downloader - Feature Guide")
         scale = getattr(self.parent_app, 'scale_factor', 1.0)
         title_font_size = int(16 * scale)
-        title_label.setStyleSheet(f"font-size: {title_font_size}pt; font-weight: bold; color: #E0E0E0;")
+        # Use a consistent color for the main title
+        title_label.setStyleSheet(f"font-size: {title_font_size}pt; font-weight: bold; color: #87CEEB;")
         title_label.setAlignment(Qt.AlignCenter)
         main_layout.addWidget(title_label)
 
@@ -114,35 +654,16 @@ class HelpGuideDialog(QDialog):
         main_layout.addLayout(content_layout, 1)
 
         self.nav_list = QListWidget()
-        self.nav_list.setFixedWidth(int(220 * scale))
-        self.nav_list.setStyleSheet(f"""
-            QListWidget {{
-                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;
-            }}
-        """)
+        # Increased width to prevent scrollbar overlap
+        self.nav_list.setFixedWidth(int(280 * scale))
+        # Styles are now set in the __init__ method
         content_layout.addWidget(self.nav_list)
 
         self.stacked_widget = QStackedWidget()
         content_layout.addWidget(self.stacked_widget)
 
-        for title_key, content_key in self.steps_data:
-            title = self._tr(title_key, title_key)
-            content = self._tr(content_key, f"Content for {content_key} not found.")
-            
+        for title, content in self.steps_data:
             self.nav_list.addItem(title)
-            
             step_widget = TourStepWidget(title, content, scale=scale)
             self.stacked_widget.addWidget(step_widget)
 
@@ -171,13 +692,19 @@ class HelpGuideDialog(QDialog):
         icon_dim = int(24 * scale)
         icon_size = QSize(icon_dim, icon_dim)
         
+        tooltip_map = {
+            "help_guide_github_tooltip": "Visit the project on GitHub",
+            "help_guide_instagram_tooltip": "Follow the developer on Instagram",
+            "help_guide_discord_tooltip": "Join the official Discord server"
+        }
+
         for button, tooltip_key, url in [
             (self.github_button, "help_guide_github_tooltip", "https://github.com/Yuvi63771/Kemono-Downloader"),
             (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.setToolTip(tooltip_map.get(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)))
@@ -185,7 +712,7 @@ class HelpGuideDialog(QDialog):
 
         footer_layout.addStretch(1)
 
-        self.finish_button = QPushButton(self._tr("tour_dialog_finish_button", "Finish"))
+        self.finish_button = QPushButton("Finish")
         self.finish_button.clicked.connect(self.accept)
         footer_layout.addWidget(self.finish_button)
 

src/ui/dialogs/MoreOptionsDialog.py

@@ -11,17 +11,16 @@ class MoreOptionsDialog(QDialog):
     SCOPE_CONTENT = "content"
     SCOPE_COMMENTS = "comments"
 
-    def __init__(self, parent=None, current_scope=None, current_format=None, single_pdf_checked=False):
+    def __init__(self, parent=None, current_scope=None, current_format=None, single_pdf_checked=False, add_info_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")
@@ -50,14 +49,20 @@ class MoreOptionsDialog(QDialog):
         export_layout.addStretch()
         layout.addLayout(export_layout)
 
-        # --- UPDATED: Single PDF Checkbox ---
+        # --- 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())
+        # --- NEW: Add Info Checkbox ---
+        self.add_info_checkbox = QCheckBox("Add info in PDF")
+        self.add_info_checkbox.setToolTip("If checked, adds a first page with post details (Title, Date, Link, Creator, Tags, etc.).")
+        self.add_info_checkbox.setChecked(add_info_checked)
+        layout.addWidget(self.add_info_checkbox)
+
+        self.format_combo.currentTextChanged.connect(self.update_checkbox_states)
+        self.update_checkbox_states(self.format_combo.currentText())
 
         self.button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
         self.button_box.accepted.connect(self.accept)
@@ -65,12 +70,18 @@ class MoreOptionsDialog(QDialog):
         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."""
+
+    def update_checkbox_states(self, text):
+        """Enable PDF-specific checkboxes only if the format is PDF."""
         is_pdf = (text.upper() == "PDF")
         self.single_pdf_checkbox.setEnabled(is_pdf)
+        self.add_info_checkbox.setEnabled(is_pdf)
+        
         if not is_pdf:
             self.single_pdf_checkbox.setChecked(False)
+            # We don't uncheck add_info necessarily, just disable it, 
+            # but unchecking is safer visually to imply "won't happen"
+            self.add_info_checkbox.setChecked(False)
 
     def get_selected_scope(self):
         if self.radio_comments.isChecked():
@@ -84,13 +95,14 @@ class MoreOptionsDialog(QDialog):
         """Returns the state of the Single PDF checkbox."""
         return self.single_pdf_checkbox.isChecked() and self.single_pdf_checkbox.isEnabled()
 
+    def get_add_info_state(self):
+        """Returns the state of the Add Info checkbox."""
+        return self.add_info_checkbox.isChecked() and self.add_info_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
+        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)
-            # 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.setStyleSheet("")

src/ui/dialogs/SinglePDF.py

@@ -1,27 +1,29 @@
 import os
 import re
+import sys 
+
 try:
     from fpdf import FPDF
     FPDF_AVAILABLE = True
 
-    # --- FIX: Move the class definition inside the try block ---
     class PDF(FPDF):
         """Custom PDF class to handle headers and footers."""
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+            self.font_family_main = 'Arial' 
+
         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.set_font(self.font_family_main, '', 8)
             self.cell(0, 10, 'Page ' + str(self.page_no()), 0, 0, 'C')
 
-except ImportError:
+except Exception as e:
+    print(f"\n❌ DEBUG INFO: Import failed. The specific error is: {e}")
+    print(f"❌ DEBUG INFO: Python running this script is located at: {sys.executable}\n")
     FPDF_AVAILABLE = False
-    # If the import fails, FPDF and PDF will not be defined,
-    # but the program won't crash here.
     FPDF = None 
     PDF = None
 
@@ -31,12 +33,169 @@ def strip_html_tags(text):
     clean = re.compile('<.*?>')
     return re.sub(clean, '', text)
 
-def create_single_pdf_from_content(posts_data, output_filename, font_path, logger=print):
+def _setup_pdf_fonts(pdf, font_path, logger=print):
+    """Helper to setup fonts for the PDF instance."""
+    bold_font_path = ""
+    default_font = 'Arial'
+    
+    if font_path:
+        bold_font_path = font_path.replace("DejaVuSans.ttf", "DejaVuSans-Bold.ttf")
+
+    try:
+        if font_path and os.path.exists(font_path): 
+            pdf.add_font('DejaVu', '', font_path, uni=True)
+            default_font = 'DejaVu'
+            if os.path.exists(bold_font_path): 
+                pdf.add_font('DejaVu', 'B', bold_font_path, uni=True)
+            else:
+                pdf.add_font('DejaVu', 'B', font_path, uni=True)
+    except Exception as font_error:
+        logger(f"   ⚠️ Could not load DejaVu font: {font_error}. Falling back to Arial.")
+        default_font = 'Arial'
+    
+    pdf.font_family_main = default_font
+    return default_font
+
+def add_metadata_page(pdf, post, font_family):
+    """Adds a dedicated metadata page to the PDF with clickable links."""
+    pdf.add_page()
+    pdf.set_font(font_family, 'B', 16)
+    pdf.multi_cell(w=0, h=10, txt=post.get('title', 'Untitled Post'), align='C')
+    pdf.ln(10)
+    pdf.set_font(font_family, '', 11)
+    
+    def add_info_row(label, value, link_url=None):
+        if not value: return
+        
+        # Write Label (Bold)
+        pdf.set_font(font_family, 'B', 11)
+        pdf.write(8, f"{label}: ")
+        
+        # Write Value
+        if link_url:
+            # Styling for clickable link: Blue + Underline
+            pdf.set_text_color(0, 0, 255)
+            # Check if font supports underline style directly or just use 'U'
+            # FPDF standard allows 'U' in style string.
+            # We use 'U' combined with the font family. 
+            # Note: DejaVu implementation in fpdf2 might handle 'U' automatically or ignore it depending on version,
+            # but setting text color indicates link clearly enough usually.
+            pdf.set_font(font_family, 'U', 11) 
+            
+            # Pass the URL to the 'link' parameter
+            pdf.multi_cell(w=0, h=8, txt=str(value), link=link_url)
+            
+            # Reset styles
+            pdf.set_text_color(0, 0, 0)
+            pdf.set_font(font_family, '', 11)
+        else:
+            pdf.set_font(font_family, '', 11)
+            pdf.multi_cell(w=0, h=8, txt=str(value))
+            
+        pdf.ln(2)
+
+    date_str = post.get('published') or post.get('added') or 'Unknown'
+    add_info_row("Date Uploaded", date_str)
+    
+    creator = post.get('creator_name') or post.get('user') or 'Unknown'
+    add_info_row("Creator", creator)
+    
+    add_info_row("Service", post.get('service', 'Unknown'))
+    
+    link = post.get('original_link')
+    if not link and post.get('service') and post.get('user') and post.get('id'):
+        link = f"https://kemono.su/{post['service']}/user/{post['user']}/post/{post['id']}"
+    
+    # Pass 'link' as both the text value AND the URL target
+    add_info_row("Original Link", link, link_url=link)
+    
+    tags = post.get('tags')
+    if tags:
+        tags_str = ", ".join(tags) if isinstance(tags, list) else str(tags)
+        add_info_row("Tags", tags_str)
+
+    pdf.ln(10)
+    pdf.cell(0, 0, border='T') 
+    pdf.ln(10)
+
+def create_individual_pdf(post_data, output_filename, font_path, add_info_page=False, add_comments=False, logger=print):
     """
-    Creates a single, continuous PDF, correctly formatting both descriptions and comments.
+    Creates a PDF for a single post.
+    Supports optional metadata page and appending comments.
     """
     if not FPDF_AVAILABLE:
-        logger("❌ PDF Creation failed: 'fpdf2' library is not installed. Please run: pip install fpdf2")
+        logger("❌ PDF Creation failed: 'fpdf2' library not installed.")
+        return False
+
+    pdf = PDF()
+    font_family = _setup_pdf_fonts(pdf, font_path, logger)
+    
+    if add_info_page:
+        # add_metadata_page adds the page start itself
+        add_metadata_page(pdf, post_data, font_family)
+        # REMOVED: pdf.add_page() <-- This ensures content starts right below the line
+    else:
+        pdf.add_page()
+
+    # Only add the Title header manually if we didn't add the info page
+    # (Because the info page already contains the title at the top)
+    if not add_info_page:
+        pdf.set_font(font_family, 'B', 16)
+        pdf.multi_cell(w=0, h=10, txt=post_data.get('title', 'Untitled Post'), align='L')
+        pdf.ln(5)
+
+    content_text = post_data.get('content_text_for_pdf')
+    comments_list = post_data.get('comments_list_for_pdf')
+
+    # 1. Write Content
+    if content_text:
+        pdf.set_font(font_family, '', 12)
+        pdf.multi_cell(w=0, h=7, txt=content_text)
+        pdf.ln(10)
+
+    # 2. Write Comments (if enabled and present)
+    if comments_list and (add_comments or not content_text):
+        if add_comments and content_text:
+             pdf.add_page()
+             pdf.set_font(font_family, 'B', 14)
+             pdf.cell(0, 10, "Comments", ln=True)
+             pdf.ln(5)
+
+        for i, 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(font_family, '', 10)
+            pdf.write(8, "Comment by: ")
+            pdf.set_font(font_family, 'B', 10)
+            pdf.write(8, str(user))
+            
+            pdf.set_font(font_family, '', 10)
+            pdf.write(8, f" on {timestamp}")
+            pdf.ln(10)
+
+            pdf.set_font(font_family, '', 11)
+            pdf.multi_cell(w=0, h=7, txt=body)
+            
+            if i < len(comments_list) - 1:
+                pdf.ln(3)
+                pdf.cell(w=0, h=0, border='T')
+                pdf.ln(3)
+    
+    try:
+        pdf.output(output_filename)
+        return True
+    except Exception as e:
+        logger(f"❌ Error saving PDF '{os.path.basename(output_filename)}': {e}")
+        return False
+
+def create_single_pdf_from_content(posts_data, output_filename, font_path, add_info_page=False, logger=print):
+    """
+    Creates a single, continuous PDF from multiple posts.
+    """
+    if not FPDF_AVAILABLE:
+        logger("❌ PDF Creation failed: 'fpdf2' library is not installed.")
         return False
 
     if not posts_data:
@@ -44,34 +203,21 @@ def create_single_pdf_from_content(posts_data, output_filename, font_path, logge
         return False
 
     pdf = PDF()
-    default_font_family = 'DejaVu'
+    font_family = _setup_pdf_fonts(pdf, font_path, logger)
     
-    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:
-            # This ensures every post after the first gets its own page.
+        if add_info_page:
+            add_metadata_page(pdf, post, font_family)
+            # REMOVED: pdf.add_page() <-- This ensures content starts right below the line
+        else:
             pdf.add_page()
 
-        pdf.set_font(default_font_family, 'B', 16)
-        pdf.multi_cell(w=0, h=10, txt=post.get('title', 'Untitled Post'), align='L')
-        pdf.ln(5)
+        if not add_info_page:
+            pdf.set_font(font_family, 'B', 16)
+            pdf.multi_cell(w=0, h=10, txt=post.get('title', 'Untitled Post'), align='L')
+            pdf.ln(5)
 
         if 'comments' in post and post['comments']:
             comments_list = post['comments']
@@ -80,17 +226,17 @@ def create_single_pdf_from_content(posts_data, output_filename, font_path, logge
                 timestamp = comment.get('published', 'No Date')
                 body = strip_html_tags(comment.get('content', ''))
 
-                pdf.set_font(default_font_family, '', 10)
+                pdf.set_font(font_family, '', 10)
                 pdf.write(8, "Comment by: ")
                 if user is not None:
-                    pdf.set_font(default_font_family, 'B', 10)
+                    pdf.set_font(font_family, 'B', 10)
                     pdf.write(8, str(user))
                 
-                pdf.set_font(default_font_family, '', 10)
+                pdf.set_font(font_family, '', 10)
                 pdf.write(8, f" on {timestamp}")
                 pdf.ln(10)
 
-                pdf.set_font(default_font_family, '', 11)
+                pdf.set_font(font_family, '', 11)
                 pdf.multi_cell(w=0, h=7, txt=body)
                 
                 if comment_index < len(comments_list) - 1:
@@ -98,13 +244,16 @@ def create_single_pdf_from_content(posts_data, output_filename, font_path, logge
                     pdf.cell(w=0, h=0, border='T')
                     pdf.ln(3)
         elif 'content' in post:
-            pdf.set_font(default_font_family, '', 12)
+            pdf.set_font(font_family, '', 12)
             pdf.multi_cell(w=0, h=7, txt=post.get('content', 'No Content'))
     
     try:
+        output_dir = os.path.dirname(output_filename)
+        if output_dir and not os.path.exists(output_dir):
+            os.makedirs(output_dir, exist_ok=True)        
         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
+        return False

src/ui/dialogs/SupportDialog.py

@@ -153,7 +153,7 @@ class SupportDialog(QDialog):
 
         community_layout.addWidget(self._create_card_button(
             get_asset_path("github.png"), "GitHub", "Report issues",
-            "https://github.com/Yuvi63771/Kemono-Downloader", "#2E2E2E",
+            "https://github.com/Yuvi9587/Kemono-Downloader", "#2E2E2E",
             min_height=100, icon_size=36
         ))
         community_layout.addWidget(self._create_card_button(

src/ui/dialogs/UpdateCheckDialog.py

@@ -0,0 +1,239 @@
+# --- Standard Library Imports ---
+import json
+import os
+import sys
+
+# --- PyQt5 Imports ---
+from PyQt5.QtCore import Qt, pyqtSignal
+from PyQt5.QtWidgets import (
+    QDialog, QVBoxLayout, QHBoxLayout, QListWidget, QListWidgetItem,
+    QPushButton, QMessageBox, QAbstractItemView, QLabel, 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
+
+class UpdateCheckDialog(QDialog):
+    """
+    A dialog that lists all creator .json profiles with checkboxes
+    and allows the user to select multiple to check for updates.
+    """
+    
+    def __init__(self, user_data_path, parent_app_ref, parent=None):
+        super().__init__(parent)
+        self.parent_app = parent_app_ref
+        self.user_data_path = user_data_path
+        self.selected_profiles_list = [] # Will store a list of {'name': ..., 'data': ...}
+        
+        self._default_checkbox_tooltip = (
+            "If checked, the settings fields will be unlocked and editable.\n"
+            "If unchecked, settings will still load, but in 'Read-Only' mode."
+        )
+
+        self._init_ui()
+        self._load_profiles()
+        self._retranslate_ui()
+
+        # Apply theme from parent
+        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("")
+
+    def _init_ui(self):
+        """Initializes the UI components."""
+        self.setWindowTitle("Check for Updates")
+        self.setMinimumSize(400, 450)
+        
+        app_icon = get_app_icon_object()
+        if app_icon and not app_icon.isNull():
+            self.setWindowIcon(app_icon)
+
+        layout = QVBoxLayout(self)
+
+        self.info_label = QLabel("Select creator profiles to check for updates:")
+        layout.addWidget(self.info_label)
+        
+        # --- List Widget with Checkboxes ---
+        self.list_widget = QListWidget()
+        # No selection mode, we only care about checkboxes
+        self.list_widget.setSelectionMode(QAbstractItemView.NoSelection)
+        # Connect signal to handle checkbox state changes
+        self.list_widget.itemChanged.connect(self._handle_item_changed)
+        layout.addWidget(self.list_widget)
+
+        # Renamed text to reflect new behavior
+        self.edit_settings_checkbox = QCheckBox("Enable Editing (Unlock Settings)")
+        self.edit_settings_checkbox.setToolTip(self._default_checkbox_tooltip)
+        
+        # Checked by default as requested
+        self.edit_settings_checkbox.setChecked(True) 
+        
+        layout.addWidget(self.edit_settings_checkbox)
+        # -------------------------------------
+
+      
+        button_layout = QHBoxLayout()
+        button_layout.setSpacing(6)  # small even spacing between all buttons
+
+        self.select_all_button = QPushButton("Select All")
+        self.select_all_button.clicked.connect(self._toggle_all_checkboxes)
+
+        self.deselect_all_button = QPushButton("Deselect All")
+        self.deselect_all_button.clicked.connect(self._toggle_all_checkboxes)
+
+        self.close_button = QPushButton("Close")
+        self.close_button.clicked.connect(self.reject)
+
+        self.check_button = QPushButton("Check Selected")
+        self.check_button.clicked.connect(self.on_check_selected)
+        self.check_button.setDefault(True)
+
+        # Add buttons without a stretch (so no large gap)
+        button_layout.addWidget(self.select_all_button)
+        button_layout.addWidget(self.deselect_all_button)
+        button_layout.addWidget(self.close_button)
+        button_layout.addWidget(self.check_button)
+
+        layout.addLayout(button_layout)
+
+    def _tr(self, key, default_text=""):
+        """Helper to get translation based on current app 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):
+        """Translates the UI elements."""
+        self.setWindowTitle(self._tr("update_check_dialog_title", "Check for Updates"))
+        self.info_label.setText(self._tr("update_check_dialog_info_multiple", "Select creator profiles to check for updates:"))
+        self.select_all_button.setText(self._tr("select_all_button_text", "Select All"))
+        self.deselect_all_button.setText(self._tr("deselect_all_button_text", "Deselect All"))
+        self.check_button.setText(self._tr("update_check_dialog_check_button", "Check Selected"))
+        self.close_button.setText(self._tr("update_check_dialog_close_button", "Close"))
+        # Updated translation key and default text
+        self.edit_settings_checkbox.setText(self._tr("update_check_enable_editing_checkbox", "Enable Editing (Unlock Settings)"))
+
+    def _load_profiles(self):
+        """Loads all .json files from the creator_profiles directory as checkable items."""
+        appdata_dir = self.user_data_path
+        profiles_dir = os.path.join(appdata_dir, "creator_profiles")
+
+        if not os.path.isdir(profiles_dir):
+            QMessageBox.warning(self, 
+                self._tr("update_check_dir_not_found_title", "Directory Not Found"),
+                self._tr("update_check_dir_not_found_msg", 
+                         "The creator profiles directory does not exist yet.\n\nPath: {path}")
+                         .format(path=profiles_dir))
+            return
+
+        profiles_found = []
+        for filename in os.listdir(profiles_dir):
+            if filename.endswith(".json"):
+                filepath = os.path.join(profiles_dir, filename)
+                try:
+                    with open(filepath, 'r', encoding='utf-8') as f:
+                        data = json.load(f)
+                    
+                    if 'creator_url' in data and 'processed_post_ids' in data:
+                        creator_name = os.path.splitext(filename)[0]
+                        profiles_found.append({'name': creator_name, 'data': data})
+                    else:
+                        print(f"Skipping invalid profile: {filename}")
+                except Exception as e:
+                    print(f"Failed to load profile {filename}: {e}")
+
+        profiles_found.sort(key=lambda x: x['name'].lower())
+
+        for profile_info in profiles_found:
+            item = QListWidgetItem(profile_info['name'])
+            item.setData(Qt.UserRole, profile_info)
+            item.setFlags(item.flags() | Qt.ItemIsUserCheckable)
+            item.setCheckState(Qt.Unchecked)
+            self.list_widget.addItem(item)
+            
+        if not profiles_found:
+            self.list_widget.addItem(self._tr("update_check_no_profiles", "No creator profiles found."))
+            self.list_widget.setEnabled(False)
+            self.check_button.setEnabled(False)
+            self.select_all_button.setEnabled(False)
+            self.deselect_all_button.setEnabled(False)
+            self.edit_settings_checkbox.setEnabled(False)
+
+    def _toggle_all_checkboxes(self):
+        """Handles Select All and Deselect All button clicks."""
+        sender = self.sender()
+        check_state = Qt.Checked if sender == self.select_all_button else Qt.Unchecked
+        
+        self.list_widget.blockSignals(True)
+        for i in range(self.list_widget.count()):
+            item = self.list_widget.item(i)
+            if item.flags() & Qt.ItemIsUserCheckable:
+                item.setCheckState(check_state)
+        self.list_widget.blockSignals(False)
+        
+        self._handle_item_changed(None)
+
+    def _handle_item_changed(self, item):
+        """
+        Monitors how many items are checked.
+        If more than 1 item is checked, disable the 'Enable Editing' checkbox.
+        """
+        checked_count = 0
+        for i in range(self.list_widget.count()):
+            if self.list_widget.item(i).checkState() == Qt.Checked:
+                checked_count += 1
+        
+        if checked_count > 1:
+            self.edit_settings_checkbox.setChecked(False)
+            self.edit_settings_checkbox.setEnabled(False)
+            self.edit_settings_checkbox.setToolTip(
+                self._tr("update_check_multi_selection_warning", 
+                         "Editing settings is disabled when multiple profiles are selected.")
+            )
+        else:
+            self.edit_settings_checkbox.setEnabled(True)
+            self.edit_settings_checkbox.setToolTip(self._default_checkbox_tooltip)
+
+    def on_check_selected(self):
+        """Handles the 'Check Selected' button click."""
+        self.selected_profiles_list = []
+        
+        for i in range(self.list_widget.count()):
+            item = self.list_widget.item(i)
+            if item.checkState() == Qt.Checked:
+                profile_info = item.data(Qt.UserRole)
+                if profile_info:
+                    self.selected_profiles_list.append(profile_info)
+        
+        if not self.selected_profiles_list:
+            QMessageBox.warning(self, 
+                self._tr("update_check_no_selection_title", "No Selection"),
+                self._tr("update_check_no_selection_msg", "Please select at least one creator to check."))
+            return
+        
+        self.accept()
+
+    def get_selected_profiles(self):
+        """Returns the list of profile data selected by the user."""
+        return self.selected_profiles_list
+    
+    def should_load_into_ui(self):
+        """
+        Returns True if the settings SHOULD be loaded into the UI.
+        
+        NEW LOGIC: Returns True if exactly ONE profile is selected.
+        It does NOT care about the checkbox state anymore, because we want
+        to load settings even if the user can't edit them.
+        """
+        return len(self.selected_profiles_list) == 1
+    
+    def should_enable_editing(self):
+        """
+        NEW METHOD: Returns True if the user is allowed to edit the settings.
+        This is linked to the checkbox.
+        """
+        return self.edit_settings_checkbox.isEnabled() and self.edit_settings_checkbox.isChecked()

src/utils/network_utils.py

@@ -137,6 +137,18 @@ def extract_post_info(url_string):
 
     stripped_url = url_string.strip()
 
+
+    # --- DeviantArt Check ---
+    if 'deviantart.com' in stripped_url.lower() or 'fav.me' in stripped_url.lower():
+        # This MUST return 'deviantart' as the first element
+        return 'deviantart', 'placeholder_user', 'placeholder_id'    # ----------------------
+
+    # --- Rule34Video Check ---
+    rule34video_match = re.search(r'rule34video\.com/video/(\d+)', stripped_url)
+    if rule34video_match:
+        video_id = rule34video_match.group(1)
+        return 'rule34video', video_id, None
+
     # --- Danbooru Check ---
     danbooru_match = re.search(r'danbooru\.donmai\.us|safebooru\.donmai\.us', stripped_url)
     if danbooru_match:

src/utils/resolution.py

@@ -307,14 +307,18 @@ def setup_ui(main_app):
     simpcity_settings_label = QLabel("⚙️ SimpCity Download Options:")
     simpcity_settings_layout.addWidget(simpcity_settings_label)
     
-    # Checkbox row
+     # Checkbox row
     simpcity_checkboxes_layout = QHBoxLayout()
+    
+    main_app.simpcity_dl_images_cb = QCheckBox("Download Images")
+    main_app.simpcity_dl_images_cb.setChecked(True) # Checked by default    
     main_app.simpcity_dl_pixeldrain_cb = QCheckBox("Download Pixeldrain")
     main_app.simpcity_dl_saint2_cb = QCheckBox("Download Saint2.su")
     main_app.simpcity_dl_mega_cb = QCheckBox("Download Mega")
     main_app.simpcity_dl_bunkr_cb = QCheckBox("Download Bunkr")
     main_app.simpcity_dl_gofile_cb = QCheckBox("Download Gofile")
     
+    simpcity_checkboxes_layout.addWidget(main_app.simpcity_dl_images_cb)
     simpcity_checkboxes_layout.addWidget(main_app.simpcity_dl_pixeldrain_cb)
     simpcity_checkboxes_layout.addWidget(main_app.simpcity_dl_saint2_cb)
     simpcity_checkboxes_layout.addWidget(main_app.simpcity_dl_mega_cb)
@@ -324,7 +328,6 @@ def setup_ui(main_app):
     simpcity_settings_layout.addLayout(simpcity_checkboxes_layout)
     
     # --- START NEW CODE ---
-    # Create the second, dedicated set of cookie controls for SimpCity
     simpcity_cookie_layout = QHBoxLayout()
     simpcity_cookie_layout.setContentsMargins(0, 5, 0, 0) # Add some top margin
     simpcity_cookie_label = QLabel("Cookie:")
@@ -344,7 +347,6 @@ def setup_ui(main_app):
     left_layout.addLayout(checkboxes_group_layout)
 
     # --- Action Buttons & Remaining UI ---
-    # ... (The rest of the setup_ui function remains unchanged)
     main_app.standard_action_buttons_widget = QWidget()
     btn_layout = QHBoxLayout(main_app.standard_action_buttons_widget)
     btn_layout.setContentsMargins(0, 10, 0, 0)
@@ -354,6 +356,11 @@ def setup_ui(main_app):
     font.setBold(True)
     main_app.download_btn.setFont(font)
     main_app.download_btn.clicked.connect(main_app.start_download)
+
+    main_app.add_queue_btn = QPushButton("➕ Add to Queue")
+    main_app.add_queue_btn.setToolTip("Save current settings as a job for later execution.")
+    main_app.add_queue_btn.clicked.connect(main_app.add_current_settings_to_queue)
+
     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)
@@ -364,6 +371,7 @@ def setup_ui(main_app):
     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.add_queue_btn) 
     btn_layout.addWidget(main_app.pause_btn)
     btn_layout.addWidget(main_app.cancel_btn)
     btn_layout.addWidget(main_app.error_btn)

src/utils/text_utils.py

@@ -26,6 +26,16 @@ KNOWN_TXT_MATCH_CLEANUP_PATTERNS = [
     r'\bPreview\b',
 ]
 
+# --- START NEW CODE ---
+# Regular expression to detect CJK characters
+# Covers Hiragana, Katakana, Half/Full width forms, CJK Unified Ideographs, Hangul Syllables, etc.
+cjk_pattern = re.compile(r'[\u3000-\u303f\u3040-\u309f\u30a0-\u30ff\uff00-\uffef\u4e00-\u9fff\uac00-\ud7af]')
+
+def contains_cjk(text):
+    """Checks if the text contains any CJK characters."""
+    return bool(cjk_pattern.search(text))
+# --- END NEW CODE ---
+
 # --- Text Matching and Manipulation Utilities ---
 
 def is_title_match_for_character(post_title, character_name_filter):
@@ -42,7 +52,7 @@ def is_title_match_for_character(post_title, character_name_filter):
     """
     if not post_title or not character_name_filter:
         return False
-        
+
     # Use word boundaries (\b) to match whole words only
     pattern = r"(?i)\b" + re.escape(str(character_name_filter).strip()) + r"\b"
     return bool(re.search(pattern, post_title))
@@ -62,7 +72,7 @@ def is_filename_match_for_character(filename, character_name_filter):
     """
     if not filename or not character_name_filter:
         return False
-        
+
     return str(character_name_filter).strip().lower() in filename.lower()
 
 
@@ -101,16 +111,16 @@ def extract_folder_name_from_title(title, unwanted_keywords):
     """
     if not title:
         return 'Uncategorized'
-        
+
     title_lower = title.lower()
     # Find all whole words in the title
     tokens = re.findall(r'\b[\w\-]+\b', title_lower)
-    
+
     for token in tokens:
         clean_token = clean_folder_name(token)
         if clean_token and clean_token.lower() not in unwanted_keywords:
             return clean_token
-            
+
     # Fallback to cleaning the full title if no single significant word is found
     cleaned_full_title = clean_folder_name(title)
     return cleaned_full_title if cleaned_full_title else 'Uncategorized'
@@ -120,6 +130,7 @@ def match_folders_from_title(title, names_to_match, unwanted_keywords):
     """
     Matches folder names from a title based on a list of known name objects.
     Each name object is a dict: {'name': 'PrimaryName', 'aliases': ['alias1', ...]}
+    MODIFIED: Uses substring matching for CJK aliases, word boundary for others.
 
     Args:
         title (str): The post title to check.
@@ -137,10 +148,11 @@ def match_folders_from_title(title, names_to_match, unwanted_keywords):
     for pat_str in KNOWN_TXT_MATCH_CLEANUP_PATTERNS:
         cleaned_title = re.sub(pat_str, ' ', cleaned_title, flags=re.IGNORECASE)
     cleaned_title = re.sub(r'\s+', ' ', cleaned_title).strip()
+    # Store both original case cleaned title and lower case for different matching
     title_lower = cleaned_title.lower()
 
     matched_cleaned_names = set()
-    
+
     # Sort by name length descending to match longer names first (e.g., "Cloud Strife" before "Cloud")
     sorted_name_objects = sorted(names_to_match, key=lambda x: len(x.get("name", "")), reverse=True)
 
@@ -149,19 +161,43 @@ def match_folders_from_title(title, names_to_match, unwanted_keywords):
         aliases = name_obj.get("aliases", [])
         if not primary_folder_name or not aliases:
             continue
-            
+
+        # <<< START MODIFICATION >>>
+        cleaned_primary_name = clean_folder_name(primary_folder_name)
+        if not cleaned_primary_name or cleaned_primary_name.lower() in unwanted_keywords:
+            continue # Skip this entry entirely if its primary name is unwanted or empty
+
+        match_found_for_this_object = False
         for alias in aliases:
+            if not alias: continue
             alias_lower = alias.lower()
-            if not alias_lower: continue
-            
-            # Use word boundaries for accurate matching
-            pattern = r'\b' + re.escape(alias_lower) + r'\b'
-            if re.search(pattern, title_lower):
-                cleaned_primary_name = clean_folder_name(primary_folder_name)
-                if cleaned_primary_name.lower() not in unwanted_keywords:
+
+            # Check if the alias contains CJK characters
+            if contains_cjk(alias):
+                # Use simple substring matching for CJK
+                if alias_lower in title_lower:
                     matched_cleaned_names.add(cleaned_primary_name)
-                    break # Move to the next name object once a match is found for this one
-                    
+                    match_found_for_this_object = True
+                    break # Move to the next name object
+            else:
+                # Use original word boundary matching for non-CJK
+                try:
+                    # Compile pattern for efficiency if used repeatedly, though here it changes each loop
+                    pattern = r'\b' + re.escape(alias_lower) + r'\b'
+                    if re.search(pattern, title_lower):
+                        matched_cleaned_names.add(cleaned_primary_name)
+                        match_found_for_this_object = True
+                        break # Move to the next name object
+                except re.error as e:
+                    # Log error if the alias creates an invalid regex (unlikely with escape)
+                    print(f"Regex error for alias '{alias}': {e}") # Or use proper logging
+                    continue
+
+        # This outer break logic remains the same (though slightly redundant with inner breaks)
+        if match_found_for_this_object:
+             pass # Already added and broke inner loop
+        # <<< END MODIFICATION >>>
+
     return sorted(list(matched_cleaned_names))
 
 
@@ -169,6 +205,8 @@ def match_folders_from_filename_enhanced(filename, names_to_match, unwanted_keyw
     """
     Matches folder names from a filename, prioritizing longer and more specific aliases.
     It returns immediately after finding the first (longest) match.
+    MODIFIED: Prioritizes boundary-aware matches for Latin characters,
+    falls back to substring search for CJK compatibility.
 
     Args:
         filename (str): The filename to check.
@@ -188,23 +226,49 @@ def match_folders_from_filename_enhanced(filename, names_to_match, unwanted_keyw
     for name_obj in names_to_match:
         primary_name = name_obj.get("name")
         if not primary_name: continue
-        
+
         cleaned_primary_name = clean_folder_name(primary_name)
         if not cleaned_primary_name or cleaned_primary_name.lower() in unwanted_keywords:
             continue
 
         for alias in name_obj.get("aliases", []):
-            if alias.lower():
-                alias_map_to_primary.append((alias.lower(), cleaned_primary_name))
-    
+            if alias: # Check if alias is not None and not an empty string
+                alias_lower_val = alias.lower()
+                if alias_lower_val: # Check again after lowercasing
+                    alias_map_to_primary.append((alias_lower_val, cleaned_primary_name))
+
     # Sort by alias length, descending, to match longer aliases first
     alias_map_to_primary.sort(key=lambda x: len(x[0]), reverse=True)
 
-    # <<< MODIFICATION: Return the FIRST match found, which will be the longest >>>
+    # Return the FIRST match found, which will be the longest
     for alias_lower, primary_name_for_alias in alias_map_to_primary:
-        if alias_lower in filename_lower:
-            # Found the longest possible alias that is a substring. Return immediately.
-            return [primary_name_for_alias]
+        try:
+            # 1. Attempt boundary-aware match first (good for English/Latin)
+            # Matches alias if it's at the start/end or surrounded by common separators
+            # We use word boundaries (\b) and also check for common non-word separators like +_-
+            pattern = r'(?:^|[\s_+-])' + re.escape(alias_lower) + r'(?:[\s_+-]|$)'
             
+            if re.search(pattern, filename_lower):
+                # Found a precise, boundary-aware match. This is the best case.
+                return [primary_name_for_alias]
+
+            # 2. Fallback: Simple substring check (for CJK or other cases)
+            # This executes ONLY if the boundary match above failed.
+            # We check if the alias contains CJK OR if the filename does.
+            # This avoids applying the simple 'in' check for Latin-only aliases in Latin-only filenames.
+            elif (contains_cjk(alias_lower) or contains_cjk(filename_lower)) and alias_lower in filename_lower:
+                # This is the fallback for CJK compatibility.
+                return [primary_name_for_alias]
+                
+            # If alias is "ul" and filename is "sin+título":
+            # 1. re.search(r'(?:^|[\s_+-])ul(?:[\s_+-]|$)', "sin+título") -> Fails (good)
+            # 2. contains_cjk("ul") -> False
+            # 3. contains_cjk("sin+título") -> False
+            # 4. No match is found for "ul". (correct)
+
+        except re.error as e:
+            print(f"Regex error matching alias '{alias_lower}' in filename '{filename_lower}': {e}")
+            continue # Skip this alias if regex fails
+
     # If the loop finishes without any matches, return an empty list.
-    return []
+    return []

structure.txt

@@ -0,0 +1,110 @@
+├── assets/
+│   ├── Kemono.ico
+│   ├── Kemono.png
+│   ├── Ko-fi.png
+│   ├── buymeacoffee.png
+│   ├── discord.png
+│   ├── github.png
+│   ├── instagram.png
+│   └── patreon.png
+├── data/
+│   ├── creators.json
+│   └── dejavu-sans/
+│       ├── DejaVu Fonts License.txt
+│       ├── DejaVuSans-Bold.ttf
+│       ├── DejaVuSans-BoldOblique.ttf
+│       ├── DejaVuSans-ExtraLight.ttf
+│       ├── DejaVuSans-Oblique.ttf
+│       ├── DejaVuSans.ttf
+│       ├── DejaVuSansCondensed-Bold.ttf
+│       ├── DejaVuSansCondensed-BoldOblique.ttf
+│       ├── DejaVuSansCondensed-Oblique.ttf
+│       └── DejaVuSansCondensed.ttf
+├── main.py
+├── src/
+│   ├── __init__.py
+│   ├── config/
+│   │   ├── __init__.py
+│   │   └── constants.py
+│   ├── core/
+│   │   ├── Hentai2read_client.py
+│   │   ├── __init__.py
+│   │   ├── allcomic_client.py
+│   │   ├── api_client.py
+│   │   ├── booru_client.py
+│   │   ├── bunkr_client.py
+│   │   ├── discord_client.py
+│   │   ├── erome_client.py
+│   │   ├── fap_nation_client.py
+│   │   ├── manager.py
+│   │   ├── mangadex_client.py
+│   │   ├── nhentai_client.py
+│   │   ├── pixeldrain_client.py
+│   │   ├── rule34video_client.py
+│   │   ├── saint2_client.py
+│   │   ├── simpcity_client.py
+│   │   ├── toonily_client.py
+│   │   └── workers.py
+│   ├── i18n/
+│   │   ├── __init__.py
+│   │   └── translator.py
+│   ├── services/
+│   │   ├── __init__.py
+│   │   ├── drive_downloader.py
+│   │   ├── multipart_downloader.py
+│   │   └── updater.py
+│   ├── ui/
+│   │   ├── __init__.py
+│   │   ├── assets.py
+│   │   ├── classes/
+│   │   │   ├── allcomic_downloader_thread.py
+│   │   │   ├── booru_downloader_thread.py
+│   │   │   ├── bunkr_downloader_thread.py
+│   │   │   ├── discord_downloader_thread.py
+│   │   │   ├── downloader_factory.py
+│   │   │   ├── drive_downloader_thread.py
+│   │   │   ├── erome_downloader_thread.py
+│   │   │   ├── external_link_downloader_thread.py
+│   │   │   ├── fap_nation_downloader_thread.py
+│   │   │   ├── hentai2read_downloader_thread.py
+│   │   │   ├── kemono_discord_downloader_thread.py
+│   │   │   ├── mangadex_downloader_thread.py
+│   │   │   ├── nhentai_downloader_thread.py
+│   │   │   ├── pixeldrain_downloader_thread.py
+│   │   │   ├── rule34video_downloader_thread.py
+│   │   │   ├── saint2_downloader_thread.py
+│   │   │   ├── simp_city_downloader_thread.py
+│   │   │   └── toonily_downloader_thread.py
+│   │   ├── dialogs/
+│   │   │   ├── ConfirmAddAllDialog.py
+│   │   │   ├── CookieHelpDialog.py
+│   │   │   ├── CustomFilenameDialog.py
+│   │   │   ├── DownloadExtractedLinksDialog.py
+│   │   │   ├── DownloadHistoryDialog.py
+│   │   │   ├── EmptyPopupDialog.py
+│   │   │   ├── ErrorFilesDialog.py
+│   │   │   ├── ExportLinksDialog.py
+│   │   │   ├── ExportOptionsDialog.py
+│   │   │   ├── FavoriteArtistsDialog.py
+│   │   │   ├── FavoritePostsDialog.py
+│   │   │   ├── FutureSettingsDialog.py
+│   │   │   ├── HelpGuideDialog.py
+│   │   │   ├── KeepDuplicatesDialog.py
+│   │   │   ├── KnownNamesFilterDialog.py
+│   │   │   ├── MoreOptionsDialog.py
+│   │   │   ├── MultipartScopeDialog.py
+│   │   │   ├── SinglePDF.py
+│   │   │   ├── SupportDialog.py
+│   │   │   ├── TourDialog.py
+│   │   │   ├── __init__.py
+│   │   │   └── discord_pdf_generator.py
+│   │   └── main_window.py
+│   └── utils/
+│       ├── __init__.py
+│       ├── command.py
+│       ├── file_utils.py
+│       ├── network_utils.py
+│       ├── resolution.py
+│       └── text_utils.py
+├── structure.txt
+└── yt-dlp.exe