From b58b1a68577c59875be9362bec47584bc8b232fa Mon Sep 17 00:00:00 2001 From: oop7 <110548351+oop7@users.noreply.github.com> Date: Fri, 28 Nov 2025 18:18:57 +0200 Subject: [PATCH] Persist cookie settings using ConfigManager Refactored cookie settings initialization and application to use ConfigManager for persistence. Cookie source, browser, profile, file path, and active status are now saved and loaded from config, ensuring consistent behavior across sessions. Cookies remain inactive on app launch until explicitly applied by the user. --- .../ytsage_dialogs_custom.py | 56 +++++++++++++------ src/gui/ytsage_gui_main.py | 14 ++++- src/utils/ytsage_config_manager.py | 4 ++ 3 files changed, 53 insertions(+), 21 deletions(-) diff --git a/src/gui/ytsage_gui_dialogs/ytsage_dialogs_custom.py b/src/gui/ytsage_gui_dialogs/ytsage_dialogs_custom.py index fd33db2..e87a3eb 100644 --- a/src/gui/ytsage_gui_dialogs/ytsage_dialogs_custom.py +++ b/src/gui/ytsage_gui_dialogs/ytsage_dialogs_custom.py @@ -644,27 +644,33 @@ class CustomOptionsDialog(QDialog): self._initialize_proxy_settings() def _initialize_cookie_settings(self) -> None: - """Initialize the dialog with current cookie settings from parent""" - if hasattr(self._parent, "browser_cookies_option") and self._parent.browser_cookies_option: - # Browser cookies are active - self.cookie_browser_radio.setChecked(True) - browser_parts = self._parent.browser_cookies_option.split(":") - browser = browser_parts[0] - profile = browser_parts[1] if len(browser_parts) > 1 else "" - - # Set browser selection - index = self.browser_combo.findText(browser) - if index >= 0: - self.browser_combo.setCurrentIndex(index) - - # Set profile if any - self.profile_input.setText(profile) - elif hasattr(self._parent, "cookie_file_path") and self._parent.cookie_file_path: - # File cookies are active - ensure file radio is selected + """Initialize the dialog with current cookie settings from config""" + # Load saved cookie settings from ConfigManager + saved_source = ConfigManager.get("cookie_source") or "browser" + saved_browser = ConfigManager.get("cookie_browser") or "chrome" + saved_profile = ConfigManager.get("cookie_browser_profile") or "" + saved_file_path = ConfigManager.get("cookie_file_path") + + # Set the cookie source radio button + if saved_source == "file": self.cookie_file_radio.setChecked(True) else: - # No cookies configured - browser extraction is the recommended default self.cookie_browser_radio.setChecked(True) + + # Set browser selection + index = self.browser_combo.findText(saved_browser) + if index >= 0: + self.browser_combo.setCurrentIndex(index) + + # Set profile + self.profile_input.setText(saved_profile) + + # Set file path if saved + if saved_file_path: + self.cookie_path_input.setText(str(saved_file_path)) + + # Update visibility based on selection + self.on_cookie_source_changed() def _update_cookies_active_status(self) -> None: """Update the status indicator showing if cookies are currently active""" @@ -713,8 +719,18 @@ class CustomOptionsDialog(QDialog): self._parent.cookie_file_path = None self._parent.browser_cookies_option = None + # Save settings to ConfigManager for persistence + if self.cookie_file_radio.isChecked(): + ConfigManager.set("cookie_source", "file") + ConfigManager.set("cookie_file_path", str(cookie_path) if cookie_path else None) + else: + ConfigManager.set("cookie_source", "browser") + ConfigManager.set("cookie_browser", self.browser_combo.currentText()) + ConfigManager.set("cookie_browser_profile", self.profile_input.text().strip()) + if cookie_path: self._parent.cookie_file_path = cookie_path + ConfigManager.set("cookie_active", True) logger.info(f"Applied cookie file: {self._parent.cookie_file_path}") QMessageBox.information( self, @@ -723,6 +739,7 @@ class CustomOptionsDialog(QDialog): ) elif browser_cookies: self._parent.browser_cookies_option = browser_cookies + ConfigManager.set("cookie_active", True) logger.info(f"Applied browser cookies: {self._parent.browser_cookies_option}") QMessageBox.information( self, @@ -731,6 +748,9 @@ class CustomOptionsDialog(QDialog): ) else: # Clear cookies + ConfigManager.set("cookie_active", False) + ConfigManager.set("cookie_source", "browser") # Reset to default + ConfigManager.set("cookie_file_path", None) logger.info("Cookies cleared") QMessageBox.information( self, diff --git a/src/gui/ytsage_gui_main.py b/src/gui/ytsage_gui_main.py index 13587fc..d869a74 100644 --- a/src/gui/ytsage_gui_main.py +++ b/src/gui/ytsage_gui_main.py @@ -112,9 +112,8 @@ class YTSageApp(QMainWindow, FormatTableMixin, VideoInfoMixin): # Inherit from self.thumbnail_image = None self.video_url = "" self.selected_subtitles = [] # Initialize selected subtitles list - # Initialize cookie settings - ensure they start clean - self.cookie_file_path = None - self.browser_cookies_option = None + # Initialize cookie settings from saved config + self._initialize_cookie_settings_from_config() # Initialize proxy settings from config self.proxy_url = ConfigManager.get("proxy_url") self.geo_proxy_url = ConfigManager.get("geo_proxy_url") @@ -326,6 +325,15 @@ class YTSageApp(QMainWindow, FormatTableMixin, VideoInfoMixin): # Inherit from except Exception as e: logger.exception(f"Error playing notification sound: {e}") + def _initialize_cookie_settings_from_config(self) -> None: + """Initialize cookie settings - cookies are NOT auto-activated on startup. + User must explicitly click Apply in the dialog each session.""" + # Cookies always start inactive on app launch + # User must click Apply in Custom Options dialog to activate them + self.cookie_file_path = None + self.browser_cookies_option = None + logger.debug("Cookie settings initialized - no cookies active (user must apply manually)") + def init_ui(self) -> None: self.setWindowTitle(f"{_('app.title')} {_('app.version', version=self.version)}") self.setMinimumSize(900, 750) diff --git a/src/utils/ytsage_config_manager.py b/src/utils/ytsage_config_manager.py index 163ab9e..0ff3182 100644 --- a/src/utils/ytsage_config_manager.py +++ b/src/utils/ytsage_config_manager.py @@ -73,7 +73,11 @@ class ConfigManager: "download_path": str(USER_HOME_DIR / "Downloads"), "speed_limit_value": None, "speed_limit_unit_index": 0, + "cookie_source": "browser", # "browser" or "file" + "cookie_browser": "chrome", + "cookie_browser_profile": "", "cookie_file_path": None, + "cookie_active": False, # True only if user explicitly applied cookies "last_used_cookie_file": None, "proxy_url": None, "geo_proxy_url": None,