(refactor): merged windows and linux builds in single codebase

.github/workflows/release.yml

@@ -0,0 +1,67 @@
+name: 'publish'
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  publish-tauri:
+    permissions:
+      contents: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        #   - platform: 'macos-latest' # for Arm based macs (M1 and above).
+        #     args: '--target aarch64-apple-darwin'
+        #   - platform: 'macos-latest' # for Intel based macs.
+        #     args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.04.
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install dependencies (ubuntu only)
+        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
+        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
+        # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
+
+      - name: setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: lts/*
+          cache: 'npm' # Set this to npm, yarn or pnpm.
+
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
+          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+        with:
+          workspaces: './src-tauri -> target'
+
+      - name: install frontend dependencies
+        # If you don't have `beforeBuildCommand` configured you may want to build your frontend here too.
+        run: npm install # change this to npm or pnpm depending on which one you use.
+
+      - uses: tauri-apps/tauri-action@v0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
+          releaseName: 'App v__VERSION__'
+          releaseBody: 'See the assets to download this version and install.'
+          releaseDraft: true
+          prerelease: false
+          args: ${{ matrix.args }}

linux/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

linux/README.md

@@ -1,7 +0,0 @@
-# Tauri + React + Typescript
-
-This template should help get you started developing with Tauri, React and Typescript in Vite.
-
-## Recommended IDE Setup
-
-- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)

linux/components.json

@@ -1,20 +0,0 @@
-{
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "new-york",
-  "rsc": false,
-  "tsx": true,
-  "tailwind": {
-    "config": "tailwind.config.js",
-    "css": "src/index.css",
-    "baseColor": "zinc",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib",
-    "hooks": "@/hooks"
-  }
-}

linux/package.json

@@ -1,36 +0,0 @@
-{
-  "name": "pytubepp-helper",
-  "private": true,
-  "version": "0.1.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview",
-    "tauri": "tauri"
-  },
-  "dependencies": {
-    "@radix-ui/react-icons": "^1.3.0",
-    "@radix-ui/react-slot": "^1.1.0",
-    "@tauri-apps/api": "^1",
-    "class-variance-authority": "^0.7.0",
-    "clsx": "^2.1.1",
-    "lucide-react": "^0.441.0",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "tailwind-merge": "^2.5.2",
-    "tailwindcss-animate": "^1.0.7"
-  },
-  "devDependencies": {
-    "@tauri-apps/cli": "^1",
-    "@types/node": "^22.5.5",
-    "@types/react": "^18.2.15",
-    "@types/react-dom": "^18.2.7",
-    "@vitejs/plugin-react": "^4.2.1",
-    "autoprefixer": "^10.4.20",
-    "postcss": "^8.4.47",
-    "tailwindcss": "^3.4.11",
-    "typescript": "^5.2.2",
-    "vite": "^5.3.1"
-  }
-}

linux/src-tauri/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-name = "pytubepp-helper"
-version = "0.1.0"
-description = "A Helper App for PytubePP Extension/Addon to Communicate with Pytube Post Processor CLI"
-authors = ["neosubhamoy <hey@neosubhamoy.com>"]
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[build-dependencies]
-tauri-build = { version = "1", features = [] }
-
-[dependencies]
-tauri = { version = "1", features = [ "shell-all", "window-show", "window-hide", "window-maximize", "process-exit", "process-relaunch", "window-unminimize", "window-unmaximize", "window-close", "system-tray", "window-start-dragging", "window-minimize"] }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-tokio = { version = "1.39.2", features = ["full"] }
-tokio-tungstenite = "*"
-futures-util = "0.3.30"
-
-[features]
-# This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
-custom-protocol = ["tauri/custom-protocol"]
-
-[workspace]
-members = [
-  ".",
-  "msghost",
-  "autostart"
-]

linux/src-tauri/autostart/.gitignore

@@ -1 +0,0 @@
-/target

linux/src-tauri/autostart/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "pytubepp-helper-autostart"
-version = "0.1.0"
-description = "PytubePP Helper (Autostart)"
-authors = ["neosubhamoy <hey@neosubhamoy.com>"]
-edition = "2021"
-
-[dependencies]
-websocket = "0.27.1"
-serde_json = "1.0"

linux/src-tauri/autostart/src/main.rs

@@ -1,55 +0,0 @@
-#![windows_subsystem = "windows"]
-
-use std::process::Command;
-use websocket::client::ClientBuilder;
-use websocket::OwnedMessage;
-use std::thread::sleep;
-use std::time::Duration;
-
-fn connect_with_retry(url: &str, max_attempts: u32) -> Result<websocket::sync::Client<std::net::TcpStream>, Box<dyn std::error::Error>> {
-    let mut attempts = 0;
-    loop {
-        match ClientBuilder::new(url).unwrap().connect_insecure() {
-            Ok(client) => {
-                eprintln!("Successfully connected to Tauri app :)");
-                return Ok(client);
-            }
-            Err(e) => {
-                attempts += 1;
-                if attempts >= max_attempts {
-                    return Err(Box::new(e));
-                }
-                let wait_time = Duration::from_secs(2u64.pow(attempts));
-                eprintln!("Connection attempt {} failed. Retrying in {:?}...", attempts, wait_time);
-                sleep(wait_time);
-            }
-        }
-    }
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    // Launch the main application
-    let _ = Command::new("pytubepp-helper")
-        .spawn();
-
-    // Connect with the Tauri app
-    let websocket_url = "ws://localhost:3030";
-    eprintln!("Attempting to connect to {}", websocket_url);
-
-    let mut client = match connect_with_retry(websocket_url, 2) {
-        Ok(client) => client,
-        Err(e) => {
-            eprintln!("Failed to connect after multiple attempts: {:?}", e);
-            return Err(e);
-        }
-    };
-
-    // Send message to Tauri app
-    client.send_message(&OwnedMessage::Text(serde_json::json!({
-        "url": "",
-        "command": "autostart",
-        "argument": ""
-    }).to_string()))?;
-
-    Ok(())
-}

linux/src-tauri/msghost-manifest/chrome/com.neosubhamoy.pytubepp.helper.json

@@ -1,7 +0,0 @@
-{
-    "name": "com.neosubhamoy.pytubepp.helper",
-    "description": "A helper app for pytubepp-extension to communicate with pytubepp-cli",
-    "path": "/usr/bin/pytubepp-helper-msghost",
-    "type": "stdio",
-    "allowed_origins": ["chrome-extension://adebedkaedobamilbbobbajepnnkkfcg/", "chrome-extension://mmhhbpdhkogpcieblpdilflfoimajepp/", "chrome-extension://ebneapoekcjelholncnlpdohjbjabhbi/", "chrome-extension://cohjehldppmnbfogjdjpbjknhlhmfhjj/"]
-}

linux/src-tauri/msghost-manifest/firefox/com.neosubhamoy.pytubepp.helper.json

@@ -1,7 +0,0 @@
-{
-    "name": "com.neosubhamoy.pytubepp.helper",
-    "description": "A helper app for pytubepp-extention to communicate with pytubepp-cli",
-    "path": "/usr/bin/pytubepp-helper-msghost",
-    "type": "stdio",
-    "allowed_extensions": ["pytubepp-addon@neosubhamoy.com"]
-}

linux/src-tauri/msghost/.gitignore

@@ -1 +0,0 @@
-/target

linux/src-tauri/msghost/Cargo.toml

@@ -1,10 +0,0 @@
-[package]
-name = "pytubepp-helper-msghost"
-version = "0.1.0"
-description = "PytubePP Helper Native Messaging Host"
-authors = ["neosubhamoy <hey@neosubhamoy.com>"]
-edition = "2021"
-
-[dependencies]
-websocket = "0.27.1"
-serde_json = "1.0"

linux/src-tauri/msghost/src/main.rs

@@ -1,103 +0,0 @@
-use std::io::{self, Read, Write};
-use websocket::client::ClientBuilder;
-use websocket::OwnedMessage;
-use std::thread::sleep;
-use std::time::Duration;
-use serde_json::Value;
-
-fn connect_with_retry(url: &str, max_attempts: u32) -> Result<websocket::sync::Client<std::net::TcpStream>, Box<dyn std::error::Error>> {
-    let mut attempts = 0;
-    loop {
-        match ClientBuilder::new(url).unwrap().connect_insecure() {
-            Ok(client) => {
-                eprintln!("Successfully connected to Tauri app :)");
-                return Ok(client);
-            }
-            Err(e) => {
-                attempts += 1;
-                if attempts >= max_attempts {
-                    return Err(Box::new(e));
-                }
-                let wait_time = Duration::from_secs(2u64.pow(attempts));
-                eprintln!("Connection attempt {} failed. Retrying in {:?}...", attempts, wait_time);
-                sleep(wait_time);
-            }
-        }
-    }
-}
-
-fn read_stdin_message() -> Result<String, Box<dyn std::error::Error>> {
-    let mut stdin = io::stdin();
-    let mut length_bytes = [0u8; 4];
-    stdin.read_exact(&mut length_bytes)?;
-    let length = u32::from_ne_bytes(length_bytes) as usize;
-
-    let mut buffer = vec![0u8; length];
-    stdin.read_exact(&mut buffer)?;
-
-    let message = String::from_utf8(buffer)?;
-    Ok(message)
-}
-
-fn write_stdout_message(message: &str) -> Result<(), Box<dyn std::error::Error>> {
-    let message_bytes = message.as_bytes();
-    let message_size = message_bytes.len();
-    io::stdout().write_all(&(message_size as u32).to_ne_bytes())?;
-    io::stdout().write_all(message_bytes)?;
-    io::stdout().flush()?;
-    Ok(())
-}
-
-fn main() -> Result<(), Box<dyn std::error::Error>> {
-    eprintln!("Waiting for message from extension...");
-    
-    let input = match read_stdin_message() {
-        Ok(msg) => {
-            eprintln!("Received message: {}", msg);
-            msg
-        },
-        Err(e) => {
-            eprintln!("Error reading message: {:?}", e);
-            return Err(e);
-        }
-    };
-
-    // Send immediate response to the extension
-    write_stdout_message(&serde_json::json!({
-        "status": "received",
-        "message": "Message received by native host"
-    }).to_string())?;
-
-    let parsed: Value = serde_json::from_str(&input)?;
-
-    let websocket_url = "ws://localhost:3030";
-    eprintln!("Attempting to connect to {}", websocket_url);
-
-    let mut client = match connect_with_retry(websocket_url, 2) {
-        Ok(client) => client,
-        Err(e) => {
-            eprintln!("Failed to connect after multiple attempts: {:?}", e);
-            write_stdout_message(&serde_json::json!({
-                "status": "error",
-                "message": "Failed to connect to Tauri app"
-            }).to_string())?;
-            return Err(e);
-        }
-    };
-
-    // Send message to Tauri app
-    client.send_message(&OwnedMessage::Text(parsed.to_string()))?;
-
-    // Receive response from Tauri app
-    let message = client.recv_message()?;
-    
-    // Send Tauri app's response back to browser extension
-    if let OwnedMessage::Text(text) = message {
-        write_stdout_message(&serde_json::json!({
-            "status": "success",
-            "response": text
-        }).to_string())?;
-    }
-
-    Ok(())
-}

linux/src/App.css

@@ -1,116 +0,0 @@
-.logo.vite:hover {
-  filter: drop-shadow(0 0 2em #747bff);
-}
-
-.logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafb);
-}
-:root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
-  font-size: 16px;
-  line-height: 24px;
-  font-weight: 400;
-
-  color: #0f0f0f;
-  background-color: #f6f6f6;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-text-size-adjust: 100%;
-}
-
-.container {
-  margin: 0;
-  padding-top: 10vh;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  text-align: center;
-}
-
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: 0.75s;
-}
-
-.logo.tauri:hover {
-  filter: drop-shadow(0 0 2em #24c8db);
-}
-
-.row {
-  display: flex;
-  justify-content: center;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-
-a:hover {
-  color: #535bf2;
-}
-
-h1 {
-  text-align: center;
-}
-
-input,
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  color: #0f0f0f;
-  background-color: #ffffff;
-  transition: border-color 0.25s;
-  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
-}
-
-button {
-  cursor: pointer;
-}
-
-button:hover {
-  border-color: #396cd8;
-}
-button:active {
-  border-color: #396cd8;
-  background-color: #e8e8e8;
-}
-
-input,
-button {
-  outline: none;
-}
-
-#greet-input {
-  margin-right: 5px;
-}
-
-@media (prefers-color-scheme: dark) {
-  :root {
-    color: #f6f6f6;
-    background-color: #2f2f2f;
-  }
-
-  a:hover {
-    color: #24c8db;
-  }
-
-  input,
-  button {
-    color: #ffffff;
-    background-color: #0f0f0f98;
-  }
-  button:active {
-    background-color: #0f0f0f69;
-  }
-}

linux/src/index.css

@@ -1,66 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-@layer base {
-  :root {
-    --background: 0 0% 100%;
-    --foreground: 240 10% 3.9%;
-    --card: 0 0% 100%;
-    --card-foreground: 240 10% 3.9%;
-    --popover: 0 0% 100%;
-    --popover-foreground: 240 10% 3.9%;
-    --primary: 240 5.9% 10%;
-    --primary-foreground: 0 0% 98%;
-    --secondary: 240 4.8% 95.9%;
-    --secondary-foreground: 240 5.9% 10%;
-    --muted: 240 4.8% 95.9%;
-    --muted-foreground: 240 3.8% 46.1%;
-    --accent: 240 4.8% 95.9%;
-    --accent-foreground: 240 5.9% 10%;
-    --destructive: 0 84.2% 60.2%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 240 5.9% 90%;
-    --input: 240 5.9% 90%;
-    --ring: 240 10% 3.9%;
-    --chart-1: 12 76% 61%;
-    --chart-2: 173 58% 39%;
-    --chart-3: 197 37% 24%;
-    --chart-4: 43 74% 66%;
-    --chart-5: 27 87% 67%;
-    --radius: 0.5rem
-  }
-  .dark {
-    --background: 240 10% 3.9%;
-    --foreground: 0 0% 98%;
-    --card: 240 10% 3.9%;
-    --card-foreground: 0 0% 98%;
-    --popover: 240 10% 3.9%;
-    --popover-foreground: 0 0% 98%;
-    --primary: 0 0% 98%;
-    --primary-foreground: 240 5.9% 10%;
-    --secondary: 240 3.7% 15.9%;
-    --secondary-foreground: 0 0% 98%;
-    --muted: 240 3.7% 15.9%;
-    --muted-foreground: 240 5% 64.9%;
-    --accent: 240 3.7% 15.9%;
-    --accent-foreground: 0 0% 98%;
-    --destructive: 0 62.8% 30.6%;
-    --destructive-foreground: 0 0% 98%;
-    --border: 240 3.7% 15.9%;
-    --input: 240 3.7% 15.9%;
-    --ring: 240 4.9% 83.9%;
-    --chart-1: 220 70% 50%;
-    --chart-2: 160 60% 45%;
-    --chart-3: 30 80% 55%;
-    --chart-4: 280 65% 60%;
-    --chart-5: 340 75% 55%
-  }
-}
-@layer base {
-  * {
-    @apply border-border;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
-}

linux/tailwind.config.js

@@ -1,63 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-export default {
-    darkMode: ["class"],
-    content: [
-		'./pages/**/*.{ts,tsx}',
-		'./components/**/*.{ts,tsx}',
-		'./app/**/*.{ts,tsx}',
-		'./src/**/*.{ts,tsx}',
-	],
-	theme: {
-		extend: {
-			borderRadius: {
-				lg: 'var(--radius)',
-				md: 'calc(var(--radius) - 2px)',
-				sm: 'calc(var(--radius) - 4px)'
-			},
-			colors: {
-				background: 'hsl(var(--background))',
-				foreground: 'hsl(var(--foreground))',
-				card: {
-					DEFAULT: 'hsl(var(--card))',
-					foreground: 'hsl(var(--card-foreground))'
-				},
-				popover: {
-					DEFAULT: 'hsl(var(--popover))',
-					foreground: 'hsl(var(--popover-foreground))'
-				},
-				primary: {
-					DEFAULT: 'hsl(var(--primary))',
-					foreground: 'hsl(var(--primary-foreground))'
-				},
-				secondary: {
-					DEFAULT: 'hsl(var(--secondary))',
-					foreground: 'hsl(var(--secondary-foreground))'
-				},
-				muted: {
-					DEFAULT: 'hsl(var(--muted))',
-					foreground: 'hsl(var(--muted-foreground))'
-				},
-				accent: {
-					DEFAULT: 'hsl(var(--accent))',
-					foreground: 'hsl(var(--accent-foreground))'
-				},
-				destructive: {
-					DEFAULT: 'hsl(var(--destructive))',
-					foreground: 'hsl(var(--destructive-foreground))'
-				},
-				border: 'hsl(var(--border))',
-				input: 'hsl(var(--input))',
-				ring: 'hsl(var(--ring))',
-				chart: {
-					'1': 'hsl(var(--chart-1))',
-					'2': 'hsl(var(--chart-2))',
-					'3': 'hsl(var(--chart-3))',
-					'4': 'hsl(var(--chart-4))',
-					'5': 'hsl(var(--chart-5))'
-				}
-			}
-		}
-	},
-	plugins: [require("tailwindcss-animate")],
-}
-

linux/vite.config.ts

@@ -1,27 +0,0 @@
-import { defineConfig } from "vite";
-import react from "@vitejs/plugin-react";
-import path from "path";
-
-// https://vitejs.dev/config/
-export default defineConfig(async () => ({
-  plugins: [react()],
-
-  // Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
-  //
-  // 1. prevent vite from obscuring rust errors
-  clearScreen: false,
-  // 2. tauri expects a fixed port, fail if that port is not available
-  server: {
-    port: 1420,
-    strictPort: true,
-    watch: {
-      // 3. tell vite to ignore watching `src-tauri`
-      ignored: ["**/src-tauri/**"],
-    },
-  },
-  resolve: {
-    alias: {
-      "@": path.resolve(__dirname, "./src"),
-    },
-  },
-}));

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pytubepp-helper",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.lock

@@ -2460,7 +2460,6 @@ version = "0.1.0"
 dependencies = [
  "serde_json",
  "websocket",
- "winresource",
 ]
 
 [[package]]
@@ -2469,7 +2468,6 @@ version = "0.1.0"
 dependencies = [
  "serde_json",
  "websocket",
- "winresource",
 ]
 
 [[package]]
@@ -4655,16 +4653,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winresource"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77e2aaaf8cfa92078c0c0375423d631f82f2f57979c2884fdd5f604a11e45329"
-dependencies = [
- "toml 0.7.8",
- "version_check 0.9.5",
-]
-
 [[package]]
 name = "wry"
 version = "0.24.10"

src-tauri/autostart/Cargo.toml

@@ -2,15 +2,11 @@
 name = "pytubepp-helper-autostart"
 version = "0.1.0"
 description = "PytubePP Helper (Autostart)"
-authors = ["neosubhamoy"]
+authors = ["neosubhamoy <hey@neosubhamoy.com>"]
 edition = "2021"
-build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 websocket = "0.27.1"
 serde_json = "1.0"
-
-[build-dependencies]
-winresource = "0.1.17"

src-tauri/autostart/src/main.rs

@@ -31,6 +31,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // Launch the main application
     let _ = Command::new("pytubepp-helper.exe")
         .spawn();
+    let _ = Command::new("pytubepp-helper")
+        .spawn();
 
     // Connect with the Tauri app
     let websocket_url = "ws://localhost:3030";

src-tauri/installer/windows/nsis-template.nsi

@@ -41,7 +41,7 @@ ${StrLoc}
 !define WEBVIEW2INSTALLERPATH ""
 !define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}"
 !define MANUPRODUCTKEY "Software\${MANUFACTURER}\${PRODUCTNAME}"
-!define UNINSTALLERSIGNCOMMAND "$\"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.26100.0\\x64\\signtool.exe$\" $\"sign$\" $\"/fd$\" $\"sha256$\" $\"/sha1$\" $\"c12a1579698a3cc86ef3b2c942172cd995149b10$\" $\"/d$\" $\"pytubepp-helper$\" $\"/t$\" $\"http://timestamp.sectigo.com$\" $\"%1$\""
+!define UNINSTALLERSIGNCOMMAND ""
 !define ESTIMATEDSIZE "0x002311"
 !define AUTOSTART_EXEC "pytubepp-helper-autostart.exe"
 !define CHROME_REG_PATH "Software\Google\Chrome\NativeMessagingHosts\com.neosubhamoy.pytubepp.helper"

src-tauri/msghost/Cargo.toml

@@ -2,15 +2,11 @@
 name = "pytubepp-helper-msghost"
 version = "0.1.0"
 description = "PytubePP Helper Native Messaging Host"
-authors = ["neosubhamoy"]
+authors = ["neosubhamoy <hey@neosubhamoy.com>"]
 edition = "2021"
-build = "build.rs"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 websocket = "0.27.1"
 serde_json = "1.0"
-
-[build-dependencies]
-winresource = "0.1.17"

src-tauri/tauri.conf.json

@@ -0,0 +1,39 @@
+{
+  "build": {
+    "beforeDevCommand": "npm run dev",
+    "beforeBuildCommand": "npm run build",
+    "devPath": "http://localhost:1422",
+    "distDir": "../dist"
+  },
+  "package": {
+    "productName": "pytubepp-helper",
+    "version": "0.2.0"
+  },
+  "tauri": {
+    "allowlist": {
+      "all": false
+    },
+    "windows": [
+      {
+        "title": "PytubePP Helper",
+        "width": 500,
+        "height": 320
+      }
+    ],
+    "security": {
+      "csp": null
+    },
+    "bundle": {
+      "active": true,
+      "targets": "all",
+      "identifier": "com.neosubhamoy.pytubepp.helper",
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ]
+    }
+  }
+}

src-tauri/tauri.linux.conf.json

@@ -2,13 +2,9 @@
   "build": {
     "beforeDevCommand": "npm run dev && cargo build --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --manifest-path=./src-tauri/autostart/Cargo.toml",
     "beforeBuildCommand": "npm run build && cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --manifest-path=./src-tauri/autostart/Cargo.toml",
-    "devPath": "http://localhost:1420",
+    "devPath": "http://localhost:1422",
     "distDir": "../dist"
   },
-  "package": {
-    "productName": "pytubepp-helper",
-    "version": "0.2.0"
-  },
   "tauri": {
     "allowlist": {
       "all": false,
@@ -18,6 +14,11 @@
         "sidecar": true,
         "open": true,
         "scope": [
+          {
+            "name": "detect-windows",
+            "cmd": "systeminfo",
+            "args": []
+          },
           {
             "name": "detect-distro",
             "cmd": "grep",
@@ -34,10 +35,25 @@
             "args": ["--version"]
           },
           {
-            "name": "is-python-installed",
+            "name": "is-python3-installed",
             "cmd": "python3",
             "args": ["--version"]
           },
+          {
+            "name": "is-pip3-installed",
+            "cmd": "pip3",
+            "args": ["--version"]
+          },
+          {
+            "name": "is-winget-installed",
+            "cmd": "winget",
+            "args": ["--version"]
+          },
+          {
+            "name": "is-python-installed",
+            "cmd": "python",
+            "args": ["--version"]
+          },
           {
             "name": "is-pip-installed",
             "cmd": "pip",
@@ -56,9 +72,8 @@
           {
             "name": "fetch-video-info",
             "cmd": "pytubepp",
-            "args": [{ "validator": "\\S+"}, "--raw-info"]
+            "args": [{ "validator": "\\S+" }, "--raw-info"]
           }
-          
         ]
       },
       "window": {
@@ -102,9 +117,9 @@
       "deb": {
         "depends": ["python3-pip", "ffmpeg"],
         "files": {
-          "/etc/opt/chrome/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/chrome/com.neosubhamoy.pytubepp.helper.json",
+          "/etc/opt/chrome/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./pytubepp-helper-msghost.json",
-          "/etc/chromium/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/chrome/com.neosubhamoy.pytubepp.helper.json",
+          "/etc/chromium/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./pytubepp-helper-msghost.json",
-          "/usr/lib/mozilla/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/firefox/com.neosubhamoy.pytubepp.helper.json",
+          "/usr/lib/mozilla/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./pytubepp-helper-msghost-moz.json",
           "/usr/bin/pytubepp-helper-msghost": "./target/release/pytubepp-helper-msghost",
           "/usr/bin/pytubepp-helper-autostart": "./target/release/pytubepp-helper-autostart",
           "/etc/xdg/autostart/pytubepp-helper-autostart.desktop": "./autostart/pytubepp-helper-autostart.desktop"
@@ -116,9 +131,9 @@
         "license": "MIT",
         "depends": ["python3-pip", "ffmpeg-free"],
         "files": {
-          "/etc/opt/chrome/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/chrome/com.neosubhamoy.pytubepp.helper.json",
+          "/etc/opt/chrome/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./pytubepp-helper-msghost.json",
-          "/etc/chromium/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/chrome/com.neosubhamoy.pytubepp.helper.json",
+          "/etc/chromium/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./pytubepp-helper-msghost.json",
-          "/usr/lib/mozilla/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./msghost-manifest/firefox/com.neosubhamoy.pytubepp.helper.json",
+          "/usr/lib/mozilla/native-messaging-hosts/com.neosubhamoy.pytubepp.helper.json": "./pytubepp-helper-msghost-moz.json",
           "/usr/bin/pytubepp-helper-msghost": "./target/release/pytubepp-helper-msghost",
           "/usr/bin/pytubepp-helper-autostart": "./target/release/pytubepp-helper-autostart",
           "/etc/xdg/autostart/pytubepp-helper-autostart.desktop": "./autostart/pytubepp-helper-autostart.desktop"

src-tauri/tauri.windows.conf.json

@@ -1,14 +1,10 @@
 {
   "build": {
     "beforeDevCommand": "cargo build --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --manifest-path=./src-tauri/autostart/Cargo.toml && npm run dev",
-    "beforeBuildCommand": "cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --manifest-path=./src-tauri/autostart/Cargo.toml && node signFiles.js && node copyFiles.js && npm run build",
+    "beforeBuildCommand": "cargo build --release --manifest-path=./src-tauri/msghost/Cargo.toml && cargo build --release --manifest-path=./src-tauri/autostart/Cargo.toml && node copyFiles.js && npm run build",
-    "devPath": "http://localhost:1420",
+    "devPath": "http://localhost:1422",
     "distDir": "../dist"
   },
-  "package": {
-    "productName": "pytubepp-helper",
-    "version": "0.2.0"
-  },
   "tauri": {
     "allowlist": {
       "all": false,
@@ -18,6 +14,36 @@
         "sidecar": true,
         "open": true,
         "scope": [
+          {
+            "name": "detect-windows",
+            "cmd": "systeminfo",
+            "args": []
+          },
+          {
+            "name": "detect-distro",
+            "cmd": "grep",
+            "args": ["^ID=", "/etc/os-release"]
+          },
+          {
+            "name": "is-apt-installed",
+            "cmd": "apt",
+            "args": ["--version"]
+          },
+          {
+            "name": "is-dnf-installed",
+            "cmd": "dnf",
+            "args": ["--version"]
+          },
+          {
+            "name": "is-python3-installed",
+            "cmd": "python3",
+            "args": ["--version"]
+          },
+          {
+            "name": "is-pip3-installed",
+            "cmd": "pip3",
+            "args": ["--version"]
+          },
           {
             "name": "is-winget-installed",
             "cmd": "winget",
@@ -46,9 +72,8 @@
           {
             "name": "fetch-video-info",
             "cmd": "pytubepp",
-            "args": [{ "validator": "\\S+"}, "--raw-info"]
+            "args": [{ "validator": "\\S+" }, "--raw-info"]
           }
-          
         ]
       },
       "fs": {
@@ -98,9 +123,6 @@
         "icons/icon.ico"
       ],
       "windows": {
-        "certificateThumbprint": "c12a1579698a3cc86ef3b2c942172cd995149b10",
-        "digestAlgorithm": "sha256",
-        "timestampUrl": "http://timestamp.sectigo.com",
         "wix": {
           "fragmentPaths": ["installer/windows/wix-fragment-registry.wxs"],
           "componentRefs": ["PytubeppHelperFragmentRegistryEntries"],

src/App.tsx

@@ -1,3 +1,4 @@
+import clsx from "clsx";
 import { useState, useEffect } from "react";
 import "./index.css";
 import { invoke } from "@tauri-apps/api/tauri";
@@ -5,9 +6,9 @@ import { listen } from '@tauri-apps/api/event';
 import { appWindow } from '@tauri-apps/api/window';
 import { ThemeProvider } from "@/components/theme-provider";
 import { Button } from "@/components/ui/button";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"
 import { InstalledPrograms, WebSocketMessage, } from "./types";
-import { compareVersions, extractVersion, isInstalled, sendStreamInfo, extractDistroId, detectDistro, detectDistroBase } from "./lib/utils";
+import { compareVersions, extractVersion, isInstalled, sendStreamInfo, detectWindows, detectDistro, extractDistroId, detectDistroBase } from "./lib/utils";
 import { CircleCheck, TriangleAlert, CircleAlert } from 'lucide-react';
 
 function App() {
@@ -20,9 +21,15 @@ function App() {
     appWindow.onCloseRequested(handleCloseRequested);
   }, []);
 
+  const [isWindows, setIsWindows] = useState<boolean>(false)
+  const [windowsVersion, setWindowsVersion] = useState<string | null>(null)
   const [distroId, setDistroId] = useState<string | null>(null)
   const [distroBase, setDistroBase] = useState<string | null>(null)
   const [installedPrograms, setInstalledPrograms] = useState<InstalledPrograms>({
+    winget: {
+      installed: false,
+      version: null,
+    },
     apt: {
       installed: false,
       version: null,
@@ -39,6 +46,14 @@ function App() {
       installed: false,
       version: null,
     },
+    python3: {
+      installed: false,
+      version: null,
+    },
+    pip3: {
+      installed: false,
+      version: null,
+    },
     ffmpeg: {
       installed: false,
       version: null,
@@ -78,6 +93,15 @@ function App() {
   }, []);
 
   function checkAllPrograms() {
+    isInstalled('winget', '--version').then((result) => {
+      setInstalledPrograms((prevState) => ({
+        ...prevState,
+        winget: {
+          installed: result.installed,
+          version: result.output ? extractVersion(result.output) : null,
+        }
+      }));
+    });
     isInstalled('apt', '--version').then((result) => {
       setInstalledPrograms((prevState) => ({
         ...prevState,
@@ -114,6 +138,24 @@ function App() {
         }
       }));
     });
+    isInstalled('python3', '--version').then((result) => {
+      setInstalledPrograms((prevState) => ({
+        ...prevState,
+        python3: {
+          installed: result.installed,
+          version: result.output ? extractVersion(result.output) : null,
+        }
+      }));
+    });
+    isInstalled('pip3', '--version').then((result) => {
+      setInstalledPrograms((prevState) => ({
+        ...prevState,
+        pip3: {
+          installed: result.installed,
+          version: result.output ? extractVersion(result.output) : null,
+        }
+      }));
+    });
     isInstalled('ffmpeg', '-version').then((result) => {
       setInstalledPrograms((prevState) => ({
         ...prevState,
@@ -136,6 +178,12 @@ function App() {
 
   useEffect(() => {
     checkAllPrograms();
+    detectWindows().then((result) => {
+      if(result) {
+        setIsWindows(true);
+        setWindowsVersion(extractVersion(result));
+      }
+    })
     detectDistro().then((result) => {
       if(result) {
         setDistroId(extractDistroId(result))
@@ -148,15 +196,15 @@ function App() {
   return (
     <ThemeProvider defaultTheme="dark" storageKey="vite-ui-theme">
       <div className="container">
-        <div className="topbar flex justify-between items-center mt-5 mx-3">
+        <div className={clsx("topbar flex justify-between items-center mt-5", !isWindows && "mx-3")}>
           <h1 className="text-xl font-bold">PytubePP Helper</h1>
           <Button size="sm" onClick={checkAllPrograms}>Refresh</Button>
         </div>
-        { distroId && distroBase && distroBase === 'debian' ?
+        { distroId && distroBase && distroBase === 'debian' ? /* Section for Debian */
         <div className="programstats mt-5 mx-3">
           <div className="programitem flex items-center justify-between">
-            <p><b>Python:</b> {installedPrograms.python.installed ? 'installed' : 'not installed'} {installedPrograms.python.version ? `(${installedPrograms.python.version})` : ''}</p>
+            <p><b>Python:</b> {installedPrograms.python3.installed ? 'installed' : 'not installed'} {installedPrograms.python3.version ? `(${installedPrograms.python3.version})` : ''}</p>
-            {installedPrograms.python.installed ? installedPrograms.python.version ? compareVersions(installedPrograms.python.version, '3.8') < 0 ? <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.apt.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'sudo apt install Python3.12 -y'})}}>install</Button> : <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : null}
+            {installedPrograms.python3.installed ? installedPrograms.python3.version ? compareVersions(installedPrograms.python3.version, '3.8') < 0 ? <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.apt.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'sudo apt install python3 -y'})}}>install</Button> : <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : null}
           </div>
           <div className="programitem flex items-center justify-between">
             <p><b>FFmpeg:</b> {installedPrograms.ffmpeg.installed ? 'installed' : 'not installed'} {installedPrograms.ffmpeg.version ? `(${installedPrograms.ffmpeg.version})` : ''}</p>
@@ -164,9 +212,9 @@ function App() {
           </div>
           <div className="programitem flex items-center justify-between">
             <p><b>PytubePP:</b> {installedPrograms.pytubepp.installed ? 'installed' : 'not installed'} {installedPrograms.pytubepp.version ? `(${installedPrograms.pytubepp.version})` : ''}</p>
-            {installedPrograms.pytubepp.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.pip.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'pip install pytubepp --break-system-packages'})}}>install</Button> : null}
+            {installedPrograms.pytubepp.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.pip3.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'pip install pytubepp --break-system-packages'})}}>install</Button> : null}
           </div>
-          {(!installedPrograms.apt.installed && (!installedPrograms.python.installed || !installedPrograms.ffmpeg.installed)) ?
+          {(!installedPrograms.apt.installed && (!installedPrograms.python3.installed || !installedPrograms.ffmpeg.installed)) ?
             <Alert className="mt-5" variant="destructive">
               <CircleAlert className="h-5 w-5" />
               <AlertTitle>APT Not Found</AlertTitle>
@@ -175,7 +223,7 @@ function App() {
               </AlertDescription>
             </Alert>
           : null}
-          {(!installedPrograms.pip.installed && !installedPrograms.pytubepp.installed) ?
+          {(!installedPrograms.pip3.installed && !installedPrograms.pytubepp.installed) ?
             <Alert className="mt-5" variant="destructive">
               <CircleAlert className="h-5 w-5" />
               <AlertTitle>PIP Not Found</AlertTitle>
@@ -184,7 +232,7 @@ function App() {
               </AlertDescription>
             </Alert>
           : null}
-          {(installedPrograms.python.installed && installedPrograms.ffmpeg.installed && installedPrograms.pytubepp.installed) ?
+          {(installedPrograms.python3.installed && installedPrograms.ffmpeg.installed && installedPrograms.pytubepp.installed) ?
             <Alert className="mt-5">
               <CircleCheck className="h-5 w-5" />
               <AlertTitle>Ready</AlertTitle>
@@ -194,11 +242,11 @@ function App() {
             </Alert>
           : null}
         </div>
-        : distroId && distroBase && distroBase === 'rhel' ?
+        : distroId && distroBase && distroBase === 'rhel' ? /* Section for RHEL */
         <div className="programstats mt-5 mx-3">
           <div className="programitem flex items-center justify-between">
-            <p><b>Python:</b> {installedPrograms.python.installed ? 'installed' : 'not installed'} {installedPrograms.python.version ? `(${installedPrograms.python.version})` : ''}</p>
+            <p><b>Python:</b> {installedPrograms.python3.installed ? 'installed' : 'not installed'} {installedPrograms.python3.version ? `(${installedPrograms.python3.version})` : ''}</p>
-            {installedPrograms.python.installed ? installedPrograms.python.version ? compareVersions(installedPrograms.python.version, '3.8') < 0 ? <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.dnf.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'sudo dnf install python3.12 -y'})}}>install</Button> : <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : null}
+            {installedPrograms.python3.installed ? installedPrograms.python3.version ? compareVersions(installedPrograms.python3.version, '3.8') < 0 ? <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.dnf.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'sudo dnf install python3 -y'})}}>install</Button> : <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : null}
           </div>
           <div className="programitem flex items-center justify-between">
             <p><b>FFmpeg:</b> {installedPrograms.ffmpeg.installed ? 'installed' : 'not installed'} {installedPrograms.ffmpeg.version ? `(${installedPrograms.ffmpeg.version})` : ''}</p>
@@ -206,18 +254,18 @@ function App() {
           </div>
           <div className="programitem flex items-center justify-between">
             <p><b>PytubePP:</b> {installedPrograms.pytubepp.installed ? 'installed' : 'not installed'} {installedPrograms.pytubepp.version ? `(${installedPrograms.pytubepp.version})` : ''}</p>
-            {installedPrograms.pytubepp.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.pip.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'pip install pytubepp'})}}>install</Button> : null}
+            {installedPrograms.pytubepp.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.pip3.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'pip install pytubepp'})}}>install</Button> : null}
           </div>
           {(!installedPrograms.dnf.installed && (!installedPrograms.python.installed || !installedPrograms.ffmpeg.installed)) ?
             <Alert className="mt-5" variant="destructive">
               <CircleAlert className="h-5 w-5" />
               <AlertTitle>DNF Not Found</AlertTitle>
               <AlertDescription>
-                DNF is required to install necessary debian packages. Please install it manually for your distro.
+                DNF is required to install necessary rpm packages. Please install it manually for your distro.
               </AlertDescription>
             </Alert>
           : null}
-          {(!installedPrograms.pip.installed && !installedPrograms.pytubepp.installed) ?
+          {(!installedPrograms.pip3.installed && !installedPrograms.pytubepp.installed) ?
             <Alert className="mt-5" variant="destructive">
               <CircleAlert className="h-5 w-5" />
               <AlertTitle>PIP Not Found</AlertTitle>
@@ -226,6 +274,39 @@ function App() {
               </AlertDescription>
             </Alert>
           : null}
+          {(installedPrograms.python3.installed && installedPrograms.ffmpeg.installed && installedPrograms.pytubepp.installed) ?
+            <Alert className="mt-5">
+              <CircleCheck className="h-5 w-5" />
+              <AlertTitle>Ready</AlertTitle>
+              <AlertDescription>
+                Everything looks ok! You can close this window now. Make sure it's always running in the background.
+              </AlertDescription>
+            </Alert>
+          : null}
+        </div>
+        : isWindows && windowsVersion && parseInt(windowsVersion) >= 17134 ? /* Section for Windows */
+        <div className="programstats mt-5">
+          <div className="programitem flex items-center justify-between">
+            <p><b>Python:</b> {installedPrograms.python.installed ? 'installed' : 'not installed'} {installedPrograms.python.version ? `(${installedPrograms.python.version})` : ''}</p>
+            {installedPrograms.python.installed ? installedPrograms.python.version ? compareVersions(installedPrograms.python.version, '3.8') < 0 ? <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.winget.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'winget install Python.Python.3.12'})}}>install</Button> : <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : null}
+          </div>
+          <div className="programitem flex items-center justify-between">
+            <p><b>FFmpeg:</b> {installedPrograms.ffmpeg.installed ? 'installed' : 'not installed'} {installedPrograms.ffmpeg.version ? `(${installedPrograms.ffmpeg.version})` : ''}</p>
+            {installedPrograms.ffmpeg.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.winget.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'winget install ffmpeg'})}}>install</Button> : null}
+          </div>
+          <div className="programitem flex items-center justify-between">
+            <p><b>PytubePP:</b> {installedPrograms.pytubepp.installed ? 'installed' : 'not installed'} {installedPrograms.pytubepp.version ? `(${installedPrograms.pytubepp.version})` : ''}</p>
+            {installedPrograms.pytubepp.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.pip.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {icommand: 'pip install pytubepp'})}}>install</Button> : null}
+          </div>
+          {(!installedPrograms.winget.installed && (!installedPrograms.python.installed || !installedPrograms.ffmpeg.installed)) ?
+            <Alert className="mt-5" variant="destructive">
+              <CircleAlert className="h-5 w-5" />
+              <AlertTitle>WinGet Not Found</AlertTitle>
+              <AlertDescription>
+                WinGet is required to install necessary packages. Please install it manually from <a className="underline" href="https://learn.microsoft.com/en-us/windows/package-manager/winget/#install-winget" target="_blank">here</a>. 
+              </AlertDescription>
+            </Alert>
+          : null}
           {(installedPrograms.python.installed && installedPrograms.ffmpeg.installed && installedPrograms.pytubepp.installed) ?
             <Alert className="mt-5">
               <CircleCheck className="h-5 w-5" />
@@ -240,13 +321,45 @@ function App() {
         <div className="programstats mt-5 mx-3">
           <Alert className="mt-5" variant="destructive">
             <CircleAlert className="h-5 w-5" />
-            <AlertTitle>Unsupported Distro</AlertTitle>
+            <AlertTitle>Unsupported OS</AlertTitle>
             <AlertDescription>
-              Sorry, your linux distro is currently not supported. If you think this is just a mistake or you want to request us to add support for your distro you can create a github issue <a className="underline" href="https://github.com/neosubhamoy/pytubepp-helper/issues" target="_blank">here</a>.
+              Sorry, your os/distro is currently not supported. If you think this is just a mistake or you want to request us to add support for your os/distro you can create a github issue <a className="underline" href="https://github.com/neosubhamoy/pytubepp-helper/issues" target="_blank">here</a>.
             </AlertDescription>
           </Alert>
         </div>
         }
+        {/* <div className="programstats mt-5">
+          <div className="programitem flex items-center justify-between">
+            <p><b>Python:</b> {installedPrograms.python.installed ? 'installed' : 'not installed'} {installedPrograms.python.version ? `(${installedPrograms.python.version})` : ''}</p>
+            {installedPrograms.python.installed ? installedPrograms.python.version ? compareVersions(installedPrograms.python.version, '3.8') < 0 ? <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.winget.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {installer: 'winget', program: 'Python.Python.3.11'})}}>install</Button> : <TriangleAlert className="w-5 h-5 my-2 text-orange-400"/> : null}
+          </div>
+          <div className="programitem flex items-center justify-between">
+            <p><b>FFmpeg:</b> {installedPrograms.ffmpeg.installed ? 'installed' : 'not installed'} {installedPrograms.ffmpeg.version ? `(${installedPrograms.ffmpeg.version})` : ''}</p>
+            {installedPrograms.ffmpeg.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.winget.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {installer: 'winget', program: 'ffmpeg'})}}>install</Button> : null}
+          </div>
+          <div className="programitem flex items-center justify-between">
+            <p><b>PytubePP:</b> {installedPrograms.pytubepp.installed ? 'installed' : 'not installed'} {installedPrograms.pytubepp.version ? `(${installedPrograms.pytubepp.version})` : ''}</p>
+            {installedPrograms.pytubepp.installed ? <CircleCheck className="w-5 h-5 my-2 text-green-400"/> : installedPrograms.pip.installed ? <Button variant="link" className="text-blue-600 px-0" onClick={async () => { await invoke('install_program', {installer: 'pip', program: 'pytubepp'})}}>install</Button> : null}
+          </div>
+          {(!installedPrograms.winget.installed && (!installedPrograms.python.installed || !installedPrograms.ffmpeg.installed)) ?
+            <Alert className="mt-5" variant="destructive">
+              <CircleAlert className="h-5 w-5" />
+              <AlertTitle>WinGet Not Found</AlertTitle>
+              <AlertDescription>
+                WinGet is required to install necessary packages. Please install it manually from <a className="underline" href="https://learn.microsoft.com/en-us/windows/package-manager/winget/#install-winget" target="_blank">here</a>. 
+              </AlertDescription>
+            </Alert>
+          : null}
+          {(installedPrograms.python.installed && installedPrograms.ffmpeg.installed && installedPrograms.pytubepp.installed) ?
+            <Alert className="mt-5">
+              <CircleCheck className="h-5 w-5" />
+              <AlertTitle>Ready</AlertTitle>
+              <AlertDescription>
+                Everything looks ok! You can close this window now. Make sure it's always running in the background.
+              </AlertDescription>
+            </Alert>
+          : null}
+        </div> */}
       </div>
     </ThemeProvider>
   );

src/lib/utils.ts

@@ -21,6 +21,20 @@ export async function isInstalled(program: string, arg: string): Promise<{ insta
   }
 }
 
+export async function detectWindows(): Promise<string | null> {
+  try{
+    const output = await new Command('detect-windows', []).execute();
+    if (output.code === 0) {
+      return output.stdout;
+    } else {
+      return output.stdout;
+    }
+  } catch (error) {
+    console.error(error);
+    return null;
+  }
+}
+
 export async function detectDistro(): Promise<string | null> {
   try{
     const output = await new Command('detect-distro', ['^ID=', '/etc/os-release']).execute();
@@ -49,15 +63,23 @@ export function detectDistroBase(distro: string | null): string | null{
   }
 }
 
+export function extractDistroId(input: string): string | null {
+  const regex = /ID=([a-zA-Z]+)/;
+  const match = input.match(regex);
+  return match ? match[1] : null;
+}
+
 export function extractVersion(output: string): string | null {
   const versionPatterns = [
       /ffmpeg version (\d+\.\d+)/,      // Pattern for ffmpeg
       /Python (\d+\.\d+\.\d+)/,         // Pattern for Python
       /pytubefix (\d+\.\d+\.\d+)/,      // Pattern for pytubefix
       /pytubepp (\d+\.\d+\.\d+)/,       // Pattern for pytubepp
+      /v(\d+\.\d+\.\d+)/,               // Pattern for winget
+      /pip (\d+\.\d+)/,                 // Pattern for pip
+      /OS Version:.*Build (\d+)/,       // Pattern for Windows build
       /apt (\d+\.\d+\.\d+)/,            // Pattern for apt
       /(\d+\.\d+\.\d+)/,                // Pattern for dnf
-      /pip (\d+\.\d+)/,                 // Pattern for pip
 
   ];
   for (const pattern of versionPatterns) {
@@ -69,16 +91,10 @@ export function extractVersion(output: string): string | null {
   return null;
 }
 
-export function extractDistroId(input: string): string | null {
-  const regex = /ID=([a-zA-Z]+)/;
-  const match = input.match(regex);
-  return match ? match[1] : null;
-}
-
 export async function sendStreamInfo(url: string) {
   const fetchData = async () => {
     try {
-      const output = await new Command('fetch-video-info', [url, '--list']).execute();
+      const output = await new Command('fetch-video-info', [url, '--raw-info']).execute();
       if (output.code === 0) {
         console.log(output.stdout);
         const sendStreamData = async () => {

src/types.ts

@@ -1,4 +1,8 @@
 export interface InstalledPrograms {
+    winget: {
+        installed: boolean;
+        version: string | null;
+    };
     apt: {
         installed: boolean;
         version: string | null;
@@ -6,7 +10,7 @@ export interface InstalledPrograms {
     dnf: {
         installed: boolean;
         version: string | null;
-    }
+    };
     python: {
         installed: boolean;
         version: string | null;
@@ -15,6 +19,14 @@ export interface InstalledPrograms {
         installed: boolean;
         version: string | null;
     };
+    python3: {
+        installed: boolean;
+        version: string | null;
+    };
+    pip3: {
+        installed: boolean;
+        version: string | null;
+    };
     ffmpeg: {
         installed: boolean;
         version: string | null;

vite.config.ts

@@ -12,7 +12,7 @@ export default defineConfig(async () => ({
   clearScreen: false,
   // 2. tauri expects a fixed port, fail if that port is not available
   server: {
-    port: 1420,
+    port: 1422,
     strictPort: true,
     watch: {
       // 3. tell vite to ignore watching `src-tauri`

windows/.vscode/extensions.json

@@ -1,3 +0,0 @@
-{
-  "recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
-}

windows/index.html

@@ -1,14 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tauri + React + Typescript</title>
-  </head>
-
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>

windows/postcss.config.js

@@ -1,6 +0,0 @@
-export default {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-}

windows/public/tauri.svg

@@ -1,6 +0,0 @@
-<svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
-<ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
-</svg>

windows/public/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

windows/src-tauri/.gitignore

@@ -1,7 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
-# Generated by Tauri
-# will have schema files for capabilities auto-completion
-/gen/schemas

windows/src-tauri/autostart/build.rs

@@ -1,8 +0,0 @@
-extern crate winresource;
-
-fn main() {
-    if std::env::var("CARGO_CFG_TARGET_OS").unwrap() == "windows" {
-        let res = winresource::WindowsResource::new();
-        res.compile().unwrap();
-    }
-}

windows/src-tauri/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-    tauri_build::build()
-}