Commit

main.py

@@ -107,4 +107,4 @@ def main():
 
 
 if __name__ == '__main__':
-    main()
+    main()

readme.md

@@ -87,7 +87,7 @@
   <li>pip (Python package installer)</li>
 </ul>
 <h3>Install Dependencies</h3>
-<pre><code>pip install -r requirements.txt
+<pre><code>pip install PyQt5 requests cloudscraper Pillow fpdf2 python-docx
 </code></pre>
 <h3>Running the Application</h3>
 <p>Navigate to the application's directory in your terminal and run:</p>

src/config/constants.py

@@ -1,4 +1,3 @@
-# --- Application Metadata ---
 CONFIG_ORGANIZATION_NAME = "KemonoDownloader"
 CONFIG_APP_NAME_MAIN = "ApplicationSettings"
 CONFIG_APP_NAME_TOUR = "ApplicationTour"
@@ -9,7 +8,7 @@ STYLE_ORIGINAL_NAME = "original_name"
 STYLE_DATE_BASED = "date_based"
 STYLE_DATE_POST_TITLE = "date_post_title"
 STYLE_POST_TITLE_GLOBAL_NUMBERING = "post_title_global_numbering"
-STYLE_POST_ID = "post_id"  # Add this line
+STYLE_POST_ID = "post_id"
 MANGA_DATE_PREFIX_DEFAULT = ""
 
 # --- Download Scopes ---
@@ -60,7 +59,10 @@ DOWNLOAD_LOCATION_KEY = "downloadLocationV1"
 RESOLUTION_KEY = "window_resolution"
 UI_SCALE_KEY = "ui_scale_factor"
 SAVE_CREATOR_JSON_KEY = "saveCreatorJsonProfile"
-FETCH_FIRST_KEY = "fetchAllPostsFirst" 
+FETCH_FIRST_KEY = "fetchAllPostsFirst"
+DISCORD_TOKEN_KEY = "discord/token"
+
+POST_DOWNLOAD_ACTION_KEY = "postDownloadAction"
 
 # --- UI Constants and Identifiers ---
 HTML_PREFIX = "<!HTML!>"
@@ -120,4 +122,4 @@ CREATOR_DOWNLOAD_DEFAULT_FOLDER_IGNORE_WORDS = {
 
 # --- Duplicate Handling Modes ---
 DUPLICATE_HANDLING_HASH = "hash"      
-DUPLICATE_HANDLING_KEEP_ALL = "keep_all"  
+DUPLICATE_HANDLING_KEEP_ALL = "keep_all"

src/core/Hentai2read_client.py

@@ -0,0 +1,72 @@
+# src/core/Hentai2read_client.py
+
+import re
+import os
+import json
+import requests
+import cloudscraper
+from bs4 import BeautifulSoup
+
+def fetch_hentai2read_data(url, logger, session):
+    """
+    Scrapes a SINGLE Hentai2Read chapter page using a provided session.
+    """
+    logger(f"Attempting to fetch chapter data from: {url}")
+    
+    try:
+        response = session.get(url, timeout=30)
+        response.raise_for_status()
+        
+        page_content_text = response.text
+        soup = BeautifulSoup(page_content_text, 'html.parser')
+
+        album_title = ""
+        title_tags = soup.select('span[itemprop="name"]')
+        if title_tags:
+            album_title = title_tags[-1].text.strip()
+        
+        if not album_title:
+            title_tag = soup.select_one('h1.title')
+            if title_tag:
+                album_title = title_tag.text.strip()
+
+        if not album_title:
+            logger("❌ Could not find album title on page.")
+            return None, None
+        
+        image_urls = []
+        try:
+            start_index = page_content_text.index("'images' : ") + len("'images' : ")
+            end_index = page_content_text.index(",\n", start_index)
+            images_json_str = page_content_text[start_index:end_index]
+            image_paths = json.loads(images_json_str)
+            image_urls = ["https://hentaicdn.com/hentai" + part for part in image_paths]
+        except (ValueError, json.JSONDecodeError):
+            logger("❌ Could not find or parse image JSON data for this chapter.")
+            return None, None
+
+        if not image_urls:
+            logger("❌ No image URLs found for this chapter.")
+            return None, None
+
+        logger(f"   Found {len(image_urls)} images for album '{album_title}'.")
+
+        files_to_download = []
+        for i, img_url in enumerate(image_urls):
+            page_num = i + 1
+            extension = os.path.splitext(img_url)[1].split('?')[0]
+            if not extension: extension = ".jpg"
+            filename = f"{page_num:03d}{extension}"
+            files_to_download.append({'url': img_url, 'filename': filename})
+
+        return album_title, files_to_download
+
+    except requests.exceptions.HTTPError as e:
+        if e.response.status_code == 404:
+            logger(f"   Chapter not found (404 Error). This likely marks the end of the series.")
+        else:
+            logger(f"❌ An HTTP error occurred: {e}")
+        return None, None
+    except Exception as e:
+        logger(f"❌ An unexpected error occurred while fetching data: {e}")
+        return None, None

src/core/discord_client.py

@@ -43,9 +43,7 @@ def fetch_channel_messages(channel_id, logger=print, cancellation_event=None, pa
     }
     
     offset = 0
-    # --- FIX: Corrected the page size for Discord API pagination ---
     page_size = 150 
-    # --- END FIX ---
 
     while True:
         if cancellation_event and cancellation_event.is_set():

src/core/workers.py

@@ -848,6 +848,8 @@ class PostProcessorWorker:
                     'original_post_id_for_log': original_post_id_for_log, 'post_title': post_title,
                     'file_index_in_post': file_index_in_post, 'num_files_in_this_post': num_files_in_this_post,
                     'forced_filename_override': filename_to_save_in_main_path,
+                    'service': self.service,
+                    'user_id': self.user_id
                 }
                 return 0, 1, final_filename_saved_for_return, was_original_name_kept_flag, FILE_DOWNLOAD_STATUS_FAILED_PERMANENTLY_THIS_SESSION, permanent_failure_details
             finally:
@@ -873,25 +875,22 @@ class PostProcessorWorker:
     def process(self):
 
         if self.service == 'discord':
-            # For Discord, self.post is a MESSAGE object from the API.
             post_title = self.post.get('content', '') or f"Message {self.post.get('id', 'N/A')}"
             post_id = self.post.get('id', 'unknown_id')
-            post_main_file_info = {}  # Discord messages don't have a single main file
+            post_main_file_info = {}  
             post_attachments = self.post.get('attachments', [])
             post_content_html = self.post.get('content', '')
-            post_data = self.post  # Keep a reference to the original message object
+            post_data = self.post  
             log_prefix = "Message"
         else:
-            # Existing logic for standard creator posts
             post_title = self.post.get('title', '') or 'untitled_post'
             post_id = self.post.get('id', 'unknown_id')
             post_main_file_info = self.post.get('file')
             post_attachments = self.post.get('attachments', [])
             post_content_html = self.post.get('content', '')
-            post_data = self.post  # Reference to the post object
+            post_data = self.post 
             log_prefix = "Post"
 
-        # --- FIX: FETCH FULL POST DATA IF CONTENT IS MISSING BUT NEEDED ---
         content_is_needed = (
             self.show_external_links or
             self.extract_links_only or

src/services/drive_downloader.py

@@ -271,4 +271,4 @@ def download_dropbox_file(dropbox_link, download_path=".", logger_func=print):
 
     except Exception as e:
         logger_func(f"   [Dropbox] ❌ An error occurred during Dropbox download: {e}")
-        traceback.print_exc(limit=2)
+        traceback.print_exc(limit=2)

src/ui/dialogs/ErrorFilesDialog.py

@@ -42,17 +42,12 @@ class ErrorFilesDialog(QDialog):
         if app_icon and not app_icon.isNull():
             self.setWindowIcon(app_icon)
 
-        # --- START OF FIX ---
-        # Get the user-defined scale factor from the parent application.
         scale_factor = getattr(self.parent_app, 'scale_factor', 1.0)
 
-        # Define base dimensions and apply the correct scale factor.
         base_width, base_height = 550, 400
         self.setMinimumSize(int(base_width * scale_factor), int(base_height * scale_factor))
         self.resize(int(base_width * scale_factor * 1.1), int(base_height * scale_factor * 1.1))
-        # --- END OF FIX ---
 
-        # --- Initialize UI and Apply Theming ---
         self._init_ui()
         self._retranslate_ui()
         self._apply_theme()
@@ -106,7 +101,17 @@ class ErrorFilesDialog(QDialog):
             post_title = error_info.get('post_title', 'Unknown Post')
             post_id = error_info.get('original_post_id_for_log', 'N/A')
 
-            item_text = f"File: {filename}\nFrom Post: '{post_title}' (ID: {post_id})"
+            creator_name = "Unknown Creator"
+            service = error_info.get('service')
+            user_id = error_info.get('user_id')
+            
+            # Check if we have the necessary info and access to the cache
+            if service and user_id and hasattr(self.parent_app, 'creator_name_cache'):
+                creator_key = (service.lower(), str(user_id))
+                # Look up the name, fall back to the user_id if not found
+                creator_name = self.parent_app.creator_name_cache.get(creator_key, user_id)
+
+            item_text = f"File: {filename}\nCreator: {creator_name} - Post: '{post_title}' (ID: {post_id})"
             list_item = QListWidgetItem(item_text)
             list_item.setData(Qt.UserRole, error_info)
             list_item.setFlags(list_item.flags() | Qt.ItemIsUserCheckable)

src/ui/dialogs/FutureSettingsDialog.py

@@ -4,24 +4,109 @@ import json
 import sys
 
 # --- PyQt5 Imports ---
-from PyQt5.QtCore import Qt, QStandardPaths
+from PyQt5.QtCore import Qt, QStandardPaths, QTimer
 from PyQt5.QtWidgets import (
     QApplication, QDialog, QHBoxLayout, QLabel, QPushButton, QVBoxLayout,
     QGroupBox, QComboBox, QMessageBox, QGridLayout, QCheckBox
 )
-
 # --- Local Application Imports ---
 from ...i18n.translator import get_translation
 from ...utils.resolution import get_dark_theme
+from ..assets import get_app_icon_object
+
 from ..main_window import get_app_icon_object
 from ...config.constants import (
     THEME_KEY, LANGUAGE_KEY, DOWNLOAD_LOCATION_KEY,
     RESOLUTION_KEY, UI_SCALE_KEY, SAVE_CREATOR_JSON_KEY,
     COOKIE_TEXT_KEY, USE_COOKIE_KEY,
-    FETCH_FIRST_KEY
+    FETCH_FIRST_KEY, DISCORD_TOKEN_KEY, POST_DOWNLOAD_ACTION_KEY
 )
 from ...services.updater import UpdateChecker, UpdateDownloader
 
+class CountdownMessageBox(QDialog):
+    """
+    A custom message box that includes a countdown timer for the 'Yes' button,
+    which automatically accepts the dialog when the timer reaches zero.
+    """
+    def __init__(self, title, text, countdown_seconds=10, parent_app=None, parent=None):
+        super().__init__(parent)
+        self.parent_app = parent_app
+        self.countdown = countdown_seconds
+        
+        # --- Basic Window Setup ---
+        self.setWindowTitle(title)
+        self.setModal(True)
+        app_icon = get_app_icon_object()
+        if app_icon and not app_icon.isNull():
+            self.setWindowIcon(app_icon)
+        
+        self._init_ui(text)
+        self._apply_theme()
+        
+        # --- Timer Setup ---
+        self.timer = QTimer(self)
+        self.timer.setInterval(1000) # Tick every second
+        self.timer.timeout.connect(self._update_countdown)
+        self.timer.start()
+
+    def _init_ui(self, text):
+        """Initializes the UI components of the dialog."""
+        main_layout = QVBoxLayout(self)
+        
+        self.message_label = QLabel(text)
+        self.message_label.setWordWrap(True)
+        self.message_label.setAlignment(Qt.AlignCenter)
+        main_layout.addWidget(self.message_label)
+
+        buttons_layout = QHBoxLayout()
+        buttons_layout.addStretch(1)
+
+        self.yes_button = QPushButton()
+        self.yes_button.clicked.connect(self.accept)
+        self.yes_button.setDefault(True)
+        
+        self.no_button = QPushButton()
+        self.no_button.clicked.connect(self.reject)
+
+        buttons_layout.addWidget(self.yes_button)
+        buttons_layout.addWidget(self.no_button)
+        buttons_layout.addStretch(1)
+        
+        main_layout.addLayout(buttons_layout)
+        
+        self._retranslate_ui()
+        self._update_countdown() # Initial text setup
+
+    def _tr(self, key, default_text=""):
+        """Helper for translations."""
+        if self.parent_app and hasattr(self.parent_app, 'current_selected_language'):
+            return get_translation(self.parent_app.current_selected_language, key, default_text)
+        return default_text
+
+    def _retranslate_ui(self):
+        """Sets translated text for UI elements."""
+        self.no_button.setText(self._tr("no_button_text", "No"))
+        # The 'yes' button text is handled by the countdown
+        
+    def _update_countdown(self):
+        """Updates the countdown and button text each second."""
+        if self.countdown <= 0:
+            self.timer.stop()
+            self.accept() # Automatically accept when countdown finishes
+            return
+            
+        yes_text = self._tr("yes_button_text", "Yes")
+        self.yes_button.setText(f"{yes_text} ({self.countdown})")
+        self.countdown -= 1
+
+    def _apply_theme(self):
+        """Applies the current theme from the parent application."""
+        if self.parent_app and hasattr(self.parent_app, 'current_theme') and self.parent_app.current_theme == "dark":
+            scale = getattr(self.parent_app, 'scale_factor', 1)
+            self.setStyleSheet(get_dark_theme(scale))
+        else:
+            self.setStyleSheet("")
+
 class FutureSettingsDialog(QDialog):
     """
     A dialog for managing application-wide settings like theme, language,
@@ -39,7 +124,7 @@ class FutureSettingsDialog(QDialog):
 
         screen_height = QApplication.primaryScreen().availableGeometry().height() if QApplication.primaryScreen() else 800
         scale_factor = screen_height / 800.0
-        base_min_w, base_min_h = 420, 480 # Increased height for update section
+        base_min_w, base_min_h = 420, 520 # Increased height for new options
         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)
@@ -55,7 +140,6 @@ class FutureSettingsDialog(QDialog):
         self.interface_group_box = QGroupBox()
         interface_layout = QGridLayout(self.interface_group_box)
 
-        # Theme, UI Scale, Language (unchanged)...
         self.theme_label = QLabel()
         self.theme_toggle_button = QPushButton()
         self.theme_toggle_button.clicked.connect(self._toggle_theme)
@@ -87,21 +171,26 @@ class FutureSettingsDialog(QDialog):
 
         self.default_path_label = QLabel()
         self.save_path_button = QPushButton()
-        self.save_path_button.clicked.connect(self._save_cookie_and_path)
+        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.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, 2, 0)
+        download_window_layout.addWidget(self.post_download_action_combo, 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, 2, 0, 1, 2)
+        download_window_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, 3, 0, 1, 2)
+        download_window_layout.addWidget(self.fetch_first_checkbox, 4, 0, 1, 2)
 
         main_layout.addWidget(self.download_window_group_box)
 
-        # --- NEW: Update Section ---
         self.update_group_box = QGroupBox()
         update_layout = QGridLayout(self.update_group_box)
         self.version_label = QLabel()
@@ -112,7 +201,6 @@ class FutureSettingsDialog(QDialog):
         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)
-        # --- END: New Section ---
 
         main_layout.addStretch(1)
 
@@ -129,28 +217,27 @@ class FutureSettingsDialog(QDialog):
         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:"))
+        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_cookie_path_button", "Save Cookie + Download Path"))
-        self.save_path_button.setToolTip(self._tr("settings_save_cookie_path_tooltip", "Save the current 'Download Location' and Cookie settings for future sessions."))
+        self.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"))
 
-        # --- NEW: Translations for Update Section ---
         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"))
-        # --- END: New Translations ---
-
+        
         self._populate_display_combo_boxes()
         self._populate_language_combo_box()
+        self._populate_post_download_action_combo()
         self._load_checkbox_states()
 
     def _check_for_updates(self):
-        """Starts the update check thread."""
         self.check_update_button.setEnabled(False)
         self.update_status_label.setText(self._tr("update_status_checking", "Checking..."))
         current_version = self.parent_app.windowTitle().split(' v')[-1]
@@ -189,7 +276,6 @@ class FutureSettingsDialog(QDialog):
         self.check_update_button.setEnabled(True)
         self.ok_button.setEnabled(True)
 
-    # --- (The rest of the file remains unchanged from your provided code) ---
     def _load_checkbox_states(self):
         self.save_creator_json_checkbox.blockSignals(True)
         should_save = self.parent_app.settings.value(SAVE_CREATOR_JSON_KEY, True, type=bool)
@@ -252,15 +338,9 @@ class FutureSettingsDialog(QDialog):
         self.ui_scale_combo_box.blockSignals(True)
         self.ui_scale_combo_box.clear()
         scales = [
-            (0.5, "50%"),
-            (0.7, "70%"),
-            (0.9, "90%"),
-            (1.0, "100% (Default)"),
-            (1.25, "125%"),
-            (1.50, "150%"),
-            (1.75, "175%"),
-            (2.0, "200%")
-            ]
+            (0.5, "50%"), (0.7, "70%"), (0.9, "90%"), (1.0, "100% (Default)"),
+            (1.25, "125%"), (1.50, "150%"), (1.75, "175%"), (2.0, "200%")
+        ]
         current_scale = self.parent_app.settings.value(UI_SCALE_KEY, 1.0)
         for scale_val, scale_name in scales:
             self.ui_scale_combo_box.addItem(scale_name, scale_val)
@@ -285,7 +365,7 @@ class FutureSettingsDialog(QDialog):
             ("de", "Deutsch (German)"), ("es", "Español (Spanish)"), ("pt", "Português (Portuguese)"),
             ("ru", "Русский (Russian)"), ("zh_CN", "简体中文 (Simplified Chinese)"),
             ("zh_TW", "繁體中文 (Traditional Chinese)"), ("ko", "한국어 (Korean)")
-            ]
+        ]
         current_lang = self.parent_app.current_selected_language
         for lang_code, lang_name in languages:
             self.language_combo_box.addItem(lang_name, lang_code)
@@ -305,14 +385,44 @@ class FutureSettingsDialog(QDialog):
             QMessageBox.information(self, self._tr("language_change_title", "Language Changed"),
                                     self._tr("language_change_message", "A restart is required..."))
 
-    def _save_cookie_and_path(self):
+    def _populate_post_download_action_combo(self):
+        """Populates the action dropdown and sets the current selection from settings."""
+        self.post_download_action_combo.blockSignals(True)
+        self.post_download_action_combo.clear()
+        
+        actions = [
+            (self._tr("action_off", "Off"), "off"),
+            (self._tr("action_notify", "Notify with Sound"), "notify"),
+            (self._tr("action_sleep", "Sleep"), "sleep"),
+            (self._tr("action_shutdown", "Shutdown"), "shutdown")
+        ]
+        
+        current_action = self.parent_app.settings.value(POST_DOWNLOAD_ACTION_KEY, "off")
+        
+        for text, key in actions:
+            self.post_download_action_combo.addItem(text, key)
+            if current_action == key:
+                self.post_download_action_combo.setCurrentIndex(self.post_download_action_combo.count() - 1)
+        
+        self.post_download_action_combo.blockSignals(False)
+
+    def _post_download_action_changed(self):
+        """Saves the selected post-download action to settings."""
+        selected_action = self.post_download_action_combo.currentData()
+        self.parent_app.settings.setValue(POST_DOWNLOAD_ACTION_KEY, selected_action)
+        self.parent_app.settings.sync()
+
+    def _save_settings(self):
         path_saved = False
         cookie_saved = False
+        token_saved = False
+
         if hasattr(self.parent_app, 'dir_input') and self.parent_app.dir_input:
             current_path = self.parent_app.dir_input.text().strip()
             if current_path and os.path.isdir(current_path):
                 self.parent_app.settings.setValue(DOWNLOAD_LOCATION_KEY, current_path)
                 path_saved = True
+        
         if hasattr(self.parent_app, 'use_cookie_checkbox'):
             use_cookie = self.parent_app.use_cookie_checkbox.isChecked()
             cookie_content = self.parent_app.cookie_text_input.text().strip()
@@ -323,8 +433,20 @@ class FutureSettingsDialog(QDialog):
             else:
                 self.parent_app.settings.setValue(USE_COOKIE_KEY, False)
                 self.parent_app.settings.setValue(COOKIE_TEXT_KEY, "")
+        
+        if (hasattr(self.parent_app, 'remove_from_filename_input') and
+                hasattr(self.parent_app, 'remove_from_filename_label_widget')):
+            
+            label_text = self.parent_app.remove_from_filename_label_widget.text()
+            if "Token" in label_text:
+                discord_token = self.parent_app.remove_from_filename_input.text().strip()
+                if discord_token:
+                    self.parent_app.settings.setValue(DISCORD_TOKEN_KEY, discord_token)
+                    token_saved = True
+        
         self.parent_app.settings.sync()
-        if path_saved or cookie_saved:
-            QMessageBox.information(self, "Settings Saved", "Settings have been saved.")
+
+        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 to save.")
+            QMessageBox.warning(self, "Nothing to Save", "No valid settings were found to save.")

src/ui/dialogs/discord_pdf_generator.py

@@ -1,6 +1,7 @@
 import os
 import re
 import datetime
+import time
 try:
     from fpdf import FPDF
     FPDF_AVAILABLE = True
@@ -29,7 +30,7 @@ except ImportError:
     FPDF = None 
     PDF = None
 
-def create_pdf_from_discord_messages(messages_data, server_name, channel_name, output_filename, font_path, logger=print):
+def create_pdf_from_discord_messages(messages_data, server_name, channel_name, output_filename, font_path, logger=print, cancellation_event=None, pause_event=None):
     """
     Creates a single PDF from a list of Discord message objects, formatted as a chat log.
     UPDATED to include clickable links for attachments and embeds.
@@ -42,8 +43,20 @@ def create_pdf_from_discord_messages(messages_data, server_name, channel_name, o
         logger("   No messages were found or fetched to create a PDF.")
         return False
 
+    # --- FIX: This helper function now correctly accepts and checks the event objects ---
+    def check_events(c_event, p_event):
+        """Helper to safely check for pause and cancel events."""
+        if c_event and hasattr(c_event, 'is_cancelled') and c_event.is_cancelled:
+            return True # Stop
+        if p_event and hasattr(p_event, 'is_paused'):
+            while p_event.is_paused:
+                time.sleep(0.5)
+                if c_event and hasattr(c_event, 'is_cancelled') and c_event.is_cancelled:
+                    return True
+        return False
+
     logger("   Sorting messages by date (oldest first)...")
-    messages_data.sort(key=lambda m: m.get('published', ''))
+    messages_data.sort(key=lambda m: m.get('published', m.get('timestamp', '')))
 
     pdf = PDF(server_name, channel_name)
     default_font_family = 'DejaVu'
@@ -78,14 +91,19 @@ def create_pdf_from_discord_messages(messages_data, server_name, channel_name, o
     logger(f"   Starting PDF creation with {len(messages_data)} messages...")
 
     for i, message in enumerate(messages_data):
+        # --- FIX: Pass the event objects to the helper function ---
+        if i % 50 == 0:
+            if check_events(cancellation_event, pause_event):
+                logger("   PDF generation cancelled by user.")
+                return False
+
         author = message.get('author', {}).get('global_name') or message.get('author', {}).get('username', 'Unknown User')
-        timestamp_str = message.get('published', '')
+        timestamp_str = message.get('published', message.get('timestamp', ''))
         content = message.get('content', '')
         attachments = message.get('attachments', [])
         embeds = message.get('embeds', [])
 
         try:
-            # Handle timezone information correctly
             if timestamp_str.endswith('Z'):
                 timestamp_str = timestamp_str[:-1] + '+00:00'
             dt_obj = datetime.datetime.fromisoformat(timestamp_str)
@@ -93,14 +111,12 @@ def create_pdf_from_discord_messages(messages_data, server_name, channel_name, o
         except (ValueError, TypeError):
             formatted_timestamp = timestamp_str
 
-        # Draw a separator line
         if i > 0:
             pdf.ln(2)
-            pdf.set_draw_color(200, 200, 200) # Light grey line
+            pdf.set_draw_color(200, 200, 200)
             pdf.cell(0, 0, '', border='T')
             pdf.ln(2)
 
-        # Message Header
         pdf.set_font(default_font_family, 'B', 11)
         pdf.write(5, f"{author} ")
         pdf.set_font(default_font_family, '', 9)
@@ -109,33 +125,31 @@ def create_pdf_from_discord_messages(messages_data, server_name, channel_name, o
         pdf.set_text_color(0, 0, 0)
         pdf.ln(6)
 
-        # Message Content
         if content:
             pdf.set_font(default_font_family, '', 10)
             pdf.multi_cell(w=0, h=5, text=content)
         
-        # --- START: MODIFIED ATTACHMENT AND EMBED LOGIC ---
         if attachments or embeds:
             pdf.ln(1)
             pdf.set_font(default_font_family, '', 9)
-            pdf.set_text_color(22, 119, 219) # A nice blue for links
+            pdf.set_text_color(22, 119, 219)
 
             for att in attachments:
-                file_name = att.get('name', 'untitled')
-                file_path = att.get('path', '')
-                # Construct the full, clickable URL for the attachment
-                full_url = f"https://kemono.cr/data{file_path}"
+                file_name = att.get('filename', 'untitled')
+                full_url = att.get('url', '#')
                 pdf.write(5, text=f"[Attachment: {file_name}]", link=full_url)
-                pdf.ln() # New line after each attachment
+                pdf.ln()
 
             for embed in embeds:
                 embed_url = embed.get('url', 'no url')
-                # The embed URL is already a full URL
                 pdf.write(5, text=f"[Embed: {embed_url}]", link=embed_url)
-                pdf.ln() # New line after each embed
+                pdf.ln()
 
-            pdf.set_text_color(0, 0, 0) # Reset color to black
-        # --- END: MODIFIED ATTACHMENT AND EMBED LOGIC ---
+            pdf.set_text_color(0, 0, 0)
+
+    if check_events(cancellation_event, pause_event):
+        logger("   PDF generation cancelled by user before final save.")
+        return False
 
     try:
         pdf.output(output_filename)

src/utils/network_utils.py

@@ -138,22 +138,10 @@ def prepare_cookies_for_request(use_cookie_flag, cookie_text_input, selected_coo
     return None
 
 
-# In src/utils/network_utils.py
-
 def extract_post_info(url_string):
     """
     Parses a URL string to extract the service, user ID, and post ID.
-    UPDATED to support Discord, Bunkr, and nhentai URLs.
-
-    Args:
-        url_string (str): The URL to parse.
-
-    Returns:
-        tuple: A tuple containing (service, id1, id2).
-               For posts: (service, user_id, post_id).
-               For Discord: ('discord', server_id, channel_id).
-               For Bunkr: ('bunkr', full_url, None).
-               For nhentai: ('nhentai', gallery_id, None).
+    UPDATED to support Hentai2Read series and chapters.
     """
     if not isinstance(url_string, str) or not url_string.strip():
         return None, None, None
@@ -171,6 +159,18 @@ def extract_post_info(url_string):
     nhentai_match = re.search(r'nhentai\.net/g/(\d+)', stripped_url)
     if nhentai_match:
         return 'nhentai', nhentai_match.group(1), None
+    
+    # --- Hentai2Read Check (Updated) ---
+    # This regex now captures the manga slug (id1) and optionally the chapter number (id2)
+    hentai2read_match = re.search(r'hentai2read\.com/([^/]+)(?:/(\d+))?/?', stripped_url)
+    if hentai2read_match:
+        manga_slug, chapter_num = hentai2read_match.groups()
+        return 'hentai2read', manga_slug, chapter_num # chapter_num will be None for series URLs
+
+    discord_channel_match = re.search(r'discord\.com/channels/(@me|\d+)/(\d+)', stripped_url)
+    if discord_channel_match:
+        server_id, channel_id = discord_channel_match.groups()
+        return 'discord', server_id, channel_id
 
     # --- Kemono/Coomer/Discord Parsing ---
     try:

src/utils/resolution.py

@@ -284,7 +284,7 @@ def setup_ui(main_app):
     advanced_row2_layout.addLayout(multithreading_layout)
     main_app.external_links_checkbox = QCheckBox("Show External Links in Log")
     advanced_row2_layout.addWidget(main_app.external_links_checkbox)
-    main_app.manga_mode_checkbox = QCheckBox("Manga/Comic Mode")
+    main_app.manga_mode_checkbox = QCheckBox("Renaming Mode")
     advanced_row2_layout.addWidget(main_app.manga_mode_checkbox)
     advanced_row2_layout.addStretch(1)
     checkboxes_group_layout.addLayout(advanced_row2_layout)
@@ -391,10 +391,23 @@ def setup_ui(main_app):
     main_app.link_search_button.setVisible(False)
     main_app.link_search_button.setFixedWidth(int(30 * scale))
     log_title_layout.addWidget(main_app.link_search_button)
+  
+    discord_controls_layout = QHBoxLayout()
+
     main_app.discord_scope_toggle_button = QPushButton("Scope: Files")
     main_app.discord_scope_toggle_button.setVisible(False) # Hidden by default
-    main_app.discord_scope_toggle_button.setFixedWidth(int(140 * scale))
-    log_title_layout.addWidget(main_app.discord_scope_toggle_button)
+    discord_controls_layout.addWidget(main_app.discord_scope_toggle_button)
+
+    main_app.discord_message_limit_input = QLineEdit(main_app)
+    main_app.discord_message_limit_input.setPlaceholderText("Msg Limit")
+    main_app.discord_message_limit_input.setToolTip("Optional: Limit the number of recent messages to process.")
+    main_app.discord_message_limit_input.setValidator(QIntValidator(1, 9999999, main_app))
+    main_app.discord_message_limit_input.setFixedWidth(int(80 * scale))
+    main_app.discord_message_limit_input.setVisible(False) # Hide it by default
+    discord_controls_layout.addWidget(main_app.discord_message_limit_input)
+    
+    log_title_layout.addLayout(discord_controls_layout)
+  
     main_app.manga_rename_toggle_button = QPushButton()
     main_app.manga_rename_toggle_button.setVisible(False)
     main_app.manga_rename_toggle_button.setFixedWidth(int(140 * scale))