(chore): reverting back to older version of recharts and zod for now due to breaking changes

.gitignore

@@ -11,6 +11,7 @@ node_modules
 dist
 dist-ssr
 *.local
+.github/workflows/.secrets
 
 # Editor directories and files
 .vscode/*

CHANGELOG.md

@@ -1,14 +1,27 @@
 ### ✨ Changelog
 
-- Migrated to React 19, TailwindCSS 4 and ShadcnUI 2.6
+- DOWNLOADER: Introduced 'Combine' download mode (Now, You can combine a video and audio stream of your choice)
-- Added new 'Extension' tab
+- SETTINGS: Added global video/audio file format selection option (Available Formats: MP4, WEBM, MKV, M4A, OPUS, MP3)
-- Fixed: Default download directory not updating
+- SETTINGS: Added video/audio file metadata embeding option
-- Fixed: MacOS large dock icon (#1)
+- SETTINGS: Added thumbnail embeding option in audio files (as cover art)
-- Other minor fixes and improvements
+- SETTINGS: Added re-encode video over remuxing option (when file format convertion is needed)
+- SETTINGS: Added strict downloadablity check option
+- SETTINGS: Added download speed rate limit option
+- SETTINGS: Added download max retries option
+- SETTINGS: Added temporary download folder cleanup option
+- UI: Improved 'Settings' ui/layout with categories (tabs)
+- UI: Merged 'Extension' sidebar tab within 'Settings' (Settings > Extension > Install)
+- UI: Improved 'Library' ui/layout with tabs
+- UI: Added 'Stop' all ongoing downloads button in 'Library'
+- UI: Renamed settings 'General' tab to 'Application' ('General' is now a sub-category of 'Application' tab)
+- UI: Improved all alert dialog messages (for better undestanding/UX)
+- FIXED: Unexpected crashing of yt-dlp causing downloads to stuck on a unrevocable state (Now, coresponding download will be 'paused' on detection of unexpected yt-dlp crash)
+- FIXED: Broken app updater progress bar/percentage (also improved the update notification card)
+- Lots of other minor fixes and improvements
 
 ### 📝 Notes
 
-> ⚠️ Linux Users: Make sure yt-dlp is not installed in your distro (otherwise you will get package installation conflict)
+> ⚠️ Linux Users: Make sure yt-dlp is not installed in your distro (otherwise you will get package installation conflict). Don't worry, You can still use yt-dlp cli as before (the only difference is that now it will be installed and auto-updated by neo-dlp, which You can also disable from neo-dlp Settings if you don't want to auto-update yt-dlp)
 
 > This is an Un-Signed Build (Windows doesn't trust this Certificate so, it may flag this as malicious software, in that case, disable Windows SmartScreen and Defender, install it, and then re-enable them)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "neodlp",
   "private": true,
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -38,50 +38,50 @@
     "@radix-ui/react-toggle": "^1.1.9",
     "@radix-ui/react-toggle-group": "^1.1.10",
     "@radix-ui/react-tooltip": "^1.2.7",
-    "@tanstack/react-query": "^5.80.7",
+    "@tanstack/react-query": "^5.83.0",
-    "@tanstack/react-query-devtools": "^5.80.7",
+    "@tanstack/react-query-devtools": "^5.83.0",
     "@tauri-apps/api": "^2",
-    "@tauri-apps/plugin-dialog": "^2.2.2",
+    "@tauri-apps/plugin-dialog": "^2.3.0",
-    "@tauri-apps/plugin-fs": "^2.3.0",
+    "@tauri-apps/plugin-fs": "^2.4.0",
-    "@tauri-apps/plugin-opener": "^2.2.7",
+    "@tauri-apps/plugin-opener": "^2.4.0",
-    "@tauri-apps/plugin-os": "^2.2.1",
+    "@tauri-apps/plugin-os": "^2.3.0",
-    "@tauri-apps/plugin-process": "^2.2.1",
+    "@tauri-apps/plugin-process": "^2.3.0",
-    "@tauri-apps/plugin-shell": "^2.2.1",
+    "@tauri-apps/plugin-shell": "^2.3.0",
-    "@tauri-apps/plugin-sql": "^2.2.0",
+    "@tauri-apps/plugin-sql": "^2.3.0",
-    "@tauri-apps/plugin-updater": "^2.7.1",
+    "@tauri-apps/plugin-updater": "^2.9.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
     "embla-carousel-react": "^8.6.0",
     "input-otp": "^1.4.2",
-    "lucide-react": "^0.515.0",
+    "lucide-react": "^0.525.0",
     "next-themes": "^0.4.6",
     "react": "^19.1.0",
-    "react-day-picker": "^9.7.0",
+    "react-day-picker": "^9.8.0",
     "react-dom": "^19.1.0",
-    "react-hook-form": "^7.57.0",
+    "react-hook-form": "^7.60.0",
-    "react-resizable-panels": "^3.0.2",
+    "react-resizable-panels": "^3.0.3",
-    "react-router-dom": "^7.6.2",
+    "react-router-dom": "^7.6.3",
-    "recharts": "^2.15.3",
+    "recharts": "^2.15.4",
-    "sonner": "^2.0.5",
+    "sonner": "^2.0.6",
     "tailwind-merge": "^3.3.1",
     "vaul": "^1.1.2",
-    "zod": "^3.25.64",
+    "zod": "^3.25.76",
-    "zustand": "^5.0.5"
+    "zustand": "^5.0.6"
   },
   "devDependencies": {
-    "@tailwindcss/postcss": "^4.1.10",
+    "@tailwindcss/postcss": "^4.1.11",
-    "@tailwindcss/vite": "^4.1.10",
+    "@tailwindcss/vite": "^4.1.11",
     "@tauri-apps/cli": "^2",
-    "@types/node": "^24.0.1",
+    "@types/node": "^24.0.13",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
-    "@vitejs/plugin-react": "^4.5.2",
+    "@vitejs/plugin-react": "^4.6.0",
-    "postcss": "^8.5.5",
+    "postcss": "^8.5.6",
-    "tailwindcss": "^4.1.10",
+    "tailwindcss": "^4.1.11",
-    "tw-animate-css": "^1.3.4",
+    "tw-animate-css": "^1.3.5",
     "typescript": "~5.8.3",
-    "vite": "^6.3.5"
+    "vite": "^7.0.4"
   }
 }

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "neodlp"
-version = "0.1.1"
+version = "0.2.0"
 description = "NeoDLP"
 authors = ["neosubhamoy <hey@neosubhamoy.com>"]
 edition = "2021"

src-tauri/binaries/yt-dlp-x86_64-pc-windows-msvc.exe

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c20996d097127884243f4780d929b3769d55418c0efa9bd7a98999f387b5fbed
+oid sha256:f061f5be11e96c3764442b5339f91102316ac9a7eb8270f017e7912ed0384eba
-size 18113133
+size 18112457

src-tauri/resources/autostart/macos/autostart.plist

@@ -6,7 +6,7 @@
         <string>com.neosubhamoy.neodlp</string>
         <key>ProgramArguments</key>
         <array>
-            <string>/Applications/neodlp.app/Contents/MacOS/neodlp</string>
+            <string>/Applications/NeoDLP.app/Contents/MacOS/neodlp</string>
             <string>--hidden</string>
         </array>
         <key>RunAtLoad</key>

src-tauri/resources/msghost-manifest/linux/chrome.json

@@ -3,5 +3,5 @@
     "description": "NeoDLP MsgHost",
     "path": "/usr/bin/neodlp-msghost",
     "type": "stdio",
-    "allowed_origins": ["chrome-extension://mehopeailfjmiloiiohgicphlcgpompf/", "chrome-extension://agkddibgemhefmdhlnooiakfnhihhbdb/"]
+    "allowed_origins": ["chrome-extension://mehopeailfjmiloiiohgicphlcgpompf/"]
 }

src-tauri/resources/msghost-manifest/macos/chrome.json

@@ -3,5 +3,5 @@
     "description": "NeoDLP MsgHost",
     "path": "/Applications/NeoDLP.app/Contents/Resources/neodlp-msghost",
     "type": "stdio",
-    "allowed_origins": ["chrome-extension://mehopeailfjmiloiiohgicphlcgpompf/", "chrome-extension://agkddibgemhefmdhlnooiakfnhihhbdb/"]
+    "allowed_origins": ["chrome-extension://mehopeailfjmiloiiohgicphlcgpompf/"]
 }

src-tauri/resources/msghost-manifest/windows/chrome.json

@@ -3,5 +3,5 @@
     "description": "NeoDLP MsgHost",
     "path": "neodlp-msghost.exe",
     "type": "stdio",
-    "allowed_origins": ["chrome-extension://mehopeailfjmiloiiohgicphlcgpompf/", "chrome-extension://agkddibgemhefmdhlnooiakfnhihhbdb/"]
+    "allowed_origins": ["chrome-extension://mehopeailfjmiloiiohgicphlcgpompf/"]
 }

src-tauri/tauri.conf.json

@@ -2,7 +2,7 @@
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "NeoDLP",
   "mainBinaryName": "neodlp",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "identifier": "com.neosubhamoy.neodlp",
   "build": {
     "beforeDevCommand": "npm run dev",

src/App.tsx

@@ -7,7 +7,7 @@ import { invoke } from "@tauri-apps/api/core";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { arch, exeExtension } from "@tauri-apps/plugin-os";
 import { downloadDir, join, resourceDir, tempDir } from "@tauri-apps/api/path";
-import { useBasePathsStore, useCurrentVideoMetadataStore, useDownloadStatesStore, useKvPairsStatesStore, useSettingsPageStatesStore } from "@/services/store";
+import { useBasePathsStore, useCurrentVideoMetadataStore, useDownloaderPageStatesStore, useDownloadStatesStore, useKvPairsStatesStore, useSettingsPageStatesStore } from "@/services/store";
 import { determineFileType, generateDownloadId, generateSafeFilePath, generateVideoId, isObjEmpty, parseProgressLine, sanitizeFilename } from "@/utils";
 import { Command } from "@tauri-apps/plugin-shell";
 import { RawVideoInfo } from "@/types/video";
@@ -25,8 +25,11 @@ import { useNavigate } from "react-router-dom";
 import { platform } from "@tauri-apps/plugin-os";
 import { useMacOsRegisterer } from "@/helpers/use-macos-registerer";
 import useAppUpdater from "@/helpers/use-app-updater";
+import { useToast } from "@/hooks/use-toast";
 
 export default function App({ children }: { children: React.ReactNode }) {
+  const { toast } = useToast();
+  
   const { data: downloadStates, isSuccess: isSuccessFetchingDownloadStates } = useFetchAllDownloadStates();
   const { data: settings, isSuccess: isSuccessFetchingSettings } = useFetchAllSettings();
   const { data: kvPairs, isSuccess: isSuccessFetchingKvPairs } = useFetchAllkVPairs();
@@ -53,10 +56,27 @@ export default function App({ children }: { children: React.ReactNode }) {
   const YTDLP_UPDATE_CHANNEL = useSettingsPageStatesStore(state => state.settings.ytdlp_update_channel);
   const APP_THEME = useSettingsPageStatesStore(state => state.settings.theme);
   const MAX_PARALLEL_DOWNLOADS = useSettingsPageStatesStore(state => state.settings.max_parallel_downloads);
+  const MAX_RETRIES = useSettingsPageStatesStore(state => state.settings.max_retries);
   const DOWNLOAD_DIR = useSettingsPageStatesStore(state => state.settings.download_dir);
   const PREFER_VIDEO_OVER_PLAYLIST = useSettingsPageStatesStore(state => state.settings.prefer_video_over_playlist);
+  const STRICT_DOWNLOADABILITY_CHECK = useSettingsPageStatesStore(state => state.settings.strict_downloadablity_check);
   const USE_PROXY = useSettingsPageStatesStore(state => state.settings.use_proxy);
   const PROXY_URL = useSettingsPageStatesStore(state => state.settings.proxy_url);
+  const USE_RATE_LIMIT = useSettingsPageStatesStore(state => state.settings.use_rate_limit);
+  const RATE_LIMIT = useSettingsPageStatesStore(state => state.settings.rate_limit);
+  const VIDEO_FORMAT = useSettingsPageStatesStore(state => state.settings.video_format);
+  const AUDIO_FORMAT = useSettingsPageStatesStore(state => state.settings.audio_format);
+  const ALWAYS_REENCODE_VIDEO = useSettingsPageStatesStore(state => state.settings.always_reencode_video);
+  const EMBED_VIDEO_METADATA = useSettingsPageStatesStore(state => state.settings.embed_video_metadata);
+  const EMBED_AUDIO_METADATA = useSettingsPageStatesStore(state => state.settings.embed_audio_metadata);
+  const EMBED_AUDIO_THUMBNAIL = useSettingsPageStatesStore(state => state.settings.embed_audio_thumbnail);
+
+  const isErrored = useDownloaderPageStatesStore((state) => state.isErrored);
+  const isErrorExpected = useDownloaderPageStatesStore((state) => state.isErrorExpected);
+  const erroredDownloadId = useDownloaderPageStatesStore((state) => state.erroredDownloadId);
+  const setIsErrored = useDownloaderPageStatesStore((state) => state.setIsErrored);
+  const setIsErrorExpected = useDownloaderPageStatesStore((state) => state.setIsErrorExpected);
+  const setErroredDownloadId = useDownloaderPageStatesStore((state) => state.setErroredDownloadId);
 
   const appWindow = getCurrentWebviewWindow()
   const navigate = useNavigate();
@@ -85,10 +105,12 @@ export default function App({ children }: { children: React.ReactNode }) {
   
   const fetchVideoMetadata = async (url: string, formatId?: string, playlistIndex?: string): Promise<RawVideoInfo | null> => {
     try {
-      const args = [url, '--dump-single-json'];
+      const args = [url, '--dump-single-json', '--no-warnings'];
       if (formatId) args.push('-f', formatId);
       if (playlistIndex) args.push('--playlist-items', playlistIndex);
       if (PREFER_VIDEO_OVER_PLAYLIST) args.push('--no-playlist');
+      if (STRICT_DOWNLOADABILITY_CHECK && !formatId) args.push('--check-all-formats');
+      if (STRICT_DOWNLOADABILITY_CHECK && formatId) args.push('--check-formats');
       if (USE_PROXY && PROXY_URL) args.push('--proxy', PROXY_URL);
       const command = Command.sidecar('binaries/yt-dlp', args);
 
@@ -127,6 +149,11 @@ export default function App({ children }: { children: React.ReactNode }) {
   };
   
   const startDownload = async (url: string, selectedFormat: string, selectedSubtitles?: string | null, resumeState?: DownloadState, playlistItems?: string) => {
+    // set error states to default
+    setIsErrored(false);
+    setIsErrorExpected(false);
+    setErroredDownloadId(null);
+
     console.log('Starting download:', { url, selectedFormat, selectedSubtitles, resumeState, playlistItems });
     if (!ffmpegPath || !tempDownloadDirPath || !downloadDirPath) {
       console.error('FFmpeg or download paths not found');
@@ -138,12 +165,24 @@ export default function App({ children }: { children: React.ReactNode }) {
     let videoMetadata = await fetchVideoMetadata(url, selectedFormat, isPlaylist && playlistIndex && typeof playlistIndex === 'string' ? playlistIndex : undefined);
     if (!videoMetadata) {
       console.error('Failed to fetch video metadata');
+      toast({
+        title: 'Download Failed',
+        description: 'yt-dlp failed to fetch video metadata. Please try again later.',
+        variant: 'destructive',
+      });
       return;
     }
 
     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);
@@ -163,6 +202,9 @@ export default function App({ children }: { children: React.ReactNode }) {
       '-f',
       selectedFormat,
       '--no-mtime',
+      '--no-warnings',
+      '--retries',
+      MAX_RETRIES.toString(),
     ];
 
     if (selectedSubtitles) {
@@ -173,6 +215,39 @@ 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') {
+        if (ALWAYS_REENCODE_VIDEO) {
+          args.push('--recode-video', VIDEO_FORMAT);
+        } else {
+          args.push('--merge-output-format', VIDEO_FORMAT);
+        }
+      }
+      if (VIDEO_FORMAT !== 'auto' && fileType === 'video') {
+        if (ALWAYS_REENCODE_VIDEO) {
+          args.push('--recode-video', VIDEO_FORMAT);
+        } else {
+        args.push('--remux-video', VIDEO_FORMAT);
+        }
+      }
+      if (AUDIO_FORMAT !== 'auto' && fileType === 'audio') {
+        args.push('--extract-audio', '--audio-format', AUDIO_FORMAT);
+      }
+    }
+
+    if (fileType !== 'unknown' && (EMBED_VIDEO_METADATA || EMBED_AUDIO_METADATA)) {
+      if (EMBED_VIDEO_METADATA && (fileType === 'video+audio' || fileType === 'video')) {
+        args.push('--embed-metadata');
+      }
+      if (EMBED_AUDIO_METADATA && fileType === 'audio') {
+        args.push('--embed-metadata');
+      }
+    }
+
+    if (EMBED_AUDIO_THUMBNAIL && fileType === 'audio') {
+      args.push('--embed-thumbnail');
+    }
+
     if (resumeState) {
       args.push('--continue');
     } else {
@@ -183,12 +258,20 @@ export default function App({ children }: { children: React.ReactNode }) {
       args.push('--proxy', PROXY_URL);
     }
 
+    if (USE_RATE_LIMIT && RATE_LIMIT) {
+      args.push('--limit-rate', `${RATE_LIMIT}`);
+    }
+
     console.log('Starting download with args:', args);
     const command = Command.sidecar('binaries/yt-dlp', args);
 
     command.on('close', async data => {
       if (data.code !== 0) {
         console.error(`Download failed with code ${data.code}`);
+        if (!isErrorExpected) {
+          setIsErrored(true);
+          setErroredDownloadId(downloadId);
+        }
       } else {
         downloadStatusUpdater.mutate({ download_id: downloadId, download_status: 'completed' }, {
           onSuccess: (data) => {
@@ -380,6 +463,7 @@ export default function App({ children }: { children: React.ReactNode }) {
   
   const pauseDownload = async (downloadState: DownloadState) => {
     try {
+      setIsErrorExpected(true);  // Set error expected to true to handle UI state
       console.log("Killing process with PID:", downloadState.process_id);
       await invoke('kill_all_process', { pid: downloadState.process_id });
       downloadStatusUpdater.mutate({ download_id: downloadState.download_id, download_status: 'paused' }, {
@@ -424,6 +508,7 @@ export default function App({ children }: { children: React.ReactNode }) {
   const cancelDownload = async (downloadState: DownloadState) => {
     try {
       if ((downloadState.download_status === 'downloading' && downloadState.process_id) || (downloadState.download_status === 'starting' && downloadState.process_id)) {
+        setIsErrorExpected(true); // Set error expected to true to handle UI state
         console.log("Killing process with PID:", downloadState.process_id);
         await invoke('kill_all_process', { pid: downloadState.process_id });
       }
@@ -757,6 +842,43 @@ export default function App({ children }: { children: React.ReactNode }) {
     return () => clearTimeout(timeoutId);
   }, [processQueuedDownloads, ongoingDownloads, queuedDownloads]);
 
+  // show a toast and pause the download when yt-dlp exits unexpectedly
+  useEffect(() => {
+    if (isErrored && !isErrorExpected) {
+      toast({
+        title: "Download Failed",
+        description: "yt-dlp exited unexpectedly. Please try again later",
+        variant: "destructive",
+      });
+      if (erroredDownloadId) {
+        downloadStatusUpdater.mutate({ download_id: erroredDownloadId, download_status: 'paused' }, {
+          onSuccess: (data) => {
+            console.log("Download status updated successfully:", data);
+            queryClient.invalidateQueries({ queryKey: ['download-states'] });
+          },
+          onError: (error) => {
+            console.error("Failed to update download status:", error);
+          }
+        })
+        setErroredDownloadId(null);
+      }
+      setIsErrored(false);
+      setIsErrorExpected(false);
+    }
+  }, [isErrored, isErrorExpected, erroredDownloadId, setIsErrored, setIsErrorExpected, setErroredDownloadId]);
+
+  // auto reset error states after 3 seconds of expecting an error
+  useEffect(() => {
+    if (isErrorExpected) {
+      const timeoutId = setTimeout(() => {
+        setIsErrored(false);
+        setIsErrorExpected(false);
+        setErroredDownloadId(null);
+      }, 3000);
+      return () => clearTimeout(timeoutId);
+    }
+  }, [isErrorExpected, setIsErrorExpected]);
+
   return (
     <AppContext.Provider value={{ fetchVideoMetadata, startDownload, pauseDownload, resumeDownload, cancelDownload }}>
       <ThemeProvider defaultTheme={APP_THEME || "system"} storageKey="vite-ui-theme">

src/components/sidebar.tsx

@@ -1,7 +1,7 @@
 import { config } from "@/config";
 import { Link, useLocation } from "react-router-dom";
 import { Sidebar, SidebarContent, SidebarFooter, SidebarGroup, SidebarGroupContent, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem, useSidebar } from "@/components/ui/sidebar";
-import { CircleArrowUp, Download, Puzzle, Settings, SquarePlay, } from "lucide-react";
+import { CircleArrowUp, Download, Settings, SquarePlay, } from "lucide-react";
 import { isActive as isActiveSidebarItem } from "@/utils";
 import { RoutesObj } from "@/types/route";
 import { useDownloadStatesStore, useSettingsPageStatesStore } from "@/services/store";
@@ -29,6 +29,7 @@ export function AppSidebar() {
   const { open } = useSidebar();
   const { downloadAndInstallAppUpdate } = useAppUpdater();
   const [showBadge, setShowBadge] = useState(false);
+  const [showUpdateCard, setShowUpdateCard] = useState(false);
 
   const topItems: Array<RoutesObj> = [
     {
@@ -40,11 +41,6 @@ export function AppSidebar() {
       title: "Library",
       url: "/library",
       icon: SquarePlay,
-    },
-    {
-      title: "Extension",
-      url: "/extension",
-      icon: Puzzle,
     }
   ];
 
@@ -61,9 +57,11 @@ export function AppSidebar() {
     if (open) {
       timeout = setTimeout(() => {
         setShowBadge(true);
+        setShowUpdateCard(true);
       }, 300);
     } else {
       setShowBadge(false);
+      setShowUpdateCard(false);
     }
     
     return () => {
@@ -153,13 +151,14 @@ export function AppSidebar() {
             </TooltipContent>
           </Tooltip>
         )}
-        {appUpdate && open && (
+        {appUpdate && open && showUpdateCard && (
-          <Card>
+          <Card className="gap-4 py-0">
             <CardHeader className="p-4 pb-0">
               <CardTitle className="text-sm">Update Available (v{appUpdate.version})</CardTitle>
               <CardDescription>
-                A new version of {config.appName} is available. Please update to the latest version for the best experience.
+                A newer version of {config.appName} is available. Please update to the latest version for the best experience.
               </CardDescription>
+              <a className="text-xs font-semibold cursor-pointer mt-1" href={`https://github.com/neosubhamoy/neodlp/releases/tag/v${appUpdate.version}`} target="_blank">✨ Read Changelog</a>
             </CardHeader>
             <CardContent className="grid gap-2.5 p-4">
               <AlertDialog>

src/helpers/use-app-updater.ts

@@ -31,15 +31,16 @@ export default function useAppUpdater() {
             switch (event.event) {
             case 'Started':
                 contentLength = event.data.contentLength;
-                console.log(`started downloading ${event.data.contentLength} bytes`);
+                console.log(`started downloading app update of ${event.data.contentLength} bytes`);
                 break;
             case 'Progress':
                 downloaded += event.data.chunkLength;
-                setDownloadProgress(downloaded / (contentLength || 0));
+                const progress = (downloaded / (contentLength || 1)) * 100;
-                console.log(`downloaded ${downloaded} from ${contentLength}`);
+                setDownloadProgress(Math.round(progress * 10) / 10);
+                console.log(`downloaded ${downloaded} bytes from ${contentLength} bytes of app update`);
                 break;
             case 'Finished':
-                console.log('download finished');
+                console.log('app update download finished');
                 setIsUpdating(false);
                 break;
             }

src/main.tsx

@@ -8,7 +8,6 @@ import RootLayout from "@/pages/layout/root";
 import DownloaderPage from "@/pages/downloader";
 import LibraryPage from "@/pages/library";
 import SettingsPage from "@/pages/settings";
-import ExtensionPage from "@/pages/extension";
 
 ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
   <React.StrictMode>
@@ -19,7 +18,6 @@ ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
             <Route path="/" element={<RootLayout />}>
               <Route index element={<DownloaderPage />} />
               <Route path="/library" element={<LibraryPage />} />
-              <Route path="/extension" element={<ExtensionPage />} />
               <Route path="/settings" element={<SettingsPage />} />
             </Route>
           </Routes>

src/pages/downloader.tsx

@@ -7,9 +7,9 @@ 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 { Calendar, Clock, DownloadCloud, Eye, Info, Loader2, Music, ThumbsUp, Video, File, ListVideo, PackageSearch, AlertCircleIcon } from "lucide-react";
 import { FormatSelectionGroup, FormatSelectionGroupItem } from "@/components/custom/formatSelectionGroup";
 import { useEffect, useRef } from "react";
 import { ToggleGroup, ToggleGroupItem } from "@/components/custom/legacyToggleGroup";
@@ -21,6 +21,8 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod"
 import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form";
 import { config } from "@/config";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
 
 const searchFormSchema = z.object({
     url: z.string().min(1, { message: "URL is required" })
@@ -42,15 +44,24 @@ export default function DownloaderPage() {
     const setRequestedUrl = useCurrentVideoMetadataStore((state) => state.setRequestedUrl);
     const setAutoSubmitSearch = useCurrentVideoMetadataStore((state) => state.setAutoSubmitSearch);
 
+    const activeDownloadModeTab = useDownloaderPageStatesStore((state) => state.activeDownloadModeTab);
     const isStartingDownload = useDownloaderPageStatesStore((state) => state.isStartingDownload);
-    const selctedDownloadFormat = useDownloaderPageStatesStore((state) => state.selctedDownloadFormat);
+    const selectedDownloadFormat = useDownloaderPageStatesStore((state) => state.selectedDownloadFormat);
+    const selectedCombinableVideoFormat = useDownloaderPageStatesStore((state) => state.selectedCombinableVideoFormat);
+    const selectedCombinableAudioFormat = useDownloaderPageStatesStore((state) => state.selectedCombinableAudioFormat);
     const selectedSubtitles = useDownloaderPageStatesStore((state) => state.selectedSubtitles);
     const selectedPlaylistVideoIndex = useDownloaderPageStatesStore((state) => state.selectedPlaylistVideoIndex);
+    const setActiveDownloadModeTab = useDownloaderPageStatesStore((state) => state.setActiveDownloadModeTab);
     const setIsStartingDownload = useDownloaderPageStatesStore((state) => state.setIsStartingDownload);
-    const setSelctedDownloadFormat = useDownloaderPageStatesStore((state) => state.setSelctedDownloadFormat);
+    const setSelectedDownloadFormat = useDownloaderPageStatesStore((state) => state.setSelectedDownloadFormat);
+    const setSelectedCombinableVideoFormat = useDownloaderPageStatesStore((state) => state.setSelectedCombinableVideoFormat);
+    const setSelectedCombinableAudioFormat = useDownloaderPageStatesStore((state) => state.setSelectedCombinableAudioFormat);
     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'))) : [];
     const combinedFormats = videoMetadata?._type === 'video' ? sortByBitrate(videoMetadata?.formats.filter(fileFormatFilter('video+audio'))) : videoMetadata?._type === 'playlist' ? sortByBitrate(videoMetadata?.entries[Number(selectedPlaylistVideoIndex) - 1].formats.filter(fileFormatFilter('video+audio'))) : [];
@@ -79,22 +90,44 @@ export default function DownloaderPage() {
     const allFilteredFormats = [...(audioOnlyFormats || []), ...(videoOnlyFormats || []), ...(combinedFormats || []), ...(qualityPresetFormats || [])];
     const selectedFormat = (() => {
         if (videoMetadata?._type === 'video') {
-            if (selctedDownloadFormat === 'best') {
+            if (selectedDownloadFormat === 'best') {
                 return videoMetadata?.requested_downloads[0];
             }
             return allFilteredFormats.find(
-                (format) => format.format_id === selctedDownloadFormat
+                (format) => format.format_id === selectedDownloadFormat
             );
         } else if (videoMetadata?._type === 'playlist') {
-            if (selctedDownloadFormat === 'best') {
+            if (selectedDownloadFormat === 'best') {
                 return videoMetadata?.entries[Number(selectedPlaylistVideoIndex) - 1].requested_downloads[0];
             }
             return allFilteredFormats.find(
-                (format) => format.format_id === selctedDownloadFormat
+                (format) => format.format_id === selectedDownloadFormat
             );
         }
     })();
     const selectedFormatFileType = determineFileType(selectedFormat?.vcodec, selectedFormat?.acodec);
+    const selectedVideoFormat = (() => {
+        if (videoMetadata?._type === 'video') {
+            return allFilteredFormats.find(
+                (format) => format.format_id === selectedCombinableVideoFormat
+            );
+        } else if (videoMetadata?._type === 'playlist') {
+            return allFilteredFormats.find(
+                (format) => format.format_id === selectedCombinableVideoFormat
+            );
+        }
+    })();
+    const selectedAudioFormat = (() => {
+        if (videoMetadata?._type === 'video') {
+            return allFilteredFormats.find(
+                (format) => format.format_id === selectedCombinableAudioFormat
+            );
+        } else if (videoMetadata?._type === 'playlist') {
+            return allFilteredFormats.find(
+                (format) => format.format_id === selectedCombinableAudioFormat
+            );
+        }
+    })();
 
     const subtitles = videoMetadata?._type === 'video' ? (videoMetadata?.subtitles || {}) : videoMetadata?._type === 'playlist' ? (videoMetadata?.entries[Number(selectedPlaylistVideoIndex) - 1].subtitles || {}) : {};
     const subtitleLanguages = Object.keys(subtitles).map(langCode => ({
@@ -105,6 +138,62 @@ export default function DownloaderPage() {
     const containerRef = useRef<HTMLDivElement>(null);
     const bottomBarRef = useRef<HTMLDivElement>(null);
 
+    let selectedFormatExtensionMsg = 'Auto - unknown';
+    if (activeDownloadModeTab === 'combine') {
+        if (videoFormat !== 'auto') {
+            selectedFormatExtensionMsg = `Combined - ${videoFormat.toUpperCase()}`;
+        }
+        else if (selectedAudioFormat?.ext && selectedVideoFormat?.ext) {
+            selectedFormatExtensionMsg = `Combined - ${selectedVideoFormat.ext.toUpperCase()} + ${selectedAudioFormat.ext.toUpperCase()}`;
+        } else {
+            selectedFormatExtensionMsg = `Combined - unknown`;
+        }
+    } else 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()}`;
+        }
+    }
+
+    let selectedFormatResolutionMsg = 'unknown';
+    if (activeDownloadModeTab === 'combine') {
+        selectedFormatResolutionMsg = `${selectedVideoFormat?.resolution ?? 'unknown'} + ${selectedAudioFormat?.tbr ? formatBitrate(selectedAudioFormat.tbr) : 'unknown'}`;
+    } else if (selectedFormat?.resolution) {
+        selectedFormatResolutionMsg = selectedFormat.resolution;
+    }
+
+    let selectedFormatDynamicRangeMsg = '';
+    if (activeDownloadModeTab === 'combine') {
+        selectedFormatDynamicRangeMsg = selectedVideoFormat?.dynamic_range && selectedVideoFormat.dynamic_range !== 'SDR' ? selectedVideoFormat.dynamic_range : '';
+    } else if (selectedFormat?.dynamic_range && selectedFormat.dynamic_range !== 'SDR') {
+        selectedFormatDynamicRangeMsg = selectedFormat.dynamic_range;
+    }
+
+    let selectedFormatFileSizeMsg = 'unknown filesize';
+    if (activeDownloadModeTab === 'combine') {
+        selectedFormatFileSizeMsg = selectedVideoFormat?.filesize_approx && selectedAudioFormat?.filesize_approx ? formatFileSize(selectedVideoFormat.filesize_approx + selectedAudioFormat.filesize_approx) : 'unknown filesize';
+    } else if (selectedFormat?.filesize_approx) {
+        selectedFormatFileSizeMsg = formatFileSize(selectedFormat.filesize_approx);
+    }
+
+    let selectedFormatFinalMsg = '';
+    if (activeDownloadModeTab === 'combine') {
+        if (selectedCombinableVideoFormat && selectedCombinableAudioFormat) {
+            selectedFormatFinalMsg = `${selectedFormatExtensionMsg} (${selectedFormatResolutionMsg}) ${selectedFormatDynamicRangeMsg} ${selectedSubtitles.length > 0 ? `• ESUB` : ''} • ${selectedFormatFileSizeMsg}`;
+        } else {
+            selectedFormatFinalMsg = `Choose a video and audio stream to combine`;
+        }
+    } else {
+        if (selectedFormat) {
+            selectedFormatFinalMsg = `${selectedFormatExtensionMsg} (${selectedFormatResolutionMsg}) ${selectedFormatDynamicRangeMsg} ${selectedSubtitles.length > 0 ? `• ESUB` : ''} • ${selectedFormatFileSizeMsg}`;
+        } else {
+            selectedFormatFinalMsg = `Choose a stream to download`;
+        }
+    }
+
     const searchForm = useForm<z.infer<typeof searchFormSchema>>({
         resolver: zodResolver(searchFormSchema),
         defaultValues: {
@@ -117,7 +206,9 @@ export default function DownloaderPage() {
     function handleSearchSubmit(values: z.infer<typeof searchFormSchema>) {
         setVideoMetadata(null);
         setIsMetadataLoading(true);
-        setSelctedDownloadFormat('best');
+        setSelectedDownloadFormat('best');
+        setSelectedCombinableVideoFormat('');
+        setSelectedCombinableAudioFormat('');
         setSelectedSubtitles([]);
         setSelectedPlaylistVideoIndex('1');
         fetchVideoMetadata(values.url).then((metadata) => {
@@ -267,11 +358,11 @@ export default function DownloaderPage() {
             {!isMetadataLoading && videoMetadata && videoMetadata._type === 'video' && (       // === Single Video ===
             <div className="flex">
                 <div className="flex flex-col w-[55%] border-r border-border pr-4">
-                    <h3 className="text-sm mb-4 flex items-center gap-2">
+                    <h3 className="text-sm mb-4 mt-2 flex items-center gap-2">
                         <Info className="w-4 h-4" />
                         <span>Metadata</span>
                     </h3>
-                    <div className="flex flex-col overflow-y-scroll max-h-[53vh] no-scrollbar">
+                    <div className="flex flex-col overflow-y-scroll max-h-[50vh] no-scrollbar">
                         <AspectRatio ratio={16 / 9} className={clsx("w-full rounded-lg overflow-hidden mb-2 border border-border", videoMetadata.aspect_ratio && videoMetadata.aspect_ratio === 0.56 && "relative")}>
                             <ProxyImage src={videoMetadata.thumbnail} alt="thumbnail" className={clsx(videoMetadata.aspect_ratio && videoMetadata.aspect_ratio === 0.56 && "absolute h-full w-auto top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2")} />
                         </AspectRatio>
@@ -309,15 +400,27 @@ export default function DownloaderPage() {
                             <Info className="w-3 h-3 mr-2" />
                             <span className="text-xs">Extracted from {videoMetadata.extractor ? videoMetadata.extractor.charAt(0).toUpperCase() + videoMetadata.extractor.slice(1) : 'Unknown'}</span>
                         </div>
-                        <div className="spacer mb-14"></div>
+                        <div className="spacer mb-10"></div>
                     </div>
                 </div>
                 <div className="flex flex-col w-full pl-4">
-                    <h3 className="text-sm mb-4 flex items-center gap-2">
+                    <Tabs
+                    className=""
+                    value={activeDownloadModeTab}
+                    onValueChange={(tab) => setActiveDownloadModeTab(tab)}
+                    >
+                        <div className="flex items-center justify-between">
+                            <h3 className="text-sm flex items-center gap-2">
                                 <DownloadCloud className="w-4 h-4" />
                                 <span>Download Options</span>
                             </h3>
-                    <div className="flex flex-col overflow-y-scroll max-h-[53vh] no-scrollbar">
+                            <TabsList>
+                                <TabsTrigger value="selective">Selective</TabsTrigger>
+                                <TabsTrigger value="combine">Combine</TabsTrigger>
+                            </TabsList>
+                        </div>
+                        <TabsContent value="selective">
+                            <div className="flex flex-col overflow-y-scroll max-h-[50vh] no-scrollbar">
                                 {subtitles && !isObjEmpty(subtitles) && (
                                     <ToggleGroup
                                     type="multiple"
@@ -343,9 +446,9 @@ export default function DownloaderPage() {
                                     </ToggleGroup>
                                 )}
                                 <FormatSelectionGroup
-                        value={selctedDownloadFormat}
+                                value={selectedDownloadFormat}
                                 onValueChange={(value) => {
-                            setSelctedDownloadFormat(value);
+                                    setSelectedDownloadFormat(value);
                                     const currentlySelectedFormat = value === 'best' ? videoMetadata?.requested_downloads[0] : allFilteredFormats.find((format) => format.format_id === value);
                                     if (currentlySelectedFormat?.ext !== 'mp4' && currentlySelectedFormat?.ext !== 'mkv' && currentlySelectedFormat?.ext !== 'webm') {
                                         setSelectedSubtitles([]);
@@ -417,19 +520,102 @@ export default function DownloaderPage() {
                                     </>
                                     )}
                                 </FormatSelectionGroup>
-                        <div className="spacer mb-14"></div>
+                                <div className="spacer mb-10"></div>
                             </div>
+                        </TabsContent>
+                        <TabsContent value="combine">
+                            <div className="flex flex-col overflow-y-scroll max-h-[50vh] no-scrollbar">
+                                {audioOnlyFormats && audioOnlyFormats.length > 0 && videoOnlyFormats && videoOnlyFormats.length > 0 && subtitles && !isObjEmpty(subtitles) && (
+                                    <ToggleGroup
+                                    type="multiple"
+                                    variant="outline"
+                                    className="flex flex-col items-start gap-2 mb-2"
+                                    value={selectedSubtitles}
+                                    onValueChange={(value) => setSelectedSubtitles(value)}
+                                    disabled={selectedFormat?.ext !== 'mp4' && selectedFormat?.ext !== 'mkv' && selectedFormat?.ext !== 'webm'}
+                                    >
+                                        <p className="text-xs">Subtitle Languages</p>
+                                        <div className="flex gap-2 flex-wrap items-center">
+                                            {subtitleLanguages.map((lang) => (
+                                                <ToggleGroupItem
+                                                className="text-xs text-nowrap border-2 data-[state=on]:border-2 data-[state=on]:border-primary data-[state=on]:bg-muted/70 hover:bg-muted/70"
+                                                value={lang.code}
+                                                size="sm"
+                                                aria-label={lang.lang}
+                                                key={lang.code}>
+                                                    {lang.lang}
+                                                </ToggleGroupItem>
+                                            ))}
+                                        </div>
+                                    </ToggleGroup>
+                                )}
+                                <FormatSelectionGroup
+                                className="mb-2"
+                                value={selectedCombinableAudioFormat}
+                                onValueChange={(value) => {
+                                    setSelectedCombinableAudioFormat(value);
+                                }}
+                                >
+                                    {videoOnlyFormats && videoOnlyFormats.length > 0 && audioOnlyFormats && audioOnlyFormats.length > 0 && (
+                                    <>
+                                        <p className="text-xs">Audio</p>
+                                        <div className="grid grid-cols-2 xl:grid-cols-3 gap-2">
+                                            {audioOnlyFormats.map((format) => (
+                                                <FormatSelectionGroupItem
+                                                key={format.format_id}
+                                                value={format.format_id}
+                                                format={format}
+                                                />
+                                            ))}
+                                        </div>
+                                    </>
+                                    )}
+                                </FormatSelectionGroup>
+                                <FormatSelectionGroup
+                                value={selectedCombinableVideoFormat}
+                                onValueChange={(value) => {
+                                    setSelectedCombinableVideoFormat(value);
+                                }}
+                                >
+                                    {audioOnlyFormats && audioOnlyFormats.length > 0 && videoOnlyFormats && videoOnlyFormats.length > 0 && (
+                                    <>
+                                        <p className="text-xs">Video</p>
+                                        <div className="grid grid-cols-2 xl:grid-cols-3 gap-2">
+                                            {videoOnlyFormats.map((format) => (
+                                                <FormatSelectionGroupItem
+                                                key={format.format_id}
+                                                value={format.format_id}
+                                                format={format}
+                                                />
+                                            ))}
+                                        </div>
+                                    </>
+                                    )}
+                                </FormatSelectionGroup>
+                                {(!videoOnlyFormats || videoOnlyFormats.length === 0 || !audioOnlyFormats || audioOnlyFormats.length === 0) && (
+                                    <Alert>
+                                        <AlertCircleIcon />
+                                        <AlertTitle>Unable to use Combine Mode!</AlertTitle>
+                                        <AlertDescription>
+                                            Cannot use combine mode for this video as it does not have both audio and video formats available. Use Selective Mode or try another video.
+                                        </AlertDescription>
+                                    </Alert>
+                                )}
+                                <div className="spacer mb-10"></div>
+                            </div>
+                        </TabsContent>
+                    </Tabs>
                 </div>
             </div>
             )}
             {!isMetadataLoading && videoMetadata && videoMetadata._type === 'playlist' && (       // === Playlists ===
                 <div className="flex">
                     <div className="flex flex-col w-[55%] border-r border-border pr-4">
-                        <h3 className="text-sm mb-4 flex items-center gap-2">
+                        <h3 className="text-sm mb-4 mt-2 flex items-center gap-2">
                             <ListVideo className="w-4 h-4" />
                             <span>Playlist ({videoMetadata.entries[0].n_entries})</span>
                         </h3>
-                        <div className="flex flex-col overflow-y-scroll max-h-[53vh] no-scrollbar">
+                        <div className="flex flex-col overflow-y-scroll max-h-[50vh] no-scrollbar">
                             <h2 className="mb-1">{videoMetadata.entries[0].playlist_title ? videoMetadata.entries[0].playlist_title : 'UNTITLED'}</h2>
                             <p className="text-muted-foreground text-xs mb-4">{videoMetadata.entries[0].playlist_channel || videoMetadata.entries[0].playlist_uploader || 'unknown'}</p>
                             {/* <PlaylistToggleGroup
@@ -451,8 +637,10 @@ export default function DownloaderPage() {
                             value={selectedPlaylistVideoIndex}
                             onValueChange={(value) => {
                                 setSelectedPlaylistVideoIndex(value);
-                                setSelctedDownloadFormat('best');
+                                setSelectedDownloadFormat('best');
                                 setSelectedSubtitles([]);
+                                setSelectedCombinableVideoFormat('');
+                                setSelectedCombinableAudioFormat('');
                             }}
                             >
                                 {videoMetadata.entries.map((entry) => entry ? (
@@ -467,15 +655,27 @@ export default function DownloaderPage() {
                                 <Info className="w-3 h-3 mr-2" />
                                 <span className="text-xs">Extracted from {videoMetadata.entries[0].extractor ? videoMetadata.entries[0].extractor.charAt(0).toUpperCase() + videoMetadata.entries[0].extractor.slice(1) : 'Unknown'}</span>
                             </div>
-                            <div className="spacer mb-14"></div>
+                            <div className="spacer mb-10"></div>
                         </div>
                     </div>
                     <div className="flex flex-col w-full pl-4">
-                        <h3 className="text-sm mb-4 flex items-center gap-2">
+                        <Tabs
+                        className=""
+                        value={activeDownloadModeTab}
+                        onValueChange={(tab) => setActiveDownloadModeTab(tab)}
+                        >
+                            <div className="flex items-center justify-between">
+                                <h3 className="text-sm flex items-center gap-2">
                                     <DownloadCloud className="w-4 h-4" />
                                     <span>Download Options</span>
                                 </h3>
-                        <div className="flex flex-col overflow-y-scroll max-h-[53vh] no-scrollbar">
+                                <TabsList>
+                                    <TabsTrigger value="selective">Selective</TabsTrigger>
+                                    <TabsTrigger value="combine">Combine</TabsTrigger>
+                                </TabsList>
+                            </div>
+                            <TabsContent value="selective">
+                                <div className="flex flex-col overflow-y-scroll max-h-[50vh] no-scrollbar">
                                     {subtitles && !isObjEmpty(subtitles) && (
                                         <ToggleGroup
                                         type="multiple"
@@ -501,9 +701,9 @@ export default function DownloaderPage() {
                                         </ToggleGroup>
                                     )}
                                     <FormatSelectionGroup
-                            value={selctedDownloadFormat}
+                                    value={selectedDownloadFormat}
                                     onValueChange={(value) => {
-                                setSelctedDownloadFormat(value);
+                                        setSelectedDownloadFormat(value);
                                         const currentlySelectedFormat = value === 'best' ? videoMetadata?.entries[Number(value) - 1].requested_downloads[0] : allFilteredFormats.find((format) => format.format_id === value);
                                         if (currentlySelectedFormat?.ext !== 'mp4' && currentlySelectedFormat?.ext !== 'mkv' && currentlySelectedFormat?.ext !== 'webm') {
                                             setSelectedSubtitles([]);
@@ -575,12 +775,95 @@ export default function DownloaderPage() {
                                         </>
                                         )}
                                     </FormatSelectionGroup>
-                            <div className="spacer mb-14"></div>
+                                    <div className="spacer mb-10"></div>
                                 </div>
+                            </TabsContent>
+                            <TabsContent value="combine">
+                                <div className="flex flex-col overflow-y-scroll max-h-[50vh] no-scrollbar">
+                                    {audioOnlyFormats && audioOnlyFormats.length > 0 && videoOnlyFormats && videoOnlyFormats.length > 0 && subtitles && !isObjEmpty(subtitles) && (
+                                        <ToggleGroup
+                                        type="multiple"
+                                        variant="outline"
+                                        className="flex flex-col items-start gap-2 mb-2"
+                                        value={selectedSubtitles}
+                                        onValueChange={(value) => setSelectedSubtitles(value)}
+                                        disabled={selectedFormat?.ext !== 'mp4' && selectedFormat?.ext !== 'mkv' && selectedFormat?.ext !== 'webm'}
+                                        >
+                                            <p className="text-xs">Subtitle Languages</p>
+                                            <div className="flex gap-2 flex-wrap items-center">
+                                                {subtitleLanguages.map((lang) => (
+                                                    <ToggleGroupItem
+                                                    className="text-xs text-nowrap border-2 data-[state=on]:border-2 data-[state=on]:border-primary data-[state=on]:bg-muted/70 hover:bg-muted/70"
+                                                    value={lang.code}
+                                                    size="sm"
+                                                    aria-label={lang.lang}
+                                                    key={lang.code}>
+                                                        {lang.lang}
+                                                    </ToggleGroupItem>
+                                                ))}
+                                            </div>
+                                        </ToggleGroup>
+                                    )}
+                                    <FormatSelectionGroup
+                                    className="mb-2"
+                                    value={selectedCombinableAudioFormat}
+                                    onValueChange={(value) => {
+                                        setSelectedCombinableAudioFormat(value);
+                                    }}
+                                    >
+                                        {videoOnlyFormats && videoOnlyFormats.length > 0 && audioOnlyFormats && audioOnlyFormats.length > 0 && (
+                                        <>
+                                            <p className="text-xs">Audio</p>
+                                            <div className="grid grid-cols-2 xl:grid-cols-3 gap-2">
+                                                {audioOnlyFormats.map((format) => (
+                                                    <FormatSelectionGroupItem
+                                                    key={format.format_id}
+                                                    value={format.format_id}
+                                                    format={format}
+                                                    />
+                                                ))}
+                                            </div>
+                                        </>
+                                        )}
+                                    </FormatSelectionGroup>
+                                    <FormatSelectionGroup
+                                    value={selectedCombinableVideoFormat}
+                                    onValueChange={(value) => {
+                                        setSelectedCombinableVideoFormat(value);
+                                    }}
+                                    >
+                                        {audioOnlyFormats && audioOnlyFormats.length > 0 && videoOnlyFormats && videoOnlyFormats.length > 0 && (
+                                        <>
+                                            <p className="text-xs">Video</p>
+                                            <div className="grid grid-cols-2 xl:grid-cols-3 gap-2">
+                                                {videoOnlyFormats.map((format) => (
+                                                    <FormatSelectionGroupItem
+                                                    key={format.format_id}
+                                                    value={format.format_id}
+                                                    format={format}
+                                                    />
+                                                ))}
+                                            </div>
+                                        </>
+                                        )}
+                                    </FormatSelectionGroup>
+                                    {(!videoOnlyFormats || videoOnlyFormats.length === 0 || !audioOnlyFormats || audioOnlyFormats.length === 0) && (
+                                        <Alert>
+                                            <AlertCircleIcon />
+                                            <AlertTitle>Unable to use Combine Mode!</AlertTitle>
+                                            <AlertDescription>
+                                                Cannot use combine mode for this video as it does not have both audio and video formats available. Use Selective Mode or try another video.
+                                            </AlertDescription>
+                                        </Alert>
+                                    )}
+                                    <div className="spacer mb-10"></div>
+                                </div>
+                            </TabsContent>
+                        </Tabs>
                     </div>
                 </div>
             )}
-            {!isMetadataLoading && videoMetadata && selctedDownloadFormat && (       // === Bottom Bar ===
+            {!isMetadataLoading && videoMetadata && selectedDownloadFormat && (       // === Bottom Bar ===
                 <div className="flex justify-between items-center gap-2 fixed bottom-0 right-0 p-4 w-full bg-background rounded-t-lg border-t border-border z-20" ref={bottomBarRef}>
                     <div className="flex items-center gap-4">
                         <div className="flex justify-center items-center p-3 rounded-md border border-border">
@@ -596,7 +879,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">{selectedFormatFinalMsg}</span>
                         </div>
                     </div>
                     <Button
@@ -606,7 +889,7 @@ export default function DownloaderPage() {
                             if (videoMetadata._type === 'playlist') {
                                 await startDownload(
                                     videoMetadata.original_url,
-                                    selctedDownloadFormat === 'best' ? videoMetadata.entries[Number(selectedPlaylistVideoIndex) - 1].requested_downloads[0].format_id : selctedDownloadFormat,
+                                    activeDownloadModeTab === 'combine' ? `${selectedCombinableVideoFormat}+${selectedCombinableAudioFormat}` : selectedDownloadFormat === 'best' ? videoMetadata.entries[Number(selectedPlaylistVideoIndex) - 1].requested_downloads[0].format_id : selectedDownloadFormat,
                                     selectedSubtitles.length > 0 ? selectedSubtitles.join(',') : null,
                                     undefined,
                                     selectedPlaylistVideoIndex
@@ -614,7 +897,7 @@ export default function DownloaderPage() {
                             } else if (videoMetadata._type === 'video') {
                                 await startDownload(
                                     videoMetadata.webpage_url,
-                                    selctedDownloadFormat === 'best' ? videoMetadata.requested_downloads[0].format_id : selctedDownloadFormat,
+                                    activeDownloadModeTab === 'combine' ? `${selectedCombinableVideoFormat}+${selectedCombinableAudioFormat}` : selectedDownloadFormat === 'best' ? videoMetadata.requested_downloads[0].format_id : selectedDownloadFormat,
                                     selectedSubtitles.length > 0 ? selectedSubtitles.join(',') : null
                                 );
                             }
@@ -633,12 +916,12 @@ export default function DownloaderPage() {
                             setIsStartingDownload(false);
                         }
                     }}
-                    disabled={isStartingDownload}
+                    disabled={isStartingDownload || !selectedDownloadFormat || (activeDownloadModeTab === 'combine' && (!selectedCombinableVideoFormat || !selectedCombinableAudioFormat))}
                     >
                         {isStartingDownload ? (
                             <>
                                 <Loader2 className="h-4 w-4 animate-spin" />
-                                Starting
+                                Starting Download
                             </>
                         ) : (
                             'Start Download'

src/pages/extension.tsx

@@ -1,77 +0,0 @@
-import { SlidingButton } from "@/components/custom/slidingButton";
-import Heading from "@/components/heading";
-import { ArrowRight } from "lucide-react";
-import { invoke } from "@tauri-apps/api/core";
-import { useToast } from "@/hooks/use-toast";
-import { Button } from "@/components/ui/button";
-
-export default function ExtensionPage() {
-    const { toast } = useToast();
-    const openLink = async (url: string, app: string | null) => {
-        try {
-            await invoke('open_file_with_app', { filePath: url, appName: app }).then(() => {
-                toast({
-                    title: 'Opening Link',
-                    description: `Opening link with ${app ? app : 'default app'}.`,
-                })
-            });
-        } catch (e) {
-            console.error(e);
-            toast({
-                title: 'Failed to open link',
-                description: 'An error occurred while trying to open the link.',
-                variant: "destructive"
-            })
-        }
-    }
-
-    return (
-        <div className="container mx-auto p-4 space-y-4">
-            <Heading title="Extension" description="Integrate NeoDLP with your favourite browser" />
-            <div className="flex items-center gap-4">
-                <SlidingButton
-                    slidingContent={
-                        <div className="flex items-center justify-center gap-2 text-white dark:text-black">
-                            <ArrowRight className="size-4" />
-                            <span>Get Now</span>
-                        </div>
-                    }
-                    onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'chrome')}
-                    >
-                    <span className="font-semibold flex items-center gap-2">
-                        <svg className="size-4 fill-white dark:fill-black" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-                            <path d="M0 256C0 209.4 12.5 165.6 34.3 127.1L144.1 318.3C166 357.5 207.9 384 256 384C270.3 384 283.1 381.7 296.8 377.4L220.5 509.6C95.9 492.3 0 385.3 0 256zM365.1 321.6C377.4 302.4 384 279.1 384 256C384 217.8 367.2 183.5 340.7 160H493.4C505.4 189.6 512 222.1 512 256C512 397.4 397.4 511.1 256 512L365.1 321.6zM477.8 128H256C193.1 128 142.3 172.1 130.5 230.7L54.2 98.5C101 38.5 174 0 256 0C350.8 0 433.5 51.5 477.8 128V128zM168 256C168 207.4 207.4 168 256 168C304.6 168 344 207.4 344 256C344 304.6 304.6 344 256 344C207.4 344 168 304.6 168 256z"/>
-                        </svg>
-                        Get Chrome Extension
-                    </span>
-                    <span className="text-xs">from Chrome Web Store</span>
-                </SlidingButton>
-                <SlidingButton
-                    slidingContent={
-                        <div className="flex items-center justify-center gap-2 text-white dark:text-black">
-                            <ArrowRight className="size-4" />
-                            <span>Get Now</span>
-                        </div>
-                    }
-                    onClick={() => openLink('https://addons.mozilla.org/en-US/firefox/addon/neo-downloader-plus', 'firefox')}
-                    >
-                    <span className="font-semibold flex items-center gap-2">
-                        <svg className="size-4 fill-white dark:fill-black" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-                            <path d="M130.2 127.5C130.4 127.6 130.3 127.6 130.2 127.5V127.5zM481.6 172.9C471 147.4 449.6 119.9 432.7 111.2C446.4 138.1 454.4 165 457.4 185.2C457.4 185.3 457.4 185.4 457.5 185.6C429.9 116.8 383.1 89.1 344.9 28.7C329.9 5.1 334 3.5 331.8 4.1L331.7 4.2C285 30.1 256.4 82.5 249.1 126.9C232.5 127.8 216.2 131.9 201.2 139C199.8 139.6 198.7 140.7 198.1 142C197.4 143.4 197.2 144.9 197.5 146.3C197.7 147.2 198.1 148 198.6 148.6C199.1 149.3 199.8 149.9 200.5 150.3C201.3 150.7 202.1 151 203 151.1C203.8 151.1 204.7 151 205.5 150.8L206 150.6C221.5 143.3 238.4 139.4 255.5 139.2C318.4 138.7 352.7 183.3 363.2 201.5C350.2 192.4 326.8 183.3 304.3 187.2C392.1 231.1 368.5 381.8 247 376.4C187.5 373.8 149.9 325.5 146.4 285.6C146.4 285.6 157.7 243.7 227 243.7C234.5 243.7 256 222.8 256.4 216.7C256.3 214.7 213.8 197.8 197.3 181.5C188.4 172.8 184.2 168.6 180.5 165.5C178.5 163.8 176.4 162.2 174.2 160.7C168.6 141.2 168.4 120.6 173.5 101.1C148.5 112.5 129 130.5 114.8 146.4H114.7C105 134.2 105.7 93.8 106.3 85.3C106.1 84.8 99 89 98.1 89.7C89.5 95.7 81.6 102.6 74.3 110.1C58 126.7 30.1 160.2 18.8 211.3C14.2 231.7 12 255.7 12 263.6C12 398.3 121.2 507.5 255.9 507.5C376.6 507.5 478.9 420.3 496.4 304.9C507.9 228.2 481.6 173.8 481.6 172.9z"/>
-                        </svg>
-                        Get Firefox Extension
-                    </span>
-                    <span className="text-xs">from Mozilla Addons Store</span>
-                </SlidingButton>
-            </div>
-            <div className="flex gap-2">
-                <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'msedge')}>Edge</Button>
-                <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'opera')}>Opera</Button>
-                <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'brave')}>Brave</Button>
-                <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'arc')}>Arc</Button>
-                <Button variant="outline" onClick={() => openLink('https://addons.mozilla.org/en-US/firefox/addon/neo-downloader-plus', 'zen')}>Zen</Button>
-            </div>
-            <p className="text-xs text-muted-foreground mb-2">* These links opens with coresponding browsers only. Make sure the browser is installed befor clicking the link</p>
-        </div>
-    )
-}

src/pages/library.tsx

@@ -6,9 +6,9 @@ import { Progress } from "@/components/ui/progress";
 import { Separator } from "@/components/ui/separator";
 import { useToast } from "@/hooks/use-toast";
 import { useAppContext } from "@/providers/appContextProvider";
-import { useDownloadActionStatesStore, useDownloadStatesStore } from "@/services/store";
+import { useDownloadActionStatesStore, useDownloaderPageStatesStore, useDownloadStatesStore, useLibraryPageStatesStore } from "@/services/store";
 import { formatBitrate, formatCodec, formatDurationString, formatFileSize, formatSecToTimeString, formatSpeed } from "@/utils";
-import { AudioLines, Clock, CloudDownload, File, FileAudio2, FileQuestion, FileVideo2, FolderInput, ListVideo, Loader2, Music, PackageCheck, Pause, Play, Trash2, Video, X } from "lucide-react";
+import { AudioLines, Clock, File, FileAudio2, FileQuestion, FileVideo2, FolderInput, ListVideo, Loader2, Music, Pause, Play, Square, Trash2, Video, X } from "lucide-react";
 import { invoke } from "@tauri-apps/api/core";
 import * as fs from "@tauri-apps/plugin-fs";
 import { DownloadState } from "@/types/download";
@@ -18,9 +18,14 @@ import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent,
 import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
 import Heading from "@/components/heading";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Badge } from "@/components/ui/badge";
 
 
 export default function LibraryPage() {
+    const activeTab = useLibraryPageStatesStore(state => state.activeTab);
+    const setActiveTab = useLibraryPageStatesStore(state => state.setActiveTab);
+    
     const downloadStates = useDownloadStatesStore(state => state.downloadStates);
     const downloadActions = useDownloadActionStatesStore(state => state.downloadActions);
     const setIsResumingDownload = useDownloadActionStatesStore(state => state.setIsResumingDownload);
@@ -28,6 +33,8 @@ export default function LibraryPage() {
     const setIsCancelingDownload = useDownloadActionStatesStore(state => state.setIsCancelingDownload);
     const setIsDeleteFileChecked = useDownloadActionStatesStore(state => state.setIsDeleteFileChecked);
 
+    const setIsErrorExpected = useDownloaderPageStatesStore((state) => state.setIsErrorExpected);
+
     const { pauseDownload, resumeDownload, cancelDownload } = useAppContext()
     const { toast } = useToast();
 
@@ -36,6 +43,9 @@ export default function LibraryPage() {
 
     const incompleteDownloads = downloadStates.filter(state => state.download_status !== 'completed');
     const completedDownloads = downloadStates.filter(state => state.download_status === 'completed');
+    const ongoingDownloads = downloadStates.filter(state => 
+        ['starting', 'downloading', 'queued'].includes(state.download_status)
+    );
 
     const openFile = async (filePath: string | null, app: string | null) => {
         if (filePath && await fs.exists(filePath)) {
@@ -96,16 +106,212 @@ export default function LibraryPage() {
         })
     }
 
+    const stopOngoingDownloads = async () => {
+        if (ongoingDownloads.length > 0) {
+            setIsErrorExpected(true); // Set error expected to true to handle UI state
+            try {
+                await invoke('pause_ongoing_downloads').then(() => {
+                    queryClient.invalidateQueries({ queryKey: ['download-states'] });
+                    toast({
+                        title: 'Stopped downloads',
+                        description: 'All ongoing downloads are being stopped.',
+                    });
+                });
+            } catch (e) {
+                console.error(e);
+                toast({
+                    title: 'Failed to stop downloads',
+                    description: 'An error occurred while trying to stop the downloads.',
+                    variant: "destructive"
+                });
+            }
+        } else {
+            toast({
+                title: 'No ongoing downloads',
+                description: 'There are no ongoing downloads to stop.',
+                variant: "destructive"
+            });
+        }
+    }
+
     return (
         <div className="container mx-auto p-4 space-y-4">
             <Heading title="Library" description="Manage all your downloads in one place" />
-            <div className="w-full fle flex-col">
+            <Tabs value={activeTab} onValueChange={setActiveTab}>
-                <div className="flex w-full items-center gap-3 mb-2">
+                <div className="w-full flex items-center justify-between mb-4">
-                    <CloudDownload className="size-5" />
+                    <TabsList>
-                    <h3 className="text-nowrap font-semibold">Incomplete Downloads</h3>
+                        <TabsTrigger value="completed">Completed {completedDownloads.length > 0 && (`(${completedDownloads.length})`)}</TabsTrigger>
+                        <TabsTrigger value="incomplete">Incomplete {(incompleteDownloads.length > 0 && ongoingDownloads.length <= 0) && (`(${incompleteDownloads.length})`)} {ongoingDownloads.length > 0 && (<Badge className="h-4 min-w-4 rounded-full px-1 font-mono tabular-nums ml-1">{ongoingDownloads.length}</Badge>)}</TabsTrigger>
+                    </TabsList>
+                    <AlertDialog>
+                        <AlertDialogTrigger asChild>
+                            <Button
+                            className="w-fit"
+                            variant="destructive"
+                            size="sm"
+                            disabled={ongoingDownloads.length <= 0}
+                            >
+                                <Square className="h-4 w-4" />
+                                Stop
+                            </Button>
+                        </AlertDialogTrigger>
+                        <AlertDialogContent>
+                            <AlertDialogHeader>
+                                <AlertDialogTitle>Stop all ongoing downloads?</AlertDialogTitle>
+                                <AlertDialogDescription>
+                                    Are you sure you want to stop all ongoing downloads? This will pause all downloads including the download queue.
+                                </AlertDialogDescription>
+                            </AlertDialogHeader>
+                            <AlertDialogFooter>
+                                <AlertDialogCancel>Cancel</AlertDialogCancel>
+                                <AlertDialogAction
+                                onClick={() => stopOngoingDownloads()}
+                                >Stop</AlertDialogAction>
+                            </AlertDialogFooter>
+                        </AlertDialogContent>
+                    </AlertDialog>
                 </div>
-                <Separator orientation="horizontal" className="" />
+                <TabsContent value="completed">
+                    <div className="w-full flex flex-col gap-2">
+                        {completedDownloads.length > 0 ? (
+                            completedDownloads.map((state) => {
+                                const itemActionStates = downloadActions[state.download_id] || {
+                                    isResuming: false,
+                                    isPausing: false,
+                                    isCanceling: false,
+                                    isDeleteFileChecked: false,
+                                };
+                                return (
+                                    <div className="p-4 border border-border rounded-lg flex gap-4" key={state.download_id}>
+                                        <div className="w-[30%] flex flex-col justify-between gap-2">
+                                            <AspectRatio ratio={16 / 9} className="w-full rounded-lg overflow-hidden border border-border mb-2">
+                                                <ProxyImage src={state.thumbnail || ""} alt="thumbnail" className="" />
+                                            </AspectRatio>
+                                            <span className="w-full flex items-center justify-center text-xs border border-border py-1 px-2 rounded">
+                                                {state.filetype && (state.filetype === 'video' || state.filetype === 'video+audio') && (
+                                                    <Video className="w-4 h-4 mr-2" />
+                                                )}
+                                                {state.filetype && state.filetype === 'audio' && (
+                                                    <Music className="w-4 h-4 mr-2" />
+                                                )}
+                                                {(!state.filetype) || (state.filetype && state.filetype !== 'video' && state.filetype !== 'audio' && state.filetype !== 'video+audio') && (
+                                                    <File className="w-4 h-4 mr-2" />
+                                                )}
+                                                {state.ext?.toUpperCase()} {state.resolution ? `(${state.resolution})` : null}
+                                            </span>
                                         </div>
+                                        <div className="w-full flex flex-col justify-between gap-2">
+                                            <div className="flex flex-col gap-1">
+                                                <h4 className="">{state.title}</h4>
+                                                <p className="text-xs text-muted-foreground">{state.channel ? state.channel : 'unknown'} {state.host ? `• ${state.host}` : 'unknown'}</p>
+                                                <div className="flex items-center mt-1">
+                                                    <span className="text-xs text-muted-foreground flex items-center pr-3"><Clock className="w-4 h-4 mr-2"/> {state.duration_string ? formatDurationString(state.duration_string) : 'unknown'}</span>
+                                                    <Separator orientation="vertical" />
+                                                    <span className="text-xs text-muted-foreground flex items-center px-3">
+                                                    {state.filetype && (state.filetype === 'video' || state.filetype === 'video+audio') && (
+                                                        <FileVideo2 className="w-4 h-4 mr-2"/>
+                                                    )}
+                                                    {state.filetype && state.filetype === 'audio' && (
+                                                        <FileAudio2 className="w-4 h-4 mr-2" />
+                                                    )}
+                                                    {(!state.filetype) || (state.filetype && state.filetype !== 'video' && state.filetype !== 'audio' && state.filetype !== 'video+audio') && (
+                                                        <FileQuestion className="w-4 h-4 mr-2" />
+                                                    )}
+                                                    {state.filesize ? formatFileSize(state.filesize) : 'unknown'}
+                                                    </span>
+                                                    <Separator orientation="vertical" />
+                                                    <span className="text-xs text-muted-foreground flex items-center pl-3"><AudioLines className="w-4 h-4 mr-2"/>
+                                                    {state.vbr && state.abr ? (
+                                                        formatBitrate(state.vbr + state.abr)
+                                                    ) : state.vbr ? (
+                                                        formatBitrate(state.vbr)
+                                                    ) : state.abr ? (
+                                                        formatBitrate(state.abr)
+                                                    ) : (
+                                                        'unknown'
+                                                    )}
+                                                    </span>
+                                                </div>
+                                                <div className="hidden xl:flex items-center mt-1 gap-2 flex-wrap text-xs">
+                                                    {state.playlist_id && state.playlist_index && (
+                                                        <span
+                                                        className="border border-border py-1 px-2 rounded flex items-center cursor-pointer"
+                                                        title={`${state.playlist_title ?? 'UNKNOWN PLAYLIST'}` + ' by ' + `${state.playlist_channel ?? 'UNKNOWN CHANNEL'}`}
+                                                        >
+                                                            <ListVideo className="w-4 h-4 mr-2" /> Playlist ({state.playlist_index} of {state.playlist_n_entries})
+                                                        </span>
+                                                    )}
+                                                    {state.vcodec && (
+                                                        <span className="border border-border py-1 px-2 rounded">{formatCodec(state.vcodec)}</span>
+                                                    )}
+                                                    {state.acodec && (
+                                                        <span className="border border-border py-1 px-2 rounded">{formatCodec(state.acodec)}</span>
+                                                    )}
+                                                    {state.dynamic_range && state.dynamic_range !== 'SDR' && (
+                                                        <span className="border border-border py-1 px-2 rounded">{state.dynamic_range}</span>
+                                                    )}
+                                                    {state.subtitle_id && (
+                                                        <span
+                                                        className="border border-border py-1 px-2 rounded cursor-pointer"
+                                                        title={`EMBEDED SUBTITLE (${state.subtitle_id})`}
+                                                        >
+                                                            ESUB
+                                                        </span>
+                                                    )}
+                                                </div>
+                                            </div>
+                                            <div className="w-full flex items-center gap-2">
+                                                <Button size="sm" onClick={() => openFile(state.filepath, null)}>
+                                                    <Play className="w-4 h-4" />
+                                                    Open
+                                                </Button>
+                                                <Button size="sm" variant="outline" onClick={() => openFile(state.filepath, 'explorer')}>
+                                                    <FolderInput className="w-4 h-4" />
+                                                    Open in Explorer
+                                                </Button>
+                                                <AlertDialog>
+                                                    <AlertDialogTrigger asChild>
+                                                        <Button size="sm" variant="destructive">
+                                                            <Trash2 className="w-4 h-4" />
+                                                            Remove
+                                                        </Button>
+                                                    </AlertDialogTrigger>
+                                                    <AlertDialogContent>
+                                                        <AlertDialogHeader>
+                                                            <AlertDialogTitle>Remove from library?</AlertDialogTitle>
+                                                            <AlertDialogDescription>
+                                                                Are you sure you want to remove this download from the library? You can also delete the downloaded file by cheking the box below. This action cannot be undone.
+                                                            </AlertDialogDescription>
+                                                            <div className="flex items-center space-x-2">
+                                                                <Checkbox id="delete-file" checked={itemActionStates.isDeleteFileChecked} onCheckedChange={() => {setIsDeleteFileChecked(state.download_id, !itemActionStates.isDeleteFileChecked)}} />
+                                                                <Label htmlFor="delete-file">Delete the downloaded file</Label>
+                                                            </div>
+                                                        </AlertDialogHeader>
+                                                        <AlertDialogFooter>
+                                                            <AlertDialogCancel>Cancel</AlertDialogCancel>
+                                                            <AlertDialogAction onClick={
+                                                                () => removeFromDownloads(state, itemActionStates.isDeleteFileChecked).then(() => {
+                                                                    setIsDeleteFileChecked(state.download_id, false);
+                                                                })
+                                                            }>Remove</AlertDialogAction>
+                                                        </AlertDialogFooter>
+                                                    </AlertDialogContent>
+                                                </AlertDialog>
+                                            </div>
+                                        </div>
+                                    </div>
+                                )
+                            })
+                        ) : (
+                            <div className="w-full flex flex-col items-center gap-2 justify-center mt-27">
+                                <h4 className="text-4xl font-bold text-muted-foreground/80 dark:text-muted">Nothing!</h4>
+                                <p className="text-lg font-semibold text-muted-foreground/50">No Completed Downloads</p>
+                                <p className="max-w-[50%] text-center text-xs text-muted-foreground/70">You have not completed any downloads yet. Complete downloading something to see here :)</p>
+                            </div>
+                        )}
+                    </div>
+                </TabsContent>
+                <TabsContent value="incomplete">
                     <div className="w-full flex flex-col gap-2">
                         {incompleteDownloads.length > 0 ? (
                             incompleteDownloads.map((state) => {
@@ -275,150 +481,15 @@ export default function LibraryPage() {
                                 )
                             })
                         ) : (
-                    <div className="w-full flex items-center justify-center text-muted-foreground text-sm">No Incomplete downloads!</div>
+                            <div className="w-full flex flex-col items-center gap-2 justify-center mt-27">
-                )}
+                                <h4 className="text-4xl font-bold text-muted-foreground/80 dark:text-muted">Nothing!</h4>
-            </div>
+                                <p className="text-lg font-semibold text-muted-foreground/50">No Incomplete Downloads</p>
-            <div className="w-full fle flex-col">
+                                <p className="max-w-[50%] text-center text-xs text-muted-foreground/70">You have all caught up! Sit back and relax or just spin up a new download to see here :)</p>
-                <div className="flex w-full items-center gap-3 mb-2">
+                            </div>
-                    <PackageCheck className="size-5" />
-                    <h3 className="text-nowrap font-semibold">Completed Downloads</h3>
-                </div>
-                <Separator orientation="horizontal" className="" />
-            </div>
-            <div className="w-full flex flex-col gap-2">
-                {completedDownloads.length > 0 ? (
-                    completedDownloads.map((state) => {
-                        const itemActionStates = downloadActions[state.download_id] || {
-                            isResuming: false,
-                            isPausing: false,
-                            isCanceling: false,
-                            isDeleteFileChecked: false,
-                        };
-                        return (
-                            <div className="p-4 border border-border rounded-lg flex gap-4" key={state.download_id}>
-                                <div className="w-[30%] flex flex-col justify-between gap-2">
-                                    <AspectRatio ratio={16 / 9} className="w-full rounded-lg overflow-hidden border border-border mb-2">
-                                        <ProxyImage src={state.thumbnail || ""} alt="thumbnail" className="" />
-                                    </AspectRatio>
-                                    <span className="w-full flex items-center justify-center text-xs border border-border py-1 px-2 rounded">
-                                        {state.filetype && (state.filetype === 'video' || state.filetype === 'video+audio') && (
-                                            <Video className="w-4 h-4 mr-2" />
-                                        )}
-                                        {state.filetype && state.filetype === 'audio' && (
-                                            <Music className="w-4 h-4 mr-2" />
-                                        )}
-                                        {(!state.filetype) || (state.filetype && state.filetype !== 'video' && state.filetype !== 'audio' && state.filetype !== 'video+audio') && (
-                                            <File className="w-4 h-4 mr-2" />
-                                        )}
-                                        {state.ext?.toUpperCase()} {state.resolution ? `(${state.resolution})` : null}
-                                    </span>
-                                </div>
-                                <div className="w-full flex flex-col justify-between gap-2">
-                                    <div className="flex flex-col gap-1">
-                                        <h4 className="">{state.title}</h4>
-                                        <p className="text-xs text-muted-foreground">{state.channel ? state.channel : 'unknown'} {state.host ? `• ${state.host}` : 'unknown'}</p>
-                                        <div className="flex items-center mt-1">
-                                            <span className="text-xs text-muted-foreground flex items-center pr-3"><Clock className="w-4 h-4 mr-2"/> {state.duration_string ? formatDurationString(state.duration_string) : 'unknown'}</span>
-                                            <Separator orientation="vertical" />
-                                            <span className="text-xs text-muted-foreground flex items-center px-3">
-                                            {state.filetype && (state.filetype === 'video' || state.filetype === 'video+audio') && (
-                                                <FileVideo2 className="w-4 h-4 mr-2"/>
-                                            )}
-                                            {state.filetype && state.filetype === 'audio' && (
-                                                <FileAudio2 className="w-4 h-4 mr-2" />
-                                            )}
-                                            {(!state.filetype) || (state.filetype && state.filetype !== 'video' && state.filetype !== 'audio' && state.filetype !== 'video+audio') && (
-                                                <FileQuestion className="w-4 h-4 mr-2" />
-                                            )}
-                                            {state.filesize ? formatFileSize(state.filesize) : 'unknown'}
-                                            </span>
-                                            <Separator orientation="vertical" />
-                                            <span className="text-xs text-muted-foreground flex items-center pl-3"><AudioLines className="w-4 h-4 mr-2"/>
-                                            {state.vbr && state.abr ? (
-                                                formatBitrate(state.vbr + state.abr)
-                                            ) : state.vbr ? (
-                                                formatBitrate(state.vbr)
-                                            ) : state.abr ? (
-                                                formatBitrate(state.abr)
-                                            ) : (
-                                                'unknown'
-                                            )}
-                                            </span>
-                                        </div>
-                                        <div className="hidden xl:flex items-center mt-1 gap-2 flex-wrap text-xs">
-                                            {state.playlist_id && state.playlist_index && (
-                                                <span
-                                                className="border border-border py-1 px-2 rounded flex items-center cursor-pointer"
-                                                title={`${state.playlist_title ?? 'UNKNOWN PLAYLIST'}` + ' by ' + `${state.playlist_channel ?? 'UNKNOWN CHANNEL'}`}
-                                                >
-                                                    <ListVideo className="w-4 h-4 mr-2" /> Playlist ({state.playlist_index} of {state.playlist_n_entries})
-                                                </span>
-                                            )}
-                                            {state.vcodec && (
-                                                <span className="border border-border py-1 px-2 rounded">{formatCodec(state.vcodec)}</span>
-                                            )}
-                                            {state.acodec && (
-                                                <span className="border border-border py-1 px-2 rounded">{formatCodec(state.acodec)}</span>
-                                            )}
-                                            {state.dynamic_range && state.dynamic_range !== 'SDR' && (
-                                                <span className="border border-border py-1 px-2 rounded">{state.dynamic_range}</span>
-                                            )}
-                                            {state.subtitle_id && (
-                                                <span
-                                                className="border border-border py-1 px-2 rounded cursor-pointer"
-                                                title={`EMBEDED SUBTITLE (${state.subtitle_id})`}
-                                                >
-                                                    ESUB
-                                                </span>
-                                            )}
-                                        </div>
-                                    </div>
-                                    <div className="w-full flex items-center gap-2">
-                                        <Button size="sm" onClick={() => openFile(state.filepath, null)}>
-                                            <Play className="w-4 h-4" />
-                                            Open
-                                        </Button>
-                                        <Button size="sm" variant="outline" onClick={() => openFile(state.filepath, 'explorer')}>
-                                            <FolderInput className="w-4 h-4" />
-                                            Open in Explorer
-                                        </Button>
-                                        <AlertDialog>
-                                            <AlertDialogTrigger asChild>
-                                                <Button size="sm" variant="destructive">
-                                                    <Trash2 className="w-4 h-4" />
-                                                    Remove
-                                                </Button>
-                                            </AlertDialogTrigger>
-                                            <AlertDialogContent>
-                                                <AlertDialogHeader>
-                                                    <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-                                                    <AlertDialogDescription>
-                                                        This action cannot be undone! it will permanently remove this from downloads.
-                                                    </AlertDialogDescription>
-                                                    <div className="flex items-center space-x-2">
-                                                        <Checkbox id="delete-file" checked={itemActionStates.isDeleteFileChecked} onCheckedChange={() => {setIsDeleteFileChecked(state.download_id, !itemActionStates.isDeleteFileChecked)}} />
-                                                        <Label htmlFor="delete-file">Delete the downloaded file</Label>
-                                                    </div>
-                                                </AlertDialogHeader>
-                                                <AlertDialogFooter>
-                                                    <AlertDialogCancel>Cancel</AlertDialogCancel>
-                                                    <AlertDialogAction onClick={
-                                                        () => removeFromDownloads(state, itemActionStates.isDeleteFileChecked).then(() => {
-                                                            setIsDeleteFileChecked(state.download_id, false);
-                                                        })
-                                                    }>Remove</AlertDialogAction>
-                                                </AlertDialogFooter>
-                                            </AlertDialogContent>
-                                        </AlertDialog>
-                                    </div>
-                                </div>
-                            </div>
-                        )
-                    })
-                ) : (
-                    <div className="w-full flex items-center justify-center text-muted-foreground text-sm">No Completed downloads!</div>
                         )}
                     </div>
+                </TabsContent>
+            </Tabs>
         </div>
     );
 }

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 { ExternalLink, FolderOpen, Loader2, LucideIcon, Monitor, Moon, Radio, RotateCcw, RotateCw, Sun, Terminal } from "lucide-react";
+import { ArrowDownToLine, ArrowRight, BrushCleaning, EthernetPort, ExternalLink, FileVideo, Folder, FolderOpen, Info, 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";
@@ -22,6 +22,11 @@ import { zodResolver } from "@hookform/resolvers/zod"
 import { Form, FormControl, FormField, FormItem, FormMessage } from "@/components/ui/form";
 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";
+import * as fs from "@tauri-apps/plugin-fs";
+import { join } from "@tauri-apps/api/path";
+import { formatSpeed } from "@/utils";
 
 const websocketPortSchema = z.object({
     port: z.coerce.number({
@@ -38,12 +43,27 @@ const proxyUrlSchema = z.object({
     url: z.string().min(1, { message: "Proxy URL is required" }).url({ message: "Invalid URL format" })
 });
 
+const rateLimitSchema = z.object({
+    rate_limit: z.coerce.number({
+        required_error: "Rate Limit is required",
+        invalid_type_error: "Rate Limit must be a valid number",
+    }).min(1024, {
+        message: "Rate Limit must be at least 1024 bytes/s (1 KB/s)"
+    }).max(104857600, {
+        message: "Rate Limit must be at most 104857600 bytes/s (100 MB/s)"
+    }),
+});
+
 export default function SettingsPage() {
     const { toast } = useToast();
     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);
@@ -53,9 +73,19 @@ export default function SettingsPage() {
     const ytDlpAutoUpdate = useSettingsPageStatesStore(state => state.settings.ytdlp_auto_update);
     const appTheme = useSettingsPageStatesStore(state => state.settings.theme);
     const maxParallelDownloads = useSettingsPageStatesStore(state => state.settings.max_parallel_downloads);
+    const maxRetries = useSettingsPageStatesStore(state => state.settings.max_retries);
     const preferVideoOverPlaylist = useSettingsPageStatesStore(state => state.settings.prefer_video_over_playlist);
+    const strictDownloadabilityCheck = useSettingsPageStatesStore(state => state.settings.strict_downloadablity_check);
     const useProxy = useSettingsPageStatesStore(state => state.settings.use_proxy);
     const proxyUrl = useSettingsPageStatesStore(state => state.settings.proxy_url);
+    const useRateLimit = useSettingsPageStatesStore(state => state.settings.use_rate_limit);
+    const rateLimit = useSettingsPageStatesStore(state => state.settings.rate_limit);
+    const videoFormat = useSettingsPageStatesStore(state => state.settings.video_format);
+    const audioFormat = useSettingsPageStatesStore(state => state.settings.audio_format);
+    const alwaysReencodeVideo = useSettingsPageStatesStore(state => state.settings.always_reencode_video);
+    const embedVideoMetadata = useSettingsPageStatesStore(state => state.settings.embed_video_metadata);
+    const embedAudioMetadata = useSettingsPageStatesStore(state => state.settings.embed_audio_metadata);
+    const embedAudioThumbnail = useSettingsPageStatesStore(state => state.settings.embed_audio_thumbnail);
     const websocketPort = useSettingsPageStatesStore(state => state.settings.websocket_port);
     const isChangingWebSocketPort = useSettingsPageStatesStore(state => state.isChangingWebSocketPort);
     const setIsChangingWebSocketPort = useSettingsPageStatesStore(state => state.setIsChangingWebSocketPort);
@@ -68,6 +98,7 @@ export default function SettingsPage() {
     );
 
     const downloadDirPath = useBasePathsStore((state) => state.downloadDirPath);
+    const tempDownloadDirPath = useBasePathsStore((state) => state.tempDownloadDirPath);
     const setPath = useBasePathsStore((state) => state.setPath);
     const { saveSettingsKey, resetSettings } = useSettings();
     const { updateYtDlp } = useYtDlpUpdater();
@@ -79,6 +110,53 @@ export default function SettingsPage() {
         { value: 'system', icon: Monitor, label: 'System' },
     ];
 
+    const openLink = async (url: string, app: string | null) => {
+        try {
+            await invoke('open_file_with_app', { filePath: url, appName: app }).then(() => {
+                toast({
+                    title: 'Opening Link',
+                    description: `Opening link with ${app ? app : 'default app'}.`,
+                })
+            });
+        } catch (e) {
+            console.error(e);
+            toast({
+                title: 'Failed to open link',
+                description: 'An error occurred while trying to open the link.',
+                variant: "destructive"
+            })
+        }
+    }
+
+    const cleanTemporaryDownloads = async () => {
+        const tempFiles = await fs.readDir(tempDownloadDirPath ?? '');
+        if (tempFiles.length > 0) {
+            try {
+                for (const file of tempFiles) {
+                    if (file.isFile) {
+                        const filePath = await join(tempDownloadDirPath ?? '', file.name);
+                        await fs.remove(filePath);
+                    }
+                }
+                toast({
+                    title: "Temporary Downloads Cleaned",
+                    description: "All temporary downloads have been successfully cleaned up.",
+                });
+            } catch (e) {
+                toast({
+                    title: "Temporary Downloads Cleanup Failed",
+                    description: "An error occurred while trying to clean up temporary downloads. Please try again.",
+                    variant: "destructive",
+                });
+            }
+        } else {
+            toast({
+                title: "No Temporary Downloads",
+                description: "There are no temporary downloads to clean up.",
+            });
+        }
+    }
+
     const proxyUrlForm = useForm<z.infer<typeof proxyUrlSchema>>({
         resolver: zodResolver(proxyUrlSchema),
         defaultValues: {
@@ -106,6 +184,33 @@ export default function SettingsPage() {
         }
     }
 
+    const rateLimitForm = useForm<z.infer<typeof rateLimitSchema>>({
+        resolver: zodResolver(rateLimitSchema),
+        defaultValues: {
+            rate_limit: rateLimit,
+        },
+        mode: "onChange",
+    });
+    const watchedRateLimit = rateLimitForm.watch("rate_limit");
+    const { errors: rateLimitFormErrors } = rateLimitForm.formState;
+
+    function handleRateLimitSubmit(values: z.infer<typeof rateLimitSchema>) {
+        try {
+            saveSettingsKey('rate_limit', values.rate_limit);
+            toast({
+                title: "Rate Limit updated",
+                description: `Rate Limit changed to ${values.rate_limit} bytes/s`,
+            });
+        } catch (error) {
+            console.error("Error changing rate limit:", error);
+            toast({
+                title: "Failed to change rate limit",
+                description: "Please try again.",
+                variant: "destructive",
+            });
+        }
+    }
+
     interface Config {
         port: number;
     }
@@ -157,11 +262,40 @@ export default function SettingsPage() {
         <div className="container mx-auto p-4 space-y-4 min-h-screen">
             <Heading title="Settings" description="Manage your preferences and app settings" />
             <Tabs value={activeTab} onValueChange={setActiveTab}>
+                <div className="w-full flex items-center justify-between">
                     <TabsList>
-                    <TabsTrigger value="general">General</TabsTrigger>
+                        <TabsTrigger value="app">Application</TabsTrigger>
                         <TabsTrigger value="extension">Extension</TabsTrigger>
                     </TabsList>
-                <TabsContent value="general">
+                    <AlertDialog>
+                        <AlertDialogTrigger asChild>
+                            <Button
+                            className="w-fit"
+                            variant="destructive"
+                            size="sm"
+                            disabled={isUsingDefaultSettings}
+                            >
+                                <RotateCcw className="h-4 w-4" />
+                                Reset
+                            </Button>
+                        </AlertDialogTrigger>
+                        <AlertDialogContent>
+                            <AlertDialogHeader>
+                                <AlertDialogTitle>Reset settings to default?</AlertDialogTitle>
+                                <AlertDialogDescription>
+                                    Are you sure you want to reset all settings to their default values? This action cannot be undone!
+                                </AlertDialogDescription>
+                            </AlertDialogHeader>
+                            <AlertDialogFooter>
+                                <AlertDialogCancel>Cancel</AlertDialogCancel>
+                                <AlertDialogAction onClick={
+                                    () => resetSettings()
+                                }>Reset</AlertDialogAction>
+                            </AlertDialogFooter>
+                        </AlertDialogContent>
+                    </AlertDialog>
+                </div>
+                <TabsContent value="app">
                     <Card className="p-4 space-y-4 my-4">
                         <div className="w-full flex gap-4 items-center justify-between">
                             <div className="flex gap-4 items-center">
@@ -220,10 +354,95 @@ export default function SettingsPage() {
                             </div>
                         </div>
                     </Card>
-                    <div className="flex flex-col w-[50%] gap-4">
+                    <Tabs
+                    className="w-full flex flex-row items-start gap-4 mt-7"
+                    orientation="vertical"
+                    value={activeSubAppTab}
+                    onValueChange={setActiveSubAppTab}
+                    >
+                        <TabsList className="shrink-0 grid grid-cols-1 gap-1 p-0 bg-background min-w-45">
+                            <TabsTrigger
+                                key="general"
+                                value="general"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><Wrench className="size-4" /> General</TabsTrigger>
+                            <TabsTrigger
+                                key="appearance"
+                                value="appearance"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><WandSparkles className="size-4" /> Appearance</TabsTrigger>
+                            <TabsTrigger
+                                key="folders"
+                                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="metadata"
+                                value="metadata"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><Info className="size-4" /> Metadata</TabsTrigger>
+                            <TabsTrigger
+                                key="network"
+                                value="network"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><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-[235px]">
+                                <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>
+                                    <Slider
+                                    id="max-parallel-downloads"
+                                    className="w-[350px] mb-2"
+                                    value={[maxParallelDownloads]}
+                                    min={1}
+                                    max={5}
+                                    onValueChange={(value) => saveSettingsKey('max_parallel_downloads', value[0])}
+                                    />
+                                    <Label htmlFor="max-parallel-downloads" className="text-xs text-muted-foreground">(Current: {maxParallelDownloads}) (Default: 2, Maximum: 5)</Label>
+                                </div>
+                                <div className="prefer-video-over-playlist">
+                                    <h3 className="font-semibold">Prefer Video Over Playlist</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Prefer only the video, if the URL refers to a video and a playlist</p>
+                                    <Switch
+                                    id="prefer-video-over-playlist"
+                                    checked={preferVideoOverPlaylist}
+                                    onCheckedChange={(checked) => saveSettingsKey('prefer_video_over_playlist', checked)}
+                                    />
+                                </div>
+                                <div className="strict-downloadability-check">
+                                    <h3 className="font-semibold">Strict Downloadablity Check</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Only show streams that are actualy downloadable, also check formats before downloading (high quality results, takes longer time to search)</p>
+                                    <Switch
+                                    id="strict-downloadablity-check"
+                                    checked={strictDownloadabilityCheck}
+                                    onCheckedChange={(checked) => saveSettingsKey('strict_downloadablity_check', checked)}
+                                    />
+                                </div>
+                                <div className="max-retries">
+                                    <h3 className="font-semibold">Max Retries</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Set maximum number of retries for a download before giving up</p>
+                                    <Slider
+                                    id="max-retries"
+                                    className="w-[350px] mb-2"
+                                    value={[maxRetries]}
+                                    min={1}
+                                    max={100}
+                                    onValueChange={(value) => saveSettingsKey('max_retries', value[0])}
+                                    />
+                                    <Label htmlFor="max-retries" className="text-xs text-muted-foreground">(Current: {maxRetries}) (Default: 5, Maximum: 100)</Label>
+                                </div>
+                            </TabsContent>
+                            <TabsContent key="appearance" value="appearance" className="flex flex-col gap-4 min-h-[235px]">
                                 <div className="app-theme">
                                     <h3 className="font-semibold">Theme</h3>
-                            <p className="text-sm text-muted-foreground mb-3">Choose app interface theme</p>
+                                    <p className="text-xs text-muted-foreground mb-3">Choose app interface theme</p>
                                     <div className={cn('inline-flex gap-1 rounded-lg p-1 bg-muted')}>
                                         {themeOptions.map(({ value, icon: Icon, label }) => (
                                             <button
@@ -242,9 +461,11 @@ export default function SettingsPage() {
                                         ))}
                                     </div>
                                 </div>
+                            </TabsContent>
+                            <TabsContent key="folders" value="folders" className="flex flex-col gap-4 min-h-[235px]">
                                 <div className="download-dir">
-                            <h3 className="font-semibold">Download Directory</h3>
+                                    <h3 className="font-semibold">Download Folder</h3>
-                            <p className="text-sm text-muted-foreground mb-3">Set default download directory</p>
+                                    <p className="text-xs text-muted-foreground mb-3">Set default download folder (directory)</p>
                                     <div className="flex items-center gap-4">
                                         <Input className="focus-visible:ring-0" type="text" placeholder="Select download directory" value={downloadDirPath ?? 'Unknown'} readOnly/>
                                         <Button
@@ -273,31 +494,136 @@ export default function SettingsPage() {
                                         </Button>
                                     </div>
                                 </div>
-                        <div className="max-parallel-downloads">
+                                <div className="temporary-download-dir">
-                            <h3 className="font-semibold">Max Parallel Downloads</h3>
+                                    <h3 className="font-semibold">Temporary Download Folder</h3>
-                            <p className="text-sm text-muted-foreground mb-3">Set maximum number of allowed parallel downloads</p>
+                                    <p className="text-xs text-muted-foreground mb-3">Clean up temporary downloads (broken, cancelled, paused downloads)</p>
-                            <Slider
+                                    <div className="flex items-center gap-4">
-                            id="max-parallel-downloads"
+                                        <Input className="focus-visible:ring-0" type="text" placeholder="Temporary download directory" value={tempDownloadDirPath ?? 'Unknown'} readOnly/>
-                            className="w-[350px] mb-2"
+                                        <AlertDialog>
-                            value={[maxParallelDownloads]}
+                                            <AlertDialogTrigger asChild>
-                            min={1}
+                                                <Button
-                            max={5}
+                                                variant="destructive"
-                            onValueChange={(value) => saveSettingsKey('max_parallel_downloads', value[0])}
+                                                disabled={ongoingDownloads.length > 0}
-                            />
+                                                >
-                            <Label htmlFor="max-parallel-downloads" className="text-xs text-muted-foreground">(Current: {maxParallelDownloads}) (Default: 2, Maximum: 5)</Label>
+                                                    <BrushCleaning className="size-4" /> Clean
+                                                </Button>
+                                            </AlertDialogTrigger>
+                                            <AlertDialogContent>
+                                                <AlertDialogHeader>
+                                                    <AlertDialogTitle>Clean up all temporary downloads?</AlertDialogTitle>
+                                                    <AlertDialogDescription>Are you sure you want to clean up all temporary downloads? This will remove all broken, cancelled and paused downloads from the temporary folder. Paused downloads will re-start from the begining. This action cannot be undone!</AlertDialogDescription>
+                                                </AlertDialogHeader>
+                                                <AlertDialogFooter>
+                                                    <AlertDialogCancel>Cancel</AlertDialogCancel>
+                                                    <AlertDialogAction
+                                                    onClick={() => cleanTemporaryDownloads()}
+                                                    >Clean</AlertDialogAction>
+                                                </AlertDialogFooter>
+                                            </AlertDialogContent>
+                                        </AlertDialog>
                                     </div>
-                        <div className="prefer-video-over-playlist">
+                                </div>
-                            <h3 className="font-semibold">Prefer Video Over Playlist</h3>
+                            </TabsContent>
-                            <p className="text-sm text-muted-foreground mb-3">Prefer only the video, if the URL refers to a video and a playlist</p>
+                            <TabsContent key="formats" value="formats" className="flex flex-col gap-4 min-h-[235px]">
+                                <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>
+                                <div className="always-reencode-video">
+                                    <h3 className="font-semibold">Always Re-Encode Video</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Instead of remuxing (simple container change) always re-encode the video to the target format with best compatible codecs (better compatibility, takes longer processing time)</p>
                                     <Switch
-                            id="prefer-video-over-playlist"
+                                    id="always-reencode-video"
-                            checked={preferVideoOverPlaylist}
+                                    checked={alwaysReencodeVideo}
-                            onCheckedChange={(checked) => saveSettingsKey('prefer_video_over_playlist', checked)}
+                                    onCheckedChange={(checked) => saveSettingsKey('always_reencode_video', checked)}
                                     />
                                 </div>
+                            </TabsContent>
+                            <TabsContent key="metadata" value="metadata" className="flex flex-col gap-4 min-h-[235px]">
+                                <div className="embed-video-metadata">
+                                    <h3 className="font-semibold">Embed Metadata</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Wheather to embed metadata in video/audio files (info, chapters)</p>
+                                    <div className="flex items-center space-x-2 mb-3">
+                                        <Switch
+                                        id="embed-video-metadata"
+                                        checked={embedVideoMetadata}
+                                        onCheckedChange={(checked) => saveSettingsKey('embed_video_metadata', checked)}
+                                        />
+                                        <Label htmlFor="embed-video-metadata">Video</Label>
+                                    </div>
+                                    <div className="flex items-center space-x-2">
+                                        <Switch
+                                        id="embed-audio-metadata"
+                                        checked={embedAudioMetadata}
+                                        onCheckedChange={(checked) => saveSettingsKey('embed_audio_metadata', checked)}
+                                        />
+                                        <Label htmlFor="embed-audio-metadata">Audio</Label>
+                                    </div>
+                                </div>
+                                <div className="embed-audio-thumbnail">
+                                    <h3 className="font-semibold">Embed Thumbnail in Audio</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Wheather to embed thumbnail in audio files (as cover art)</p>
+                                    <Switch
+                                    id="embed-audio-thumbnail"
+                                    checked={embedAudioThumbnail}
+                                    onCheckedChange={(checked) => saveSettingsKey('embed_audio_thumbnail', checked)}
+                                    />
+                                </div>
+                            </TabsContent>
+                            <TabsContent key="network" value="network" className="flex flex-col gap-4 min-h-[235px]">
                                 <div className="proxy">
                                     <h3 className="font-semibold">Proxy</h3>
-                            <p className="text-sm 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>
+                                    <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>
                                     <div className="flex items-center space-x-2 mb-4">
                                         <Switch
                                         id="use-proxy"
@@ -306,7 +632,6 @@ export default function SettingsPage() {
                                         />
                                         <Label htmlFor="use-proxy">Use Proxy</Label>
                                     </div>
-                            <div className="flex items-center gap-4">
                                     <Form {...proxyUrlForm}>
                                         <form onSubmit={proxyUrlForm.handleSubmit(handleProxyUrlSubmit)} className="flex gap-4 w-full" autoComplete="off">
                                             <FormField
@@ -336,9 +661,50 @@ export default function SettingsPage() {
                                         </form>
                                     </Form>
                                 </div>
+                                <div className="rate-limit">
+                                    <h3 className="font-semibold">Rate Limit</h3>
+                                    <p className="text-xs text-muted-foreground mb-3">Limit download speed to prevent network congestion. Rate limit is applied per-download basis (not in the whole app)</p>
+                                    <div className="flex items-center space-x-2 mb-4">
+                                        <Switch
+                                        id="use-rate-limit"
+                                        checked={useRateLimit}
+                                        onCheckedChange={(checked) => saveSettingsKey('use_rate_limit', checked)}
+                                        />
+                                        <Label htmlFor="use-rate-limit">Use Rate Limit</Label>
                                     </div>
+                                    <Form {...rateLimitForm}>
+                                        <form onSubmit={rateLimitForm.handleSubmit(handleRateLimitSubmit)} className="flex gap-4 w-full" autoComplete="off">
+                                            <FormField
+                                                control={rateLimitForm.control}
+                                                name="rate_limit"
+                                                disabled={!useRateLimit}
+                                                render={({ field }) => (
+                                                    <FormItem className="w-full">
+                                                        <FormControl>
+                                                            <Input
+                                                            className="focus-visible:ring-0"
+                                                            placeholder="Enter rate limit in bytes/s"
+                                                            {...field}
+                                                            />
+                                                        </FormControl>
+                                                        <Label htmlFor="rate_limit" className="text-xs text-muted-foreground">(Configured: {rateLimit ? `${rateLimit} = ${formatSpeed(rateLimit)}` : 'No'}, Status: {useRateLimit ? 'Enabled' : 'Disabled'}) (Default: 1048576, Range: 1024-104857600)</Label>
+                                                        <FormMessage />
+                                                    </FormItem>
+                                                )}
+                                            />
+                                            <Button
+                                                type="submit"
+                                                disabled={!watchedRateLimit || Number(watchedRateLimit) === rateLimit || Object.keys(rateLimitFormErrors).length > 0 || !useRateLimit}
+                                            >
+                                                Save
+                                            </Button>
+                                        </form>
+                                    </Form>
                                 </div>
                             </TabsContent>
+                        </div>
+                    </Tabs>
+                </TabsContent>
                 <TabsContent value="extension">
                     <Card className="p-4 space-y-4 my-4">
                         <div className="w-full flex gap-4 items-center justify-between">
@@ -348,7 +714,13 @@ export default function SettingsPage() {
                                 </div>
                                 <div className="flex flex-col">
                                     <h3 className="">Extension Websocket Server</h3>
-                                    <p className="text-xs text-muted-foreground">{isChangingWebSocketPort || isRestartingWebSocketServer ? 'Restarting...' : 'Running' }</p>
+                                    <div className="text-xs flex items-center">
+                                        {isChangingWebSocketPort || isRestartingWebSocketServer ? (
+                                            <><div className="h-1.5 w-1.5 rounded-full bg-amber-600 dark:bg-amber-500 mr-1.5 mt-0.5" /><span className="text-amber-600 dark:text-amber-500">Restarting...</span></>
+                                        ) : (
+                                            <><div className="h-1.5 w-1.5 rounded-full bg-emerald-600 dark:bg-emerald-500 mr-1.5 mt-0.5" /><span className="text-emerald-600 dark:text-emerald-500">Running</span></>
+                                        )}
+                                    </div>
                                 </div>
                             </div>
                             <div className="flex gap-4 items-center">
@@ -389,10 +761,79 @@ export default function SettingsPage() {
                             </div>
                         </div>
                     </Card>
-                    <div className="flex flex-col w-[50%] gap-4">
+                    <Tabs
+                    className="w-full flex flex-row items-start gap-4 mt-7"
+                    orientation="vertical"
+                    value={activeSubExtTab}
+                    onValueChange={setActiveSubExtTab}
+                    >
+                        <TabsList className="shrink-0 grid grid-cols-1 gap-1 p-0 bg-background min-w-45">
+                            <TabsTrigger
+                                key="install"
+                                value="install"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><ArrowDownToLine className="size-4" /> Install</TabsTrigger>
+                            <TabsTrigger
+                                key="port"
+                                value="port"
+                                className="data-[state=active]:bg-primary data-[state=active]:text-primary-foreground justify-start px-3 py-1.5 gap-2"
+                            ><EthernetPort className="size-4" /> Port</TabsTrigger>
+                        </TabsList>
+                        <div className="min-h-full flex flex-col w-full border-l border-border pl-4">
+                            <TabsContent key="install" value="install" className="flex flex-col gap-4 min-h-[150px] max-w-[90%]">
+                                <div className="install-neodlp-extension">
+                                    <h3 className="font-semibold">NeoDLP Extension</h3>
+                                    <p className="text-xs text-muted-foreground mb-4">Integrate NeoDLP with your favourite browser</p>
+                                    <div className="flex items-center gap-4 mb-4">
+                                        <SlidingButton
+                                            slidingContent={
+                                                <div className="flex items-center justify-center gap-2 text-white dark:text-black">
+                                                    <ArrowRight className="size-4" />
+                                                    <span>Get Now</span>
+                                                </div>
+                                            }
+                                            onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'chrome')}
+                                            >
+                                            <span className="font-semibold flex items-center gap-2">
+                                                <svg className="size-4 fill-white dark:fill-black" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+                                                    <path d="M0 256C0 209.4 12.5 165.6 34.3 127.1L144.1 318.3C166 357.5 207.9 384 256 384C270.3 384 283.1 381.7 296.8 377.4L220.5 509.6C95.9 492.3 0 385.3 0 256zM365.1 321.6C377.4 302.4 384 279.1 384 256C384 217.8 367.2 183.5 340.7 160H493.4C505.4 189.6 512 222.1 512 256C512 397.4 397.4 511.1 256 512L365.1 321.6zM477.8 128H256C193.1 128 142.3 172.1 130.5 230.7L54.2 98.5C101 38.5 174 0 256 0C350.8 0 433.5 51.5 477.8 128V128zM168 256C168 207.4 207.4 168 256 168C304.6 168 344 207.4 344 256C344 304.6 304.6 344 256 344C207.4 344 168 304.6 168 256z"/>
+                                                </svg>
+                                                Get Chrome Extension
+                                            </span>
+                                            <span className="text-xs">from Chrome Web Store</span>
+                                        </SlidingButton>
+                                        <SlidingButton
+                                            slidingContent={
+                                                <div className="flex items-center justify-center gap-2 text-white dark:text-black">
+                                                    <ArrowRight className="size-4" />
+                                                    <span>Get Now</span>
+                                                </div>
+                                            }
+                                            onClick={() => openLink('https://addons.mozilla.org/en-US/firefox/addon/neo-downloader-plus', 'firefox')}
+                                            >
+                                            <span className="font-semibold flex items-center gap-2">
+                                                <svg className="size-4 fill-white dark:fill-black" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
+                                                    <path d="M130.2 127.5C130.4 127.6 130.3 127.6 130.2 127.5V127.5zM481.6 172.9C471 147.4 449.6 119.9 432.7 111.2C446.4 138.1 454.4 165 457.4 185.2C457.4 185.3 457.4 185.4 457.5 185.6C429.9 116.8 383.1 89.1 344.9 28.7C329.9 5.1 334 3.5 331.8 4.1L331.7 4.2C285 30.1 256.4 82.5 249.1 126.9C232.5 127.8 216.2 131.9 201.2 139C199.8 139.6 198.7 140.7 198.1 142C197.4 143.4 197.2 144.9 197.5 146.3C197.7 147.2 198.1 148 198.6 148.6C199.1 149.3 199.8 149.9 200.5 150.3C201.3 150.7 202.1 151 203 151.1C203.8 151.1 204.7 151 205.5 150.8L206 150.6C221.5 143.3 238.4 139.4 255.5 139.2C318.4 138.7 352.7 183.3 363.2 201.5C350.2 192.4 326.8 183.3 304.3 187.2C392.1 231.1 368.5 381.8 247 376.4C187.5 373.8 149.9 325.5 146.4 285.6C146.4 285.6 157.7 243.7 227 243.7C234.5 243.7 256 222.8 256.4 216.7C256.3 214.7 213.8 197.8 197.3 181.5C188.4 172.8 184.2 168.6 180.5 165.5C178.5 163.8 176.4 162.2 174.2 160.7C168.6 141.2 168.4 120.6 173.5 101.1C148.5 112.5 129 130.5 114.8 146.4H114.7C105 134.2 105.7 93.8 106.3 85.3C106.1 84.8 99 89 98.1 89.7C89.5 95.7 81.6 102.6 74.3 110.1C58 126.7 30.1 160.2 18.8 211.3C14.2 231.7 12 255.7 12 263.6C12 398.3 121.2 507.5 255.9 507.5C376.6 507.5 478.9 420.3 496.4 304.9C507.9 228.2 481.6 173.8 481.6 172.9z"/>
+                                                </svg>
+                                                Get Firefox Extension
+                                            </span>
+                                            <span className="text-xs">from Mozilla Addons Store</span>
+                                        </SlidingButton>
+                                    </div>
+                                    <div className="flex gap-2 mb-4">
+                                        <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'msedge')}>Edge</Button>
+                                        <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'opera')}>Opera</Button>
+                                        <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'brave')}>Brave</Button>
+                                        <Button variant="outline" onClick={() => openLink('https://chromewebstore.google.com/detail/neo-downloader-plus/mehopeailfjmiloiiohgicphlcgpompf', 'arc')}>Arc</Button>
+                                        <Button variant="outline" onClick={() => openLink('https://addons.mozilla.org/en-US/firefox/addon/neo-downloader-plus', 'zen')}>Zen</Button>
+                                    </div>
+                                    <p className="text-xs text-muted-foreground mb-2">* These links opens with coresponding browsers only. Make sure the browser is installed before clicking the link</p>
+                                </div>
+                            </TabsContent>
+                            <TabsContent key="port" value="port" className="flex flex-col gap-4 min-h-[150px] max-w-[70%]">
                                 <div className="websocket-port">
                                     <h3 className="font-semibold">Websocket Port</h3>
-                            <p className="text-sm text-muted-foreground mb-3">Change extension websocket server port</p>
+                                    <p className="text-xs text-muted-foreground mb-3">Change extension websocket server port</p>
                                     <div className="flex items-center gap-4">
                                         <Form {...websocketPortForm}>
                                             <form onSubmit={websocketPortForm.handleSubmit(handleWebsocketPortSubmit)} className="flex gap-4 w-full" autoComplete="off">
@@ -431,39 +872,11 @@ export default function SettingsPage() {
                                         </Form>
                                     </div>
                                 </div>
+                            </TabsContent>
                         </div>
+                    </Tabs>
                 </TabsContent>
             </Tabs>
-            <div className="flex flex-col">
-                <h3 className="font-semibold">Reset Settings</h3>
-                <p className="text-sm text-muted-foreground mb-3">Reset all setting to default</p>
-                <AlertDialog>
-                    <AlertDialogTrigger asChild>
-                        <Button
-                        className="w-fit"
-                        variant="destructive"
-                        disabled={isUsingDefaultSettings}
-                        >
-                            <RotateCcw className="h-4 w-4" />
-                            Reset Default
-                        </Button>
-                    </AlertDialogTrigger>
-                    <AlertDialogContent>
-                        <AlertDialogHeader>
-                            <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-                            <AlertDialogDescription>
-                                This action cannot be undone! it will permanently reset all settings to default.
-                            </AlertDialogDescription>
-                        </AlertDialogHeader>
-                        <AlertDialogFooter>
-                            <AlertDialogCancel>Cancel</AlertDialogCancel>
-                            <AlertDialogAction onClick={
-                                () => resetSettings()
-                            }>Reset</AlertDialogAction>
-                        </AlertDialogFooter>
-                    </AlertDialogContent>
-                </AlertDialog>
-            </div>
         </div>
     )
 }

src/routes.ts

@@ -1,4 +1,4 @@
-import { Download, Puzzle, Settings, SquarePlay } from "lucide-react";
+import { Download, Settings, SquarePlay } from "lucide-react";
 import { RoutesObj } from "@/types/route";
 
 export const AllRoutes: Array<RoutesObj> = [
@@ -12,11 +12,6 @@ export const AllRoutes: Array<RoutesObj> = [
         url: "/library",
         icon: SquarePlay,
     },
-    {
-        title: "Extension",
-        url: "/extension",
-        icon: Puzzle,
-    },
     {
         title: "Settings",
         url: "/settings",

src/services/store.ts

@@ -1,4 +1,4 @@
-import { BasePathsStore, CurrentVideoMetadataStore, DownloadActionStatesStore, DownloaderPageStatesStore, DownloadStatesStore, KvPairsStatesStore, SettingsPageStatesStore } from '@/types/store';
+import { BasePathsStore, CurrentVideoMetadataStore, DownloadActionStatesStore, DownloaderPageStatesStore, DownloadStatesStore, KvPairsStatesStore, LibraryPageStatesStore, SettingsPageStatesStore } from '@/types/store';
 import { create } from 'zustand';
 
 export const useBasePathsStore = create<BasePathsStore>((set) => ({
@@ -42,14 +42,31 @@ export const useCurrentVideoMetadataStore = create<CurrentVideoMetadataStore>((s
 }));
 
 export const useDownloaderPageStatesStore = create<DownloaderPageStatesStore>((set) => ({
+    activeDownloadModeTab: 'selective',
     isStartingDownload: false,
-    selctedDownloadFormat: 'best',
+    selectedDownloadFormat: 'best',
+    selectedCombinableVideoFormat: '',
+    selectedCombinableAudioFormat: '',
     selectedSubtitles: [],
     selectedPlaylistVideoIndex: '1',
+    isErrored: false,
+    isErrorExpected: false,
+    erroredDownloadId: null,
+    setActiveDownloadModeTab: (tab) => set(() => ({ activeDownloadModeTab: tab })),
     setIsStartingDownload: (isStarting) => set(() => ({ isStartingDownload: isStarting })),
-    setSelctedDownloadFormat: (format) => set(() => ({ selctedDownloadFormat: format })),
+    setSelectedDownloadFormat: (format) => set(() => ({ selectedDownloadFormat: format })),
+    setSelectedCombinableVideoFormat: (format) => set(() => ({ selectedCombinableVideoFormat: format })),
+    setSelectedCombinableAudioFormat: (format) => set(() => ({ selectedCombinableAudioFormat: format })),
     setSelectedSubtitles: (subtitles) => set(() => ({ selectedSubtitles: subtitles })),
-    setSelectedPlaylistVideoIndex: (index) => set(() => ({ selectedPlaylistVideoIndex: index }))
+    setSelectedPlaylistVideoIndex: (index) => set(() => ({ selectedPlaylistVideoIndex: index })),
+    setIsErrored: (isErrored) => set(() => ({ isErrored: isErrored })),
+    setIsErrorExpected: (isErrorExpected) => set(() => ({ isErrorExpected: isErrorExpected })),
+    setErroredDownloadId: (downloadId) => set(() => ({ erroredDownloadId: downloadId })),
+}));
+
+export const useLibraryPageStatesStore = create<LibraryPageStatesStore>((set) => ({
+    activeTab: 'completed',
+    setActiveTab: (tab) => set(() => ({ activeTab: tab }))
 }));
 
 export const useDownloadActionStatesStore = create<DownloadActionStatesStore>((set) => ({
@@ -93,7 +110,9 @@ export const useDownloadActionStatesStore = create<DownloadActionStatesStore>((s
 }));
 
 export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set) => ({
-    activeTab: 'general',
+    activeTab: 'app',
+    activeSubAppTab: 'general',
+    activeSubExtTab: 'install',
     appVersion: null,
     isFetchingAppVersion: false,
     ytDlpVersion: null,
@@ -105,9 +124,19 @@ export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set)
         theme: 'system',
         download_dir: '',
         prefer_video_over_playlist: true,
+        strict_downloadablity_check: false,
         max_parallel_downloads: 2,
+        max_retries: 5,
         use_proxy: false,
         proxy_url: '',
+        use_rate_limit: false,
+        rate_limit: 1048576, // 1 MB/s
+        video_format: 'auto',
+        audio_format: 'auto',
+        always_reencode_video: false,
+        embed_video_metadata: false,
+        embed_audio_metadata: true,
+        embed_audio_thumbnail: true,
         websocket_port: 53511
     },
     isUsingDefaultSettings: true,
@@ -118,6 +147,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 })),
@@ -137,9 +168,19 @@ export const useSettingsPageStatesStore = create<SettingsPageStatesStore>((set)
             theme: 'system',
             download_dir: '',
             prefer_video_over_playlist: true,
+            strict_downloadablity_check: false,
             max_parallel_downloads: 2,
+            max_retries: 5,
             use_proxy: false,
             proxy_url: '',
+            use_rate_limit: false,
+            rate_limit: 1048576, // 1 MB/s
+            video_format: 'auto',
+            audio_format: 'auto',
+            always_reencode_video: false,
+            embed_video_metadata: false,
+            embed_audio_metadata: true,
+            embed_audio_thumbnail: true,
             websocket_port: 53511
         },
         isUsingDefaultSettings: true

src/types/settings.ts

@@ -9,8 +9,19 @@ export interface Settings {
     theme: 'dark' | 'light' | 'system';
     download_dir: string;
     max_parallel_downloads: number;
+    max_retries: number;
     prefer_video_over_playlist: boolean;
+    strict_downloadablity_check: boolean;
     use_proxy: boolean;
     proxy_url: string;
+    use_rate_limit: boolean;
+    rate_limit: number;
+    video_format: string;
+    audio_format: string;
+    always_reencode_video: boolean;
+    embed_video_metadata: boolean;
+    embed_audio_metadata: boolean;
+    embed_audio_thumbnail: boolean;
+    // extension settings
     websocket_port: number;
 }

src/types/store.ts

@@ -31,14 +31,31 @@ export interface CurrentVideoMetadataStore {
 }
 
 export interface DownloaderPageStatesStore {
+    activeDownloadModeTab: string;
     isStartingDownload: boolean;
-    selctedDownloadFormat: string;
+    selectedDownloadFormat: string;
+    selectedCombinableVideoFormat: string;
+    selectedCombinableAudioFormat: string;
     selectedSubtitles: string[];
     selectedPlaylistVideoIndex: string;
+    isErrored: boolean;
+    isErrorExpected: boolean;
+    erroredDownloadId: string | null;
+    setActiveDownloadModeTab: (tab: string) => void;
     setIsStartingDownload: (isStarting: boolean) => void;
-    setSelctedDownloadFormat: (format: string) => void;
+    setSelectedDownloadFormat: (format: string) => void;
+    setSelectedCombinableVideoFormat: (format: string) => void;
+    setSelectedCombinableAudioFormat: (format: string) => void;
     setSelectedSubtitles: (subtitles: string[]) => void;
     setSelectedPlaylistVideoIndex: (index: string) => void;
+    setIsErrored: (isErrored: boolean) => void;
+    setIsErrorExpected: (isErrorExpected: boolean) => void;
+    setErroredDownloadId: (downloadId: string | null) => void;
+}
+
+export interface LibraryPageStatesStore {
+    activeTab: string;
+    setActiveTab: (tab: string) => void;
 }
 
 export interface DownloadActionStatesStore {
@@ -58,6 +75,8 @@ export interface DownloadActionStatesStore {
 
 export interface SettingsPageStatesStore {
     activeTab: string;
+    activeSubAppTab: string;
+    activeSubExtTab: string;
     appVersion: string | null;
     isFetchingAppVersion: boolean;
     ytDlpVersion: string | null;
@@ -72,6 +91,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;