Add output format selection to settings

Introduces new settings for forcing output format when merging videos, allowing users to select a preferred format (mp4, webm, mkv). Updates all language files with relevant translations, adds UI controls in the settings dialog, persists settings via ConfigManager, and passes options through the download workflow to yt-dlp.

src/core/ytsage_downloader.py

@@ -58,6 +58,8 @@ class DownloadThread(QThread):
         force_keyframes=False,
         proxy_url=None,
         geo_proxy_url=None,
+        force_output_format=False,
+        preferred_output_format="mp4",
     ) -> None:
         super().__init__()
         self.url = url
@@ -81,6 +83,8 @@ class DownloadThread(QThread):
         self.force_keyframes = force_keyframes
         self.proxy_url = proxy_url
         self.geo_proxy_url = geo_proxy_url
+        self.force_output_format = force_output_format
+        self.preferred_output_format = preferred_output_format
         self.paused = False
         self.cancelled = False
         self.process = None
@@ -189,6 +193,17 @@ class DownloadThread(QThread):
             res_value = self.resolution if self.resolution else "720"  # Default to 720p if no resolution specified
             cmd.extend(["-S", f"res:{res_value}"])
 
+        # Force output format if enabled and merging is needed
+        if self.force_output_format and not self.is_audio_only:
+            if self.format_has_audio:
+                # Progressive format (video with audio) - use remux to convert container
+                cmd.extend(["--remux-video", self.preferred_output_format])
+                logger.debug(f"Using --remux-video to force progressive format to: {self.preferred_output_format}")
+            else:
+                # Merging video+audio - force merge output format
+                cmd.extend(["--merge-output-format", self.preferred_output_format])
+                logger.debug(f"Using --merge-output-format to force merged format to: {self.preferred_output_format}")
+
         # Output template with resolution in filename
         # Use string concatenation instead of Path.joinpath to avoid Path object issues
         base_path = self.path.as_posix()

src/gui/ytsage_gui_dialogs/ytsage_dialogs_settings.py

@@ -36,6 +36,7 @@ from src.core.ytsage_utils import (
 from src.gui.ytsage_gui_dialogs.ytsage_dialogs_update import YTDLPUpdateDialog
 from src.utils.ytsage_logger import logger
 from src.utils.ytsage_localization import _
+from src.utils.ytsage_config_manager import ConfigManager
 
 
 class DownloadSettingsDialog(QDialog):
@@ -199,6 +200,47 @@ class DownloadSettingsDialog(QDialog):
         speed_group_box.setLayout(speed_layout)
         layout.addWidget(speed_group_box)
 
+        # --- Output Format Settings Section ---
+        output_format_group_box = QGroupBox(_("settings.output_format_settings"))
+        output_format_layout = QVBoxLayout()
+
+        # Load current format settings from ConfigManager
+        self.force_format_enabled = ConfigManager.get("force_output_format") or False
+        self.preferred_format_value = ConfigManager.get("preferred_output_format") or "mp4"
+
+        # Enable/Disable force output format checkbox
+        self.force_format_checkbox = QCheckBox(_("settings.force_output_format"))
+        self.force_format_checkbox.setChecked(self.force_format_enabled)
+        output_format_layout.addWidget(self.force_format_checkbox)
+
+        # Format selection layout
+        format_select_layout = QHBoxLayout()
+        format_label = QLabel(_("settings.preferred_format"))
+        format_label.setStyleSheet("color: #ffffff; margin-top: 5px;")
+        format_select_layout.addWidget(format_label)
+
+        self.format_combo = QComboBox()
+        self.format_combo.addItems([
+            _("settings.format_mp4"),
+            _("settings.format_webm"),
+            _("settings.format_mkv")
+        ])
+        # Set current selection based on saved format
+        format_index_map = {"mp4": 0, "webm": 1, "mkv": 2}
+        self.format_combo.setCurrentIndex(format_index_map.get(self.preferred_format_value, 0))
+        format_select_layout.addWidget(self.format_combo)
+        format_select_layout.addStretch()
+        output_format_layout.addLayout(format_select_layout)
+
+        # Help text
+        help_label = QLabel(_("settings.force_format_help"))
+        help_label.setWordWrap(True)
+        help_label.setStyleSheet("color: #cccccc; margin: 5px; font-size: 10px;")
+        output_format_layout.addWidget(help_label)
+
+        output_format_group_box.setLayout(output_format_layout)
+        layout.addWidget(output_format_group_box)
+
         # --- Auto-Update yt-dlp Section ---
         auto_update_group_box = QGroupBox(_("settings.auto_update_ytdlp"))
         auto_update_layout = QVBoxLayout()
@@ -278,6 +320,15 @@ class DownloadSettingsDialog(QDialog):
         """Returns the index of the selected speed limit unit."""
         return self.speed_limit_unit.currentIndex()
 
+    def get_force_format_enabled(self) -> bool:
+        """Returns whether force output format is enabled."""
+        return self.force_format_checkbox.isChecked()
+
+    def get_preferred_format(self) -> str:
+        """Returns the selected preferred format (lowercase)."""
+        format_map = {0: "mp4", 1: "webm", 2: "mkv"}
+        return format_map.get(self.format_combo.currentIndex(), "mp4")
+
     def _create_styled_message_box(self, icon, title, text) -> QMessageBox:
         """Create a styled QMessageBox that matches the app theme."""
         msg_box = QMessageBox(self)
@@ -334,11 +385,17 @@ class DownloadSettingsDialog(QDialog):
         return enabled, frequency
 
     def accept(self) -> None:
-        """Override accept to save auto-update settings."""
+        """Override accept to save auto-update and format settings."""
         try:
             # Save auto-update settings
             enabled, frequency = self.get_auto_update_settings()
 
+            # Save output format settings
+            force_format = self.get_force_format_enabled()
+            preferred_format = self.get_preferred_format()
+            ConfigManager.set("force_output_format", force_format)
+            ConfigManager.set("preferred_output_format", preferred_format)
+
             if update_auto_update_settings(enabled, frequency):
                 QMessageBox.information(
                     self,

src/gui/ytsage_gui_main.py

@@ -124,6 +124,9 @@ class YTSageApp(QMainWindow, FormatTableMixin, VideoInfoMixin):  # Inherit from
         self.speed_limit_unit_index = 0  # Store speed limit unit index (0: KB/s, 1: MB/s)
         self.download_section = None
         self.force_keyframes = False
+        # Initialize output format settings
+        self.force_output_format = ConfigManager.get("force_output_format") or False
+        self.preferred_output_format = ConfigManager.get("preferred_output_format") or "mp4"
 
         self.init_ui()
         self.setStyleSheet(
@@ -768,8 +771,18 @@ class YTSageApp(QMainWindow, FormatTableMixin, VideoInfoMixin):  # Inherit from
                     f"Speed limit updated to: {self.speed_limit_value} {['KB/s', 'MB/s'][self.speed_limit_unit_index] if self.speed_limit_value else 'None'}"
                 )
 
+            # Update Output Format Settings
+            new_force_format = dialog.get_force_format_enabled()
+            new_preferred_format = dialog.get_preferred_format()
+            format_changed = False
+            if new_force_format != self.force_output_format or new_preferred_format != self.preferred_output_format:
+                self.force_output_format = new_force_format
+                self.preferred_output_format = new_preferred_format
+                format_changed = True
+                logger.info(f"Output format settings updated - Force: {self.force_output_format}, Preferred: {self.preferred_output_format}")
+
             # Update Tooltip if anything changed
-            if path_changed or limit_changed:
+            if path_changed or limit_changed or format_changed:
                 limit_text = "None"
                 if self.speed_limit_value:
                     limit_text = f"{self.speed_limit_value} {['KB/s', 'MB/s'][self.speed_limit_unit_index]}"
@@ -876,6 +889,8 @@ class YTSageApp(QMainWindow, FormatTableMixin, VideoInfoMixin):  # Inherit from
             force_keyframes=self.force_keyframes,  # Pass the force keyframes setting
             proxy_url=self.proxy_url,  # Pass the proxy URL
             geo_proxy_url=self.geo_proxy_url,  # Pass the geo-verification proxy URL
+            force_output_format=self.force_output_format,  # Pass force output format setting
+            preferred_output_format=self.preferred_output_format,  # Pass preferred format
         )
 
         # Connect signals

src/utils/ytsage_config_manager.py

@@ -80,6 +80,8 @@ class ConfigManager:
         "auto_update_frequency": "daily",
         "last_update_check": 0,
         "language": "en",
+        "force_output_format": False,
+        "preferred_output_format": "mp4",
         "cached_versions": {
             "ytdlp": {"version": None, "path": None, "last_check": 0, "path_mtime": 0},
             "ffmpeg": {"version": None, "path": None, "last_check": 0, "path_mtime": 0},