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.
This commit is contained in:
oop7
2025-11-28 18:18:57 +02:00
parent fc719a8cc8
commit b58b1a6857
3 changed files with 53 additions and 21 deletions
@@ -644,28 +644,34 @@ class CustomOptionsDialog(QDialog):
self._initialize_proxy_settings() self._initialize_proxy_settings()
def _initialize_cookie_settings(self) -> None: def _initialize_cookie_settings(self) -> None:
"""Initialize the dialog with current cookie settings from parent""" """Initialize the dialog with current cookie settings from config"""
if hasattr(self._parent, "browser_cookies_option") and self._parent.browser_cookies_option: # Load saved cookie settings from ConfigManager
# Browser cookies are active saved_source = ConfigManager.get("cookie_source") or "browser"
self.cookie_browser_radio.setChecked(True) saved_browser = ConfigManager.get("cookie_browser") or "chrome"
browser_parts = self._parent.browser_cookies_option.split(":") saved_profile = ConfigManager.get("cookie_browser_profile") or ""
browser = browser_parts[0] saved_file_path = ConfigManager.get("cookie_file_path")
profile = browser_parts[1] if len(browser_parts) > 1 else ""
# Set browser selection # Set the cookie source radio button
index = self.browser_combo.findText(browser) if saved_source == "file":
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
self.cookie_file_radio.setChecked(True) self.cookie_file_radio.setChecked(True)
else: else:
# No cookies configured - browser extraction is the recommended default
self.cookie_browser_radio.setChecked(True) 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: def _update_cookies_active_status(self) -> None:
"""Update the status indicator showing if cookies are currently active""" """Update the status indicator showing if cookies are currently active"""
if hasattr(self._parent, "browser_cookies_option") and self._parent.browser_cookies_option: if hasattr(self._parent, "browser_cookies_option") and self._parent.browser_cookies_option:
@@ -713,8 +719,18 @@ class CustomOptionsDialog(QDialog):
self._parent.cookie_file_path = None self._parent.cookie_file_path = None
self._parent.browser_cookies_option = 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: if cookie_path:
self._parent.cookie_file_path = 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}") logger.info(f"Applied cookie file: {self._parent.cookie_file_path}")
QMessageBox.information( QMessageBox.information(
self, self,
@@ -723,6 +739,7 @@ class CustomOptionsDialog(QDialog):
) )
elif browser_cookies: elif browser_cookies:
self._parent.browser_cookies_option = 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}") logger.info(f"Applied browser cookies: {self._parent.browser_cookies_option}")
QMessageBox.information( QMessageBox.information(
self, self,
@@ -731,6 +748,9 @@ class CustomOptionsDialog(QDialog):
) )
else: else:
# Clear cookies # 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") logger.info("Cookies cleared")
QMessageBox.information( QMessageBox.information(
self, self,
+11 -3
View File
@@ -112,9 +112,8 @@ class YTSageApp(QMainWindow, FormatTableMixin, VideoInfoMixin): # Inherit from
self.thumbnail_image = None self.thumbnail_image = None
self.video_url = "" self.video_url = ""
self.selected_subtitles = [] # Initialize selected subtitles list self.selected_subtitles = [] # Initialize selected subtitles list
# Initialize cookie settings - ensure they start clean # Initialize cookie settings from saved config
self.cookie_file_path = None self._initialize_cookie_settings_from_config()
self.browser_cookies_option = None
# Initialize proxy settings from config # Initialize proxy settings from config
self.proxy_url = ConfigManager.get("proxy_url") self.proxy_url = ConfigManager.get("proxy_url")
self.geo_proxy_url = ConfigManager.get("geo_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: except Exception as e:
logger.exception(f"Error playing notification sound: {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: def init_ui(self) -> None:
self.setWindowTitle(f"{_('app.title')} {_('app.version', version=self.version)}") self.setWindowTitle(f"{_('app.title')} {_('app.version', version=self.version)}")
self.setMinimumSize(900, 750) self.setMinimumSize(900, 750)
+4
View File
@@ -73,7 +73,11 @@ class ConfigManager:
"download_path": str(USER_HOME_DIR / "Downloads"), "download_path": str(USER_HOME_DIR / "Downloads"),
"speed_limit_value": None, "speed_limit_value": None,
"speed_limit_unit_index": 0, "speed_limit_unit_index": 0,
"cookie_source": "browser", # "browser" or "file"
"cookie_browser": "chrome",
"cookie_browser_profile": "",
"cookie_file_path": None, "cookie_file_path": None,
"cookie_active": False, # True only if user explicitly applied cookies
"last_used_cookie_file": None, "last_used_cookie_file": None,
"proxy_url": None, "proxy_url": None,
"geo_proxy_url": None, "geo_proxy_url": None,