From 785bd7874d404e069a62cc5c99447c1f9bfcbdda Mon Sep 17 00:00:00 2001 From: Subhamoy Biswas Date: Fri, 13 Jun 2025 22:15:50 +0530 Subject: [PATCH] (refactor): minor tweaks for latest dependency migration --- .../yt-dlp-x86_64-pc-windows-msvc.exe | 4 +- src-tauri/tauri.conf.json | 2 +- src-tauri/tauri.linux.conf.json | 2 +- src-tauri/tauri.macos-aarch64.conf.json | 2 +- src-tauri/tauri.macos-x86_64.conf.json | 2 +- src-tauri/tauri.windows.conf.json | 2 +- src/components/custom/legacyToggleGroup.tsx | 59 +++++++++++++++++++ src/components/sidebar.tsx | 2 +- src/pages/downloader.tsx | 12 ++-- src/pages/library.tsx | 10 ++-- src/pages/settings.tsx | 22 +++---- 11 files changed, 90 insertions(+), 29 deletions(-) create mode 100644 src/components/custom/legacyToggleGroup.tsx diff --git a/src-tauri/binaries/yt-dlp-x86_64-pc-windows-msvc.exe b/src-tauri/binaries/yt-dlp-x86_64-pc-windows-msvc.exe index b25309f..487ebfc 100644 --- a/src-tauri/binaries/yt-dlp-x86_64-pc-windows-msvc.exe +++ b/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:f26019446a303dfa16f5a4b60e03e853a5d1e0d44a682b31e5cfd2622c0ce2fd -size 18152568 +oid sha256:c20996d097127884243f4780d929b3769d55418c0efa9bd7a98999f387b5fbed +size 18113133 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 1f0eae4..adb7fa1 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -15,7 +15,7 @@ { "title": "NeoDLP", "width": 1067, - "height": 600, + "height": 605, "visible": false } ], diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index 9674244..5b8fe48 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -11,7 +11,7 @@ { "title": "NeoDLP", "width": 1067, - "height": 600, + "height": 605, "visible": false } ], diff --git a/src-tauri/tauri.macos-aarch64.conf.json b/src-tauri/tauri.macos-aarch64.conf.json index 52a814e..e3b3304 100644 --- a/src-tauri/tauri.macos-aarch64.conf.json +++ b/src-tauri/tauri.macos-aarch64.conf.json @@ -11,7 +11,7 @@ { "title": "NeoDLP", "width": 1067, - "height": 600, + "height": 605, "visible": false } ], diff --git a/src-tauri/tauri.macos-x86_64.conf.json b/src-tauri/tauri.macos-x86_64.conf.json index 18f499a..1e0ea36 100644 --- a/src-tauri/tauri.macos-x86_64.conf.json +++ b/src-tauri/tauri.macos-x86_64.conf.json @@ -11,7 +11,7 @@ { "title": "NeoDLP", "width": 1067, - "height": 600, + "height": 605, "visible": false } ], diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 4f21469..3cba0ef 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -11,7 +11,7 @@ { "title": "NeoDLP", "width": 1067, - "height": 600, + "height": 605, "visible": false } ], diff --git a/src/components/custom/legacyToggleGroup.tsx b/src/components/custom/legacyToggleGroup.tsx new file mode 100644 index 0000000..febc3a6 --- /dev/null +++ b/src/components/custom/legacyToggleGroup.tsx @@ -0,0 +1,59 @@ +import * as React from "react" +import * as ToggleGroupPrimitive from "@radix-ui/react-toggle-group" +import { type VariantProps } from "class-variance-authority" + +import { cn } from "@/lib/utils" +import { toggleVariants } from "@/components/ui/toggle" + +const ToggleGroupContext = React.createContext< + VariantProps +>({ + size: "default", + variant: "default", +}) + +const ToggleGroup = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & + VariantProps +>(({ className, variant, size, children, ...props }, ref) => ( + + + {children} + + +)) + +ToggleGroup.displayName = ToggleGroupPrimitive.Root.displayName + +const ToggleGroupItem = React.forwardRef< + React.ElementRef, + React.ComponentPropsWithoutRef & + VariantProps +>(({ className, children, variant, size, ...props }, ref) => { + const context = React.useContext(ToggleGroupContext) + + return ( + + {children} + + ) +}) + +ToggleGroupItem.displayName = ToggleGroupPrimitive.Item.displayName + +export { ToggleGroup, ToggleGroupItem } \ No newline at end of file diff --git a/src/components/sidebar.tsx b/src/components/sidebar.tsx index 36d61c6..c430639 100644 --- a/src/components/sidebar.tsx +++ b/src/components/sidebar.tsx @@ -124,7 +124,7 @@ export function AppSidebar() { {item.title} {item.title === "Library" && ongoingDownloads.length > 0 && showBadge && ( - {ongoingDownloads.length} + {ongoingDownloads.length} )} diff --git a/src/pages/downloader.tsx b/src/pages/downloader.tsx index 78cd599..591444a 100644 --- a/src/pages/downloader.tsx +++ b/src/pages/downloader.tsx @@ -9,10 +9,10 @@ import { useToast } from "@/hooks/use-toast"; import { useAppContext } from "@/providers/appContextProvider"; import { useCurrentVideoMetadataStore, useDownloaderPageStatesStore } 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 } from "lucide-react"; +import { Calendar, Clock, DownloadCloud, Eye, Info, Loader2, Music, ThumbsUp, Video, File, ListVideo, PackageSearch } from "lucide-react"; import { FormatSelectionGroup, FormatSelectionGroupItem } from "@/components/custom/formatSelectionGroup"; import { useEffect, useRef } from "react"; -import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group"; +import { ToggleGroup, ToggleGroupItem } from "@/components/custom/legacyToggleGroup"; import { VideoFormat } from "@/types/video"; // import { PlaylistToggleGroup, PlaylistToggleGroupItem } from "@/components/custom/playlistToggleGroup"; import { PlaylistSelectionGroup, PlaylistSelectionGroupItem } from "@/components/custom/playlistSelectionGroup"; @@ -223,9 +223,9 @@ export default function DownloaderPage() { return (
- + - {config.appName} Search + {config.appName} Search
@@ -239,7 +239,7 @@ export default function DownloaderPage() { @@ -352,7 +352,7 @@ export default function DownloaderPage() { } }} > -

Suggested (Best)

+

Suggested

-
- +
+

Incomplete Downloads

@@ -279,8 +279,8 @@ export default function LibraryPage() { )}
-
- +
+

Completed Downloads

diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx index faf9c9d..64c9147 100644 --- a/src/pages/settings.tsx +++ b/src/pages/settings.tsx @@ -24,13 +24,15 @@ import { invoke } from "@tauri-apps/api/core"; import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from "@/components/ui/alert-dialog"; const websocketPortSchema = z.object({ - port: z.string().min(1, { message: "Websocket port is required" }) - .regex(/^\d+$/, { message: "Websocket port must be a number" }) - .transform((val) => parseInt(val, 10)) - .refine((port) => port >= 50000 && port <= 60000, { - message: "Websocket port must be between 50000 and 60000", - }) -}); + port: z.coerce.number({ + required_error: "Websocket Port is required", + invalid_type_error: "Websocket Port must be a valid number", + }).min(50000, { + message: "Websocket Port must be at least 50000" + }).max(60000, { + message: "Websocket Port must be at most 60000" + }), +}) const proxyUrlSchema = z.object({ url: z.string().min(1, { message: "Proxy URL is required" }).url({ message: "Invalid URL format" }) @@ -163,7 +165,7 @@ export default function SettingsPage() {
-
+
@@ -276,7 +278,7 @@ export default function SettingsPage() {

Set maximum number of allowed parallel downloads

-
+