From 70d1b622e0abe99a6f42f22425e608e19a825382 Mon Sep 17 00:00:00 2001 From: neosubhamoy Date: Wed, 2 Oct 2024 09:31:56 +0530 Subject: [PATCH] (refactor): updated some (windows) naming conventions --- windows/src/App.tsx | 28 ++++++++++++++-------------- windows/src/lib/utils.ts | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/windows/src/App.tsx b/windows/src/App.tsx index d11d49c..44c4d72 100644 --- a/windows/src/App.tsx +++ b/windows/src/App.tsx @@ -7,7 +7,7 @@ import { ThemeProvider } from "@/components/theme-provider"; import { Button } from "@/components/ui/button"; import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert" import { InstalledPrograms, WebSocketMessage, } from "./types"; -import { compareVersions, extract_version, is_installed, sendStreamInfo } from "./lib/utils"; +import { compareVersions, extractVersion, isInstalled, sendStreamInfo } from "./lib/utils"; import { CircleCheck, TriangleAlert, CircleAlert } from 'lucide-react'; function App() { @@ -71,56 +71,56 @@ function App() { }; }, []); - function check_all_programs() { - is_installed('winget', '--version').then((result) => { + function checkAllPrograms() { + isInstalled('winget', '--version').then((result) => { setInstalledPrograms((prevState) => ({ ...prevState, winget: { installed: result.installed, - version: result.output ? extract_version(result.output) : null, + version: result.output ? extractVersion(result.output) : null, } })); }); - is_installed('python', '--version').then((result) => { + isInstalled('python', '--version').then((result) => { setInstalledPrograms((prevState) => ({ ...prevState, python: { installed: result.installed, - version: result.output ? extract_version(result.output) : null, + version: result.output ? extractVersion(result.output) : null, } })); }); - is_installed('pip', '--version').then((result) => { + isInstalled('pip', '--version').then((result) => { setInstalledPrograms((prevState) => ({ ...prevState, pip: { installed: result.installed, - version: result.output ? extract_version(result.output) : null, + version: result.output ? extractVersion(result.output) : null, } })); }); - is_installed('ffmpeg', '-version').then((result) => { + isInstalled('ffmpeg', '-version').then((result) => { setInstalledPrograms((prevState) => ({ ...prevState, ffmpeg: { installed: result.installed, - version: result.output ? extract_version(result.output) : null, + version: result.output ? extractVersion(result.output) : null, } })); }); - is_installed('pytubepp', '--version').then((result) => { + isInstalled('pytubepp', '--version').then((result) => { setInstalledPrograms((prevState) => ({ ...prevState, pytubepp: { installed: result.installed, - version: result.output ? extract_version(result.output) : null, + version: result.output ? extractVersion(result.output) : null, } })); }); } useEffect(() => { - check_all_programs(); + checkAllPrograms(); } , []); @@ -129,7 +129,7 @@ function App() {

PytubePP Helper

- +
diff --git a/windows/src/lib/utils.ts b/windows/src/lib/utils.ts index 4421f55..bf3424b 100644 --- a/windows/src/lib/utils.ts +++ b/windows/src/lib/utils.ts @@ -7,7 +7,7 @@ export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)) } -export async function is_installed(program: string, arg: string): Promise<{ installed: boolean, output: string | null }> { +export async function isInstalled(program: string, arg: string): Promise<{ installed: boolean, output: string | null }> { try{ const output = await new Command('is-' + program + '-installed', [arg]).execute(); if (output.code === 0) { @@ -21,7 +21,7 @@ export async function is_installed(program: string, arg: string): Promise<{ inst } } -export function extract_version(output: string): string | null { +export function extractVersion(output: string): string | null { const versionPatterns = [ /ffmpeg version (\d+\.\d+)/, // Pattern for ffmpeg /Python (\d+\.\d+\.\d+)/, // Pattern for Python