A free, open source, and extensible speech-to-text application that works completely offline.
clean up code a bit
CJ Paise7cdecf7f0bd
diff --git a/src-tauri/src/actions.rs b/src-tauri/src/actions.rsindex 932d1bbb..ac40c765 100644--- a/src-tauri/src/actions.rs+++ b/src-tauri/src/actions.rs@@ -9,78 +9,83 @@ use std::sync::Arc;use tauri::AppHandle;use tauri::Manager;-// Action Handler Types-pub type PressAction = fn(app: &AppHandle, shortcut_str: &str);-pub type ReleaseAction = fn(app: &AppHandle, shortcut_str: &str);--// TODO refactor to start and stop-pub struct ActionSet {- pub press: PressAction,- pub release: ReleaseAction,+// Shortcut Action Trait+pub trait ShortcutAction: Send + Sync {+ fn start(&self, app: &AppHandle, binding_id: &str, shortcut_str: &str);+ fn stop(&self, app: &AppHandle, binding_id: &str, shortcut_str: &str);}-// Handler Functions-fn transcribe_pressed_action(app: &AppHandle, _shortcut_str: &str) {- change_tray_icon(app, TrayIconState::Recording);+// Transcribe Action+struct TranscribeAction;- let rm = app.state::<Arc<AudioRecordingManager>>();- rm.try_start_recording("transcribe");-}+impl ShortcutAction for TranscribeAction {+ fn start(&self, app: &AppHandle, binding_id: &str, _shortcut_str: &str) {+ let binding_id = binding_id.to_string();+ change_tray_icon(app, TrayIconState::Recording);++ let rm = app.state::<Arc<AudioRecordingManager>>();+ rm.try_start_recording(&binding_id);+ }++ fn stop(&self, app: &AppHandle, binding_id: &str, _shortcut_str: &str) {+ let ah = app.clone();+ let rm = Arc::clone(&app.state::<Arc<AudioRecordingManager>>());+ let tm = Arc::clone(&app.state::<Arc<TranscriptionManager>>());-fn transcribe_released_action(app: &AppHandle, _shortcut_str: &str) {- let ah = app.clone();- let rm = Arc::clone(&app.state::<Arc<AudioRecordingManager>>());- let tm = Arc::clone(&app.state::<Arc<TranscriptionManager>>());+ change_tray_icon(app, TrayIconState::Idle);- change_tray_icon(app, TrayIconState::Idle);+ let binding_id = binding_id.to_string(); // Clone binding_id for the async task- tauri::async_runtime::spawn(async move {- if let Some(samples) = rm.stop_recording("transcribe") {- match tm.transcribe(samples) {- Ok(transcription) => {- println!("Global Shortcut Transcription: {}", transcription);- if transcription != "" {- utils::paste(transcription, ah);+ tauri::async_runtime::spawn(async move {+ let binding_id = binding_id.clone(); // Clone for the inner async task+ if let Some(samples) = rm.stop_recording(&binding_id) {+ match tm.transcribe(samples) {+ Ok(transcription) => {+ println!("Global Shortcut Transcription: {}", transcription);+ if !transcription.is_empty() {+ utils::paste(transcription, ah);+ }}+ Err(err) => println!("Global Shortcut Transcription error: {}", err),}- Err(err) => println!("Global Shortcut Transcription error: {}", err),}- }- });+ });+ }}-fn test_binding_pressed_action(app: &AppHandle, shortcut_str: &str) {- println!(- "Shortcut ID 'test': Pressed - {} (App: {})",- shortcut_str,- app.package_info().name- );-}+// Test Action+struct TestAction;-fn test_binding_released_action(app: &AppHandle, shortcut_str: &str) {- println!(- "Shortcut ID 'test': Released - {} (App: {})",- shortcut_str,- app.package_info().name- );+impl ShortcutAction for TestAction {+ fn start(&self, app: &AppHandle, binding_id: &str, shortcut_str: &str) {+ println!(+ "Shortcut ID '{}': Started - {} (App: {})", // Changed "Pressed" to "Started" for consistency+ binding_id,+ shortcut_str,+ app.package_info().name+ );+ }++ fn stop(&self, app: &AppHandle, binding_id: &str, shortcut_str: &str) {+ println!(+ "Shortcut ID '{}': Stopped - {} (App: {})", // Changed "Released" to "Stopped" for consistency+ binding_id,+ shortcut_str,+ app.package_info().name+ );+ }}// Static Action Map-pub static ACTION_MAP: Lazy<HashMap<String, ActionSet>> = Lazy::new(|| {+pub static ACTION_MAP: Lazy<HashMap<String, Arc<dyn ShortcutAction>>> = Lazy::new(|| {let mut map = HashMap::new();map.insert("transcribe".to_string(),- ActionSet {- press: transcribe_pressed_action,- release: transcribe_released_action,- },+ Arc::new(TranscribeAction) as Arc<dyn ShortcutAction>,);map.insert("test".to_string(),- ActionSet {- press: test_binding_pressed_action,- release: test_binding_released_action,- },+ Arc::new(TestAction) as Arc<dyn ShortcutAction>,);map});diff --git a/src-tauri/src/shortcut.rs b/src-tauri/src/shortcut.rsindex 57855639..0dec7b84 100644--- a/src-tauri/src/shortcut.rs+++ b/src-tauri/src/shortcut.rs@@ -3,7 +3,7 @@ use tauri::{App, AppHandle, Manager};use tauri_plugin_global_shortcut::GlobalShortcutExt;use tauri_plugin_global_shortcut::{Shortcut, ShortcutState};-use crate::actions::ACTION_MAP;+use crate::actions::{ShortcutAction, ACTION_MAP};use crate::settings::ShortcutBinding;use crate::settings::{self, get_settings};use crate::ManagedToggleState;@@ -119,12 +119,12 @@ fn _register_shortcut(app: &AppHandle, binding: ShortcutBinding) -> Result<(), Slet shortcut_string = scut.into_string();let settings = get_settings(ah);- if let Some(action_set) = ACTION_MAP.get(&binding_id_for_closure) {+ if let Some(action) = ACTION_MAP.get(&binding_id_for_closure) {if settings.push_to_talk {if event.state == ShortcutState::Pressed {- (action_set.press)(ah, &shortcut_string);+ action.start(ah, &binding_id_for_closure, &shortcut_string);} else if event.state == ShortcutState::Released {- (action_set.release)(ah, &shortcut_string);+ action.stop(ah, &binding_id_for_closure, &shortcut_string);}} else {if event.state == ShortcutState::Pressed {@@ -132,13 +132,19 @@ fn _register_shortcut(app: &AppHandle, binding: ShortcutBinding) -> Result<(), Slet mut states = toggle_state_manager.lock().expect("Failed to lock toggle state manager");- let is_currently_active = states.active_toggles.entry(binding_id_for_closure.clone()).or_insert(false);+ let is_currently_active = states.active_toggles+ .entry(binding_id_for_closure.clone())+ .or_insert(false);if *is_currently_active {- (action_set.release)(ah, &shortcut_string);+ action.stop(+ ah,+ &binding_id_for_closure,+ &shortcut_string,+ );*is_currently_active = false; // Update state to inactive} else {- (action_set.press)(ah, &shortcut_string);+ action.start(ah, &binding_id_for_closure, &shortcut_string);*is_currently_active = true; // Update state to active}}