Merge pull request #51 from devitools/fix/whisper-recording-restart

fix(whisper): fix recording restart and stuck transcribing

Author: wilcorrea

apps/tauri/src-tauri/src/lib.rs

@@ -114,6 +114,7 @@ struct InitialFile(Mutex<Option<String>>);
 
 pub struct ExplicitQuit(pub Arc<AtomicBool>);
 pub struct IsRecording(pub Arc<AtomicBool>);
+pub struct IsTranscribing(pub Arc<AtomicBool>);
 pub struct RecordingMode(pub Mutex<Option<String>>);
 
 fn create_file_watcher(app: tauri::AppHandle) -> Result<notify::RecommendedWatcher, String> {
@@ -755,6 +756,11 @@ pub fn handle_recording_toggle(handle: &tauri::AppHandle) {
     if currently_recording {
         let _ = handle.emit("stop-recording", ());
     } else {
+        let is_transcribing = handle.state::<IsTranscribing>();
+        if is_transcribing.0.load(Ordering::Relaxed) {
+            return;
+        }
+
         if let Ok(mut guard) = handle.state::<RecordingMode>().0.lock() {
             *guard = Some("shortcut".to_string());
         }
@@ -922,6 +928,7 @@ pub fn run() {
         .manage(InitialFile(Mutex::new(None)))
         .manage(ExplicitQuit(Arc::new(AtomicBool::new(false))))
         .manage(IsRecording(Arc::new(AtomicBool::new(false))))
+        .manage(IsTranscribing(Arc::new(AtomicBool::new(false))))
         .manage(RecordingMode(Mutex::new(None)))
         .manage(whisper::commands::RecorderState(Mutex::new(None)))
         .manage(whisper::commands::TranscriberState(Mutex::new(None)))

apps/tauri/src-tauri/src/whisper/commands.rs

@@ -88,7 +88,9 @@ pub fn cancel_recording(
     app: tauri::AppHandle,
 ) -> Result<(), String> {
     let is_recording = app.state::<crate::IsRecording>();
+    let is_transcribing = app.state::<crate::IsTranscribing>();
     is_recording.0.store(false, Ordering::Relaxed);
+    is_transcribing.0.store(false, Ordering::Relaxed);
 
     let mut guard = state.0.lock().map_err(|e| e.to_string())?;
     *guard = None;
@@ -102,35 +104,42 @@ pub fn stop_and_transcribe(
     app: tauri::AppHandle,
 ) -> Result<String, String> {
     let is_recording = app.state::<crate::IsRecording>();
+    let is_transcribing = app.state::<crate::IsTranscribing>();
     is_recording.0.store(false, Ordering::Relaxed);
+    is_transcribing.0.store(true, Ordering::Relaxed);
+
+    let result = (|| {
+        let mut recorder = {
+            let mut guard = recorder_state.0.lock().map_err(|e| e.to_string())?;
+            guard
+                .take()
+                .ok_or_else(|| "No active recording".to_string())?
+        };
+        let audio = recorder.stop()?;
+
+        if audio.is_empty() {
+            return Err("No audio captured".to_string());
+        }
 
-    let mut recorder = {
-        let mut guard = recorder_state.0.lock().map_err(|e| e.to_string())?;
-        guard
-            .take()
-            .ok_or_else(|| "No active recording".to_string())?
-    };
-    let audio = recorder.stop()?;
-
-    if audio.is_empty() {
-        return Err("No audio captured".to_string());
-    }
-
-    let guard = transcriber_state.0.lock().map_err(|e| e.to_string())?;
-    let transcriber = guard.as_ref().ok_or("No whisper model loaded")?;
+        let guard = transcriber_state.0.lock().map_err(|e| e.to_string())?;
+        let transcriber = guard.as_ref().ok_or("No whisper model loaded")?;
 
-    let _ = app.emit("transcription-started", ());
+        let _ = app.emit("transcription-started", ());
 
-    match transcriber.transcribe(&audio) {
-        Ok(text) => {
-            let _ = app.emit("transcription-complete", text.clone());
-            Ok(text)
-        }
-        Err(e) => {
-            let _ = app.emit("transcription-error", e.clone());
-            Err(e)
+        match transcriber.transcribe(&audio) {
+            Ok(text) => {
+                let _ = app.emit("transcription-complete", text.clone());
+                Ok(text)
+            }
+            Err(e) => {
+                let _ = app.emit("transcription-error", e.clone());
+                Err(e)
+            }
         }
-    }
+    })();
+
+    is_transcribing.0.store(false, Ordering::Relaxed);
+    result
 }
 
 #[tauri::command]

apps/tauri/src/WhisperApp.tsx

@@ -77,7 +77,10 @@ function WhisperContent() {
     try {
       await invoke("stop_and_transcribe");
     } catch (e) {
-      console.error("stop_and_transcribe failed:", e);
+      setErrorMsg(
+        String(e).length > 50 ? String(e).substring(0, 50) + "\u2026" : String(e)
+      );
+      setViewState("error");
     }
   }, []);