A free, open source, and extensible speech-to-text application that works completely offline.
fix update?
CJ Pais80f2c72847d6
diff --git a/bun.lockb b/bun.lockbindex 9efbf556..ecaab7a1 100755Binary files a/bun.lockb and b/bun.lockb differdiff --git a/package.json b/package.jsonindex a4041838..668f99ea 100644--- a/package.json+++ b/package.json@@ -17,7 +17,7 @@"@tauri-apps/plugin-global-shortcut": "~2","@tauri-apps/plugin-opener": "^2","@tauri-apps/plugin-os": "~2",- "@tauri-apps/plugin-process": "^2.3.0",+ "@tauri-apps/plugin-process": "~2","@tauri-apps/plugin-store": "~2","@tauri-apps/plugin-stronghold": "~2","@tauri-apps/plugin-updater": "~2",diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lockindex 9982965e..ee966a20 100644--- a/src-tauri/Cargo.lock+++ b/src-tauri/Cargo.lock@@ -2006,6 +2006,7 @@ dependencies = ["tauri-plugin-macos-permissions","tauri-plugin-opener","tauri-plugin-os",+ "tauri-plugin-process","tauri-plugin-single-instance","tauri-plugin-store","tauri-plugin-updater",@@ -5101,6 +5102,16 @@ dependencies = ["thiserror 2.0.11",]+[[package]]+name = "tauri-plugin-process"+version = "2.3.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "7461c622a5ea00eb9cd9f7a08dbd3bf79484499fd5c21aa2964677f64ca651ab"+dependencies = [+ "tauri",+ "tauri-plugin",+]+[[package]]name = "tauri-plugin-single-instance"version = "2.2.1"diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.tomlindex e1d9de2b..640521cf 100644--- a/src-tauri/Cargo.toml+++ b/src-tauri/Cargo.toml@@ -41,6 +41,7 @@ vad-rs = "0.1.5"tauri-plugin-store = "2"tauri-plugin-os = "2"enigo = "0.5.0"+tauri-plugin-process = "2"[target.'cfg(target_os = "macos")'.dependencies]whisper-rs = { version = "0.13.2", features = ["metal"] }diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.jsonindex 5b8acce4..91054d81 100644--- a/src-tauri/capabilities/default.json+++ b/src-tauri/capabilities/default.json@@ -7,6 +7,8 @@"core:default","opener:default","store:default",+ "updater:default",+ "process:default","global-shortcut:allow-is-registered","global-shortcut:allow-register","global-shortcut:allow-unregister",diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rsindex 18aac402..d6a3da30 100644--- a/src-tauri/src/lib.rs+++ b/src-tauri/src/lib.rs@@ -35,6 +35,7 @@ pub fn run() {env_logger::init();tauri::Builder::default()+ .plugin(tauri_plugin_process::init()).plugin(tauri_plugin_updater::Builder::new().build()).plugin(tauri_plugin_os::init()).plugin(tauri_plugin_clipboard_manager::init())diff --git a/src/components/footer/Footer.tsx b/src/components/footer/Footer.tsxindex dbc95763..06a8d109 100644--- a/src/components/footer/Footer.tsx+++ b/src/components/footer/Footer.tsx@@ -1,4 +1,4 @@-import React, { useState, useEffect } from "react";+import React, { useState, useEffect, useRef } from "react";import { check } from "@tauri-apps/plugin-updater";import { relaunch } from "@tauri-apps/plugin-process";import { getVersion } from "@tauri-apps/api/app";@@ -7,40 +7,43 @@ import { listen } from "@tauri-apps/api/event";const Footer: React.FC = () => {const [isChecking, setIsChecking] = useState(false);const [updateAvailable, setUpdateAvailable] = useState(false);- const [isUpdating, setIsUpdating] = useState(false);+ const [isInstalling, setIsInstalling] = useState(false);+ const [downloadProgress, setDownloadProgress] = useState(0);const [version, setVersion] = useState("");const [showUpToDate, setShowUpToDate] = useState(false);- const [isManualCheck, setIsManualCheck] = useState(false);++ const upToDateTimeoutRef = useRef<NodeJS.Timeout>();+ const isManualCheckRef = useRef(false);+ const downloadedBytesRef = useRef(0);+ const contentLengthRef = useRef(0);useEffect(() => {- // Get version from Tauri app infoconst fetchVersion = async () => {try {const appVersion = await getVersion();setVersion(appVersion);} catch (error) {console.error("Failed to get app version:", error);- setVersion("0.1.3"); // fallback version+ setVersion("0.1.2");}};fetchVersion();-- // Automatically check for updates on launchcheckForUpdates();- // Listen for menu-triggered update checksconst unlisten = listen("check-for-updates", () => {- checkForUpdates();+ handleManualUpdateCheck();});return () => {+ if (upToDateTimeoutRef.current) {+ clearTimeout(upToDateTimeoutRef.current);+ }unlisten.then((fn) => fn());};}, []);const checkForUpdates = async () => {- // Don't check again if already checkingif (isChecking) return;try {@@ -50,50 +53,100 @@ const Footer: React.FC = () => {if (update) {setUpdateAvailable(true);setShowUpToDate(false);- console.log("Update available:", update.version);} else {- console.log("No updates available");- // Reset update available state in case it was previously truesetUpdateAvailable(false);- // Show "up to date" message only for manual checks- if (isManualCheck) {+ if (isManualCheckRef.current) {setShowUpToDate(true);- // Hide the message after 3 seconds- setTimeout(() => setShowUpToDate(false), 3000);+ if (upToDateTimeoutRef.current) {+ clearTimeout(upToDateTimeoutRef.current);+ }+ upToDateTimeoutRef.current = setTimeout(() => {+ setShowUpToDate(false);+ }, 3000);}}} catch (error) {console.error("Failed to check for updates:", error);} finally {setIsChecking(false);- setIsManualCheck(false);+ isManualCheckRef.current = false;}};const handleManualUpdateCheck = () => {- setIsManualCheck(true);+ isManualCheckRef.current = true;checkForUpdates();};const installUpdate = async () => {try {- setIsUpdating(true);+ setIsInstalling(true);+ setDownloadProgress(0);+ downloadedBytesRef.current = 0;+ contentLengthRef.current = 0;const update = await check();- if (update) {- console.log("Installing update...");- await update.downloadAndInstall();-- // Restart the app to apply the update- await relaunch();+ if (!update) {+ console.log("No update available during install attempt");+ return;}++ await update.downloadAndInstall((event) => {+ switch (event.event) {+ case "Started":+ downloadedBytesRef.current = 0;+ contentLengthRef.current = event.data.contentLength ?? 0;+ break;+ case "Progress":+ downloadedBytesRef.current += event.data.chunkLength;+ const progress =+ contentLengthRef.current > 0+ ? Math.round(+ (downloadedBytesRef.current / contentLengthRef.current) *+ 100,+ )+ : 0;+ setDownloadProgress(Math.min(progress, 100));+ break;+ }+ });+ await relaunch();} catch (error) {console.error("Failed to install update:", error);- setIsUpdating(false);+ } finally {+ setIsInstalling(false);+ setDownloadProgress(0);+ downloadedBytesRef.current = 0;+ contentLengthRef.current = 0;}};+ const getStatusText = () => {+ if (isInstalling) {+ return downloadProgress > 0 && downloadProgress < 100+ ? `Downloading... ${downloadProgress.toString().padStart(3)}%`+ : downloadProgress === 100+ ? "Installing..."+ : "Preparing...";+ }+ if (isChecking) return "Checking...";+ if (showUpToDate) return "Up to date";+ if (updateAvailable) return "Update available";+ return "Check for updates";+ };++ const getStatusAction = () => {+ if (updateAvailable && !isInstalling) return installUpdate;+ if (!isChecking && !isInstalling && !updateAvailable)+ return handleManualUpdateCheck;+ return undefined;+ };++ const isDisabled = isChecking || isInstalling;+ const isClickable =+ !isDisabled && (updateAvailable || (!isChecking && !showUpToDate));+return (<div className="w-full border-t border-mid-gray/20 mt-4 pt-3"><div className="flex justify-between items-center text-xs px-4 pb-3 text-text/60">@@ -101,25 +154,29 @@ const Footer: React.FC = () => {<span>v{version}</span></div>- <div className="flex items-center gap-2">- {updateAvailable ? (+ <div className="flex items-center gap-3">+ {isClickable ? (<button- onClick={installUpdate}- disabled={isUpdating}- className="text-logo-primary hover:text-logo-primary/80 transition-colors disabled:opacity-50 font-medium"+ onClick={getStatusAction()}+ disabled={isDisabled}+ className={`transition-colors disabled:opacity-50 tabular-nums ${+ updateAvailable+ ? "text-logo-primary hover:text-logo-primary/80 font-medium"+ : "text-text/60 hover:text-text/80"+ }`}>- {isUpdating ? "Installing..." : "Update available"}+ {getStatusText()}</button>- ) : showUpToDate ? (- <span className="text-text/60">Up to date</span>) : (- <button- onClick={handleManualUpdateCheck}- disabled={isChecking}- className="text-text/60 hover:text-text/80 transition-colors disabled:opacity-50"- >- {isChecking ? "Checking..." : "Check for updates"}- </button>+ <span className="text-text/60 tabular-nums">{getStatusText()}</span>+ )}++ {isInstalling && downloadProgress > 0 && downloadProgress < 100 && (+ <progress+ value={downloadProgress}+ max={100}+ className="w-20 h-2 [&::-webkit-progress-bar]:rounded-full [&::-webkit-progress-bar]:bg-mid-gray/20 [&::-webkit-progress-value]:rounded-full [&::-webkit-progress-value]:bg-logo-primary"+ />)}</div></div>