From 7f79fc8761f0ef46589e4ffba5fbc2264bebf794 Mon Sep 17 00:00:00 2001
From: Subhamoy Biswas <subhamoybiswas636@gmail.com>
Date: Thu, 10 Jul 2025 23:31:40 +0530
Subject: [PATCH] (feat): added global video/audio file format selection
 settings and other minor improvements

---
 src/App.tsx              | 21 ++++++++++
 src/pages/downloader.tsx | 18 +++++++-
 src/pages/settings.tsx   | 88 ++++++++++++++++++++++++++++++++++++----
 src/services/store.ts    |  8 ++++
 src/types/settings.ts    |  3 ++
 src/types/store.ts       |  4 ++
 6 files changed, 131 insertions(+), 11 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index a2cdc56..e10dc16 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -57,6 +57,8 @@ export default function App({ children }: { children: React.ReactNode }) {
   const PREFER_VIDEO_OVER_PLAYLIST = useSettingsPageStatesStore(state => state.settings.prefer_video_over_playlist);
   const USE_PROXY = useSettingsPageStatesStore(state => state.settings.use_proxy);
   const PROXY_URL = useSettingsPageStatesStore(state => state.settings.proxy_url);
+  const VIDEO_FORMAT = useSettingsPageStatesStore(state => state.settings.video_format);
+  const AUDIO_FORMAT = useSettingsPageStatesStore(state => state.settings.audio_format);
 
   const appWindow = getCurrentWebviewWindow()
   const navigate = useNavigate();
@@ -144,6 +146,13 @@ export default function App({ children }: { children: React.ReactNode }) {
     console.log('Video Metadata:', videoMetadata);
     videoMetadata = isPlaylist ? videoMetadata.entries[0] : videoMetadata;
 
+    const fileType = determineFileType(videoMetadata.vcodec, videoMetadata.acodec);
+
+    if (fileType !== 'unknown' && (VIDEO_FORMAT !== 'auto' || AUDIO_FORMAT !== 'auto')) {
+      if (VIDEO_FORMAT !== 'auto' && (fileType === 'video+audio' || fileType === 'video')) videoMetadata.ext = VIDEO_FORMAT;
+      if (AUDIO_FORMAT !== 'auto' && fileType === 'audio') videoMetadata.ext = AUDIO_FORMAT;
+    }
+
     const videoId = resumeState?.video_id || generateVideoId(videoMetadata.id, videoMetadata.webpage_url_domain);
     const playlistId = isPlaylist ? (resumeState?.playlist_id || generateVideoId(videoMetadata.playlist_id, videoMetadata.webpage_url_domain)) : null;
     const downloadId = resumeState?.download_id || generateDownloadId(videoMetadata.id, videoMetadata.webpage_url_domain);
@@ -173,6 +182,18 @@ export default function App({ children }: { children: React.ReactNode }) {
       args.push('--playlist-items', playlistIndex);
     }
 
+    if (fileType !== 'unknown' && (VIDEO_FORMAT !== 'auto' || AUDIO_FORMAT !== 'auto')) {
+      if (VIDEO_FORMAT !== 'auto' && fileType === 'video+audio') {
+        args.push('--merge-output-format', VIDEO_FORMAT);
+      }
+      if (VIDEO_FORMAT !== 'auto' && fileType === 'video') {
+        args.push('--remux-video', VIDEO_FORMAT);
+      }
+      if (AUDIO_FORMAT !== 'auto' && fileType === 'audio') {
+        args.push('--extract-audio', '--audio-format', AUDIO_FORMAT);
+      }
+    }
+
     if (resumeState) {
       args.push('--continue');
     } else {
diff --git a/src/pages/downloader.tsx b/src/pages/downloader.tsx
index 12300ea..65d8b3c 100644
--- a/src/pages/downloader.tsx
+++ b/src/pages/downloader.tsx
@@ -7,7 +7,7 @@ import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { useToast } from "@/hooks/use-toast";
 import { useAppContext } from "@/providers/appContextProvider";
-import { useCurrentVideoMetadataStore, useDownloaderPageStatesStore } from "@/services/store";
+import { useCurrentVideoMetadataStore, useDownloaderPageStatesStore, useSettingsPageStatesStore } from "@/services/store";
 import { determineFileType, fileFormatFilter, formatBitrate, formatDurationString, formatFileSize, formatReleaseDate, formatYtStyleCount, isObjEmpty, sortByBitrate } from "@/utils";
 import { Calendar, Clock, DownloadCloud, Eye, Info, Loader2, Music, ThumbsUp, Video, File, ListVideo, PackageSearch } from "lucide-react";
 import { FormatSelectionGroup, FormatSelectionGroupItem } from "@/components/custom/formatSelectionGroup";
@@ -50,6 +50,9 @@ export default function DownloaderPage() {
     const setSelctedDownloadFormat = useDownloaderPageStatesStore((state) => state.setSelctedDownloadFormat);
     const setSelectedSubtitles = useDownloaderPageStatesStore((state) => state.setSelectedSubtitles);
     const setSelectedPlaylistVideoIndex = useDownloaderPageStatesStore((state) => state.setSelectedPlaylistVideoIndex);
+
+    const videoFormat = useSettingsPageStatesStore(state => state.settings.video_format);
+    const audioFormat = useSettingsPageStatesStore(state => state.settings.audio_format);
     
     const audioOnlyFormats = videoMetadata?._type === 'video' ? sortByBitrate(videoMetadata?.formats.filter(fileFormatFilter('audio'))) : videoMetadata?._type === 'playlist' ? sortByBitrate(videoMetadata?.entries[Number(selectedPlaylistVideoIndex) - 1].formats.filter(fileFormatFilter('audio'))) : [];
     const videoOnlyFormats = videoMetadata?._type === 'video' ? sortByBitrate(videoMetadata?.formats.filter(fileFormatFilter('video'))) : videoMetadata?._type === 'playlist' ? sortByBitrate(videoMetadata?.entries[Number(selectedPlaylistVideoIndex) - 1].formats.filter(fileFormatFilter('video'))) : [];
@@ -105,6 +108,17 @@ export default function DownloaderPage() {
     const containerRef = useRef<HTMLDivElement>(null);
     const bottomBarRef = useRef<HTMLDivElement>(null);
 
+    let selectedFormatExtensionMsg = 'Auto - unknown';
+    if (selectedFormat?.ext) {
+        if ((selectedFormatFileType === 'video+audio' || selectedFormatFileType === 'video') && videoFormat !== 'auto') {
+            selectedFormatExtensionMsg = `Forced - ${videoFormat.toUpperCase()}`;
+        } else if (selectedFormatFileType === 'audio' && audioFormat !== 'auto') {
+            selectedFormatExtensionMsg = `Forced - ${audioFormat.toUpperCase()}`;
+        } else {
+            selectedFormatExtensionMsg = `Auto - ${selectedFormat.ext.toUpperCase()}`;
+        }
+    }
+
     const searchForm = useForm<z.infer<typeof searchFormSchema>>({
         resolver: zodResolver(searchFormSchema),
         defaultValues: {
@@ -596,7 +610,7 @@ export default function DownloaderPage() {
                         </div>
                         <div className="flex flex-col gap-1">
                             <span className="text-sm text-nowrap max-w-[30rem] xl:max-w-[50rem] overflow-hidden text-ellipsis">{videoMetadata._type === 'video' ? videoMetadata.title : videoMetadata._type === 'playlist' ? videoMetadata.entries[Number(selectedPlaylistVideoIndex) - 1].title : 'Unknown' }</span>
-                            <span className="text-xs text-muted-foreground">{selectedFormat?.ext ? selectedFormat.ext.toUpperCase() : 'unknown'} ({selectedFormat?.resolution ? selectedFormat.resolution : 'unknown'}) {selectedFormat?.dynamic_range && selectedFormat.dynamic_range !== 'SDR' ? selectedFormat.dynamic_range : null } {selectedSubtitles.length > 0 ? `• ESUB` : null} • {selectedFormat?.filesize_approx ? formatFileSize(selectedFormat?.filesize_approx) : 'unknown filesize'}</span>
+                            <span className="text-xs text-muted-foreground">{selectedFormatExtensionMsg} ({selectedFormat?.resolution ? selectedFormat.resolution : 'unknown'}) {selectedFormat?.dynamic_range && selectedFormat.dynamic_range !== 'SDR' ? selectedFormat.dynamic_range : null } {selectedSubtitles.length > 0 ? `• ESUB` : null} • {selectedFormat?.filesize_approx ? formatFileSize(selectedFormat?.filesize_approx) : 'unknown filesize'}</span>
                         </div>
                     </div>
                     <Button
diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
index 85f4068..7b6cb61 100644
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -7,7 +7,7 @@ import { Switch } from "@/components/ui/switch";
 import { Label } from "@/components/ui/label";
 import { Button } from "@/components/ui/button";
 import { useToast } from "@/hooks/use-toast";
-import { ArrowDownToLine, ArrowRight, EthernetPort, ExternalLink, Folder, FolderOpen, Loader2, LucideIcon, Monitor, Moon, Radio, RotateCcw, RotateCw, Sun, Terminal, WandSparkles, Wifi, Wrench } from "lucide-react";
+import { ArrowDownToLine, ArrowRight, EthernetPort, ExternalLink, FileVideo, Folder, FolderOpen, Loader2, LucideIcon, Monitor, Moon, Radio, RotateCcw, RotateCw, Sun, Terminal, WandSparkles, Wifi, Wrench } from "lucide-react";
 import { cn } from "@/lib/utils";
 import { useEffect } from "react";
 import { useTheme } from "@/providers/themeProvider";
@@ -23,6 +23,7 @@ import { Form, FormControl, FormField, FormItem, FormMessage } from "@/component
 import { invoke } from "@tauri-apps/api/core";
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from "@/components/ui/alert-dialog";
 import { SlidingButton } from "@/components/custom/slidingButton";
+import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
 
 const websocketPortSchema = z.object({
     port: z.coerce.number({
@@ -44,7 +45,11 @@ export default function SettingsPage() {
     const { setTheme } = useTheme();
 
     const activeTab = useSettingsPageStatesStore(state => state.activeTab);
+    const activeSubAppTab = useSettingsPageStatesStore(state => state.activeSubAppTab);
+    const activeSubExtTab = useSettingsPageStatesStore(state => state.activeSubExtTab);
     const setActiveTab = useSettingsPageStatesStore(state => state.setActiveTab);
+    const setActiveSubAppTab = useSettingsPageStatesStore(state => state.setActiveSubAppTab);
+    const setActiveSubExtTab = useSettingsPageStatesStore(state => state.setActiveSubExtTab);
 
     const isUsingDefaultSettings = useSettingsPageStatesStore(state => state.isUsingDefaultSettings);
     const ytDlpVersion = useSettingsPageStatesStore(state => state.ytDlpVersion);
@@ -57,6 +62,8 @@ export default function SettingsPage() {
     const preferVideoOverPlaylist = useSettingsPageStatesStore(state => state.settings.prefer_video_over_playlist);
     const useProxy = useSettingsPageStatesStore(state => state.settings.use_proxy);
     const proxyUrl = useSettingsPageStatesStore(state => state.settings.proxy_url);
+    const videoFormat = useSettingsPageStatesStore(state => state.settings.video_format);
+    const audioFormat = useSettingsPageStatesStore(state => state.settings.audio_format);
     const websocketPort = useSettingsPageStatesStore(state => state.settings.websocket_port);
     const isChangingWebSocketPort = useSettingsPageStatesStore(state => state.isChangingWebSocketPort);
     const setIsChangingWebSocketPort = useSettingsPageStatesStore(state => state.setIsChangingWebSocketPort);
@@ -269,9 +276,10 @@ export default function SettingsPage() {
                         </div>
                     </Card>
                     <Tabs
-                    orientation="vertical"
-                    defaultValue="general"
                     className="w-full flex flex-row items-start gap-4 mt-10"
+                    orientation="vertical"
+                    value={activeSubAppTab}
+                    onValueChange={setActiveSubAppTab}
                     >
                         <TabsList className="shrink-0 grid grid-cols-1 gap-1 p-0 bg-background min-w-45">
                             <TabsTrigger
@@ -289,6 +297,11 @@ export default function SettingsPage() {
                                 value="folders"
                                 className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
                             ><Folder className="size-4" /> Folders</TabsTrigger>
+                            <TabsTrigger
+                                key="formats"
+                                value="formats"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><FileVideo className="size-4" /> Formats</TabsTrigger>
                             <TabsTrigger
                                 key="network"
                                 value="network"
@@ -296,7 +309,7 @@ export default function SettingsPage() {
                             ><Wifi className="size-4" /> Network</TabsTrigger>
                         </TabsList>
                         <div className="min-h-full flex flex-col max-w-[55%] w-full border-l border-border pl-4">
-                            <TabsContent key="general" value="general" className="flex flex-col gap-4 min-h-[150px]">
+                            <TabsContent key="general" value="general" className="flex flex-col gap-4 min-h-[190px]">
                                 <div className="max-parallel-downloads">
                                     <h3 className="font-semibold">Max Parallel Downloads</h3>
                                     <p className="text-xs text-muted-foreground mb-3">Set maximum number of allowed parallel downloads</p>
@@ -320,7 +333,7 @@ export default function SettingsPage() {
                                     />
                                 </div>
                             </TabsContent>
-                            <TabsContent key="appearance" value="appearance" className="flex flex-col gap-4 min-h-[150px]">
+                            <TabsContent key="appearance" value="appearance" className="flex flex-col gap-4 min-h-[190px]">
                                 <div className="app-theme">
                                     <h3 className="font-semibold">Theme</h3>
                                     <p className="text-xs text-muted-foreground mb-3">Choose app interface theme</p>
@@ -343,7 +356,7 @@ export default function SettingsPage() {
                                     </div>
                                 </div>
                             </TabsContent>
-                            <TabsContent key="folders" value="folders" className="flex flex-col gap-4 min-h-[150px]">
+                            <TabsContent key="folders" value="folders" className="flex flex-col gap-4 min-h-[190px]">
                                 <div className="download-dir">
                                     <h3 className="font-semibold">Download Folder</h3>
                                     <p className="text-xs text-muted-foreground mb-3">Set default download folder (directory)</p>
@@ -376,7 +389,63 @@ export default function SettingsPage() {
                                     </div>
                                 </div>
                             </TabsContent>
-                            <TabsContent key="network" value="network" className="flex flex-col gap-4 min-h-[150px]">
+                            <TabsContent key="formats" value="formats" className="flex flex-col gap-4 min-h-[190px]">
+                                <div className="video-format">
+                                    <h3 className="font-semibold">Video Format</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Choose in which format the final video file will be saved</p>
+                                    <RadioGroup
+                                    orientation="horizontal"
+                                    className="flex items-center gap-4"
+                                    value={videoFormat}
+                                    onValueChange={(value) => saveSettingsKey('video_format', value)}
+                                    >
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="auto" id="v-auto" />
+                                            <Label htmlFor="v-auto">Auto (Default)</Label>
+                                        </div>
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="mp4" id="v-mp4" />
+                                            <Label htmlFor="v-mp4">MP4</Label>
+                                        </div>
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="webm" id="v-webm" />
+                                            <Label htmlFor="v-webm">WEBM</Label>
+                                        </div>
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="mkv" id="v-mkv" />
+                                            <Label htmlFor="v-mkv">MKV</Label>
+                                        </div>
+                                    </RadioGroup>
+                                </div>
+                                <div className="audio-format">
+                                    <h3 className="font-semibold">Audio Format</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Choose in which format the final audio file will be saved</p>
+                                    <RadioGroup
+                                    orientation="horizontal"
+                                    className="flex items-center gap-4"
+                                    value={audioFormat}
+                                    onValueChange={(value) => saveSettingsKey('audio_format', value)}
+                                    >
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="auto" id="a-auto" />
+                                            <Label htmlFor="a-auto">Auto (Default)</Label>
+                                        </div>
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="m4a" id="a-m4a" />
+                                            <Label htmlFor="a-m4a">M4A</Label>
+                                        </div>
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="opus" id="a-opus" />
+                                            <Label htmlFor="a-opus">OPUS</Label>
+                                        </div>
+                                        <div className="flex items-center gap-3">
+                                            <RadioGroupItem value="mp3" id="a-mp3" />
+                                            <Label htmlFor="a-mp3">MP3</Label>
+                                        </div>
+                                    </RadioGroup>
+                                </div>
+                            </TabsContent>
+                            <TabsContent key="network" value="network" className="flex flex-col gap-4 min-h-[190px]">
                                 <div className="proxy">
                                     <h3 className="font-semibold">Proxy</h3>
                                     <p className="text-xs text-muted-foreground mb-3">Use proxy for downloads, Unblocks blocked sites in your region (Download speed may affect, Some sites may not work)</p>
@@ -474,9 +543,10 @@ export default function SettingsPage() {
                         </div>
                     </Card>
                     <Tabs
-                    orientation="vertical"
-                    defaultValue="install"
                     className="w-full flex flex-row items-start gap-4 mt-10"
+                    orientation="vertical"
+                    value={activeSubExtTab}
+                    onValueChange={setActiveSubExtTab}
                     >
                         <TabsList className="shrink-0 grid grid-cols-1 gap-1 p-0 bg-background min-w-45">
                             <TabsTrigger
diff --git a/src/services/store.ts b/src/services/store.ts
index 35d8514..64cd6be 100644
--- a/src/services/store.ts
+++ b/src/services/store.ts
@@ -94,6 +94,8 @@ export const useDownloadActionStatesStore = create<DownloadActionStatesStore>((s
 
 export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set) => ({
     activeTab: 'app',
+    activeSubAppTab: 'general',
+    activeSubExtTab: 'install',
     appVersion: null,
     isFetchingAppVersion: false,
     ytDlpVersion: null,
@@ -108,6 +110,8 @@ export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set)
         max_parallel_downloads: 2,
         use_proxy: false,
         proxy_url: '',
+        video_format: 'auto',
+        audio_format: 'auto',
         websocket_port: 53511
     },
     isUsingDefaultSettings: true,
@@ -118,6 +122,8 @@ export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set)
     isUpdatingApp: false,
     appUpdateDownloadProgress: 0,
     setActiveTab: (tab) => set(() => ({ activeTab: tab })),
+    setActiveSubAppTab: (tab) => set(() => ({ activeSubAppTab: tab })),
+    setActiveSubExtTab: (tab) => set(() => ({ activeSubExtTab: tab })),
     setAppVersion: (version) => set(() => ({ appVersion: version })),
     setIsFetchingAppVersion: (isFetching) => set(() => ({ isFetchingAppVersion: isFetching })),
     setYtDlpVersion: (version) => set(() => ({ ytDlpVersion: version })),
@@ -140,6 +146,8 @@ export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set)
             max_parallel_downloads: 2,
             use_proxy: false,
             proxy_url: '',
+            video_format: 'auto',
+            audio_format: 'auto',
             websocket_port: 53511
         },
         isUsingDefaultSettings: true
diff --git a/src/types/settings.ts b/src/types/settings.ts
index 9ac78d0..3365ae8 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -12,5 +12,8 @@ export interface Settings {
     prefer_video_over_playlist: boolean;
     use_proxy: boolean;
     proxy_url: string;
+    video_format: string;
+    audio_format: string;
+    // extension settings
     websocket_port: number;
 }
\ No newline at end of file
diff --git a/src/types/store.ts b/src/types/store.ts
index 601f729..4e4e172 100644
--- a/src/types/store.ts
+++ b/src/types/store.ts
@@ -58,6 +58,8 @@ export interface DownloadActionStatesStore {
 
 export interface SettingsPageStatesStore {
     activeTab: string;
+    activeSubAppTab: string;
+    activeSubExtTab: string;
     appVersion: string | null;
     isFetchingAppVersion: boolean;
     ytDlpVersion: string | null;
@@ -72,6 +74,8 @@ export interface SettingsPageStatesStore {
     isUpdatingApp: boolean;
     appUpdateDownloadProgress: number;
     setActiveTab: (tab: string) => void;
+    setActiveSubAppTab: (tab: string) => void;
+    setActiveSubExtTab: (tab: string) => void;
     setAppVersion: (version: string | null) => void;
     setIsFetchingAppVersion: (isFetching: boolean) => void;
     setYtDlpVersion: (version: string | null) => void;