Merge branch 'main' of github.com:cjpais/Handy

Author: cjpais

src-tauri/Cargo.lock

@@ -42,6 +42,7 @@ tauri-plugin-store = "2"
 tauri-plugin-os = "2"
 enigo = "0.5.0"
 tauri-plugin-process = "2"
+rodio = "0.20.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 whisper-rs = { version = "0.13.2", features = ["metal"] }

src-tauri/Cargo.toml

@@ -2,7 +2,7 @@
   "bindings": {
     "transcribe": {
       "id": "transcribe",
-      "name": "Transcribe",
+      "name": "Transcribe Keyboard Shortcut",
       "description": "Converts your speech into text.",
       "default_binding": "alt+space"
     }

src-tauri/resources/default_settings.json

@@ -2,6 +2,8 @@ use crate::managers::audio::AudioRecordingManager;
 use crate::managers::transcription::TranscriptionManager;
 use crate::utils;
 use crate::utils::change_tray_icon;
+use crate::utils::play_recording_start_sound;
+use crate::utils::play_recording_stop_sound;
 use crate::utils::TrayIconState;
 use once_cell::sync::Lazy;
 use std::collections::HashMap;
@@ -23,6 +25,9 @@ impl ShortcutAction for TranscribeAction {
         let binding_id = binding_id.to_string();
         change_tray_icon(app, TrayIconState::Recording);
 
+        // Play audio feedback for recording start
+        play_recording_start_sound(app);
+
         let rm = app.state::<Arc<AudioRecordingManager>>();
         rm.try_start_recording(&binding_id);
     }
@@ -34,6 +39,9 @@ impl ShortcutAction for TranscribeAction {
 
         change_tray_icon(app, TrayIconState::Idle);
 
+        // Play audio feedback for recording stop
+        play_recording_stop_sound(app);
+
         let binding_id = binding_id.to_string(); // Clone binding_id for the async task
 
         tauri::async_runtime::spawn(async move {

src-tauri/resources/rec_start.wav

@@ -168,6 +168,7 @@ pub fn run() {
             shortcut::change_binding,
             shortcut::reset_binding,
             shortcut::change_ptt_setting,
+            shortcut::change_audio_feedback_setting,
             trigger_update_check
         ])
         .run(tauri::generate_context!())

src-tauri/resources/rec_stop.wav

@@ -17,6 +17,7 @@ pub struct ShortcutBinding {
 pub struct AppSettings {
     pub bindings: HashMap<String, ShortcutBinding>,
     pub push_to_talk: bool,
+    pub audio_feedback: bool,
 }
 
 pub const SETTINGS_STORE_PATH: &str = "settings_store.json";
@@ -47,6 +48,7 @@ pub fn get_default_settings() -> AppSettings {
     AppSettings {
         bindings,
         push_to_talk: true,
+        audio_feedback: false,
     }
 }
 

src-tauri/src/actions.rs

@@ -103,6 +103,14 @@ pub fn change_ptt_setting(app: AppHandle, enabled: bool) -> Result<(), String> {
     Ok(())
 }
 
+#[tauri::command]
+pub fn change_audio_feedback_setting(app: AppHandle, enabled: bool) -> Result<(), String> {
+    let mut settings = settings::get_settings(&app);
+    settings.audio_feedback = enabled;
+    settings::write_settings(&app, settings);
+    Ok(())
+}
+
 fn _register_shortcut(app: &AppHandle, binding: ShortcutBinding) -> Result<(), String> {
     // Parse shortcut and return error if it fails
     let shortcut = match binding.current_binding.parse::<Shortcut>() {

src-tauri/src/lib.rs

@@ -1,8 +1,14 @@
+use crate::settings;
+
 use enigo::Enigo;
 use enigo::Key;
 use enigo::Keyboard;
 use enigo::Settings;
 
+use rodio::{Decoder, OutputStream, Sink};
+use std::fs::File;
+use std::io::BufReader;
+use std::thread;
 use tauri::image::Image;
 use tauri::tray::TrayIcon;
 use tauri::AppHandle;
@@ -80,3 +86,68 @@ pub fn change_tray_icon(app: &AppHandle, icon: TrayIconState) {
         .expect("failed to set icon"),
     ));
 }
+
+/// Plays an audio resource from the resources directory.
+/// Checks if audio feedback is enabled in settings before playing.
+pub fn play_sound(app: &AppHandle, resource_path: &str) {
+    // Check if audio feedback is enabled
+    let settings = settings::get_settings(app);
+    if !settings.audio_feedback {
+        return;
+    }
+
+    let app_handle = app.clone();
+    let resource_path = resource_path.to_string();
+
+    // Spawn a new thread to play the audio without blocking the main thread
+    thread::spawn(move || {
+        // Get the path to the audio file in resources
+        let audio_path = match app_handle
+            .path()
+            .resolve(&resource_path, tauri::path::BaseDirectory::Resource)
+        {
+            Ok(path) => path,
+            Err(e) => {
+                eprintln!(
+                    "Failed to resolve audio file path '{}': {}",
+                    resource_path, e
+                );
+                return;
+            }
+        };
+
+        // Try to play the audio file
+        if let Err(e) = play_audio_file(&audio_path) {
+            eprintln!("Failed to play sound '{}': {}", resource_path, e);
+        }
+    });
+}
+
+/// Convenience function to play the recording start sound
+pub fn play_recording_start_sound(app: &AppHandle) {
+    play_sound(app, "resources/rec_start.wav");
+}
+
+/// Convenience function to play the recording stop sound
+pub fn play_recording_stop_sound(app: &AppHandle) {
+    play_sound(app, "resources/rec_stop.wav");
+}
+
+fn play_audio_file(path: &std::path::Path) -> Result<(), Box<dyn std::error::Error>> {
+    // Get a output stream handle to the default physical sound device
+    let (_stream, stream_handle) = OutputStream::try_default()?;
+
+    // Load the audio file
+    let file = File::open(path)?;
+    let buf_reader = BufReader::new(file);
+    let source = Decoder::new(buf_reader)?;
+
+    // Create a sink to play the audio
+    let sink = Sink::try_new(&stream_handle)?;
+    sink.append(source);
+
+    // Wait for the audio to finish playing
+    sink.sleep_until_end();
+
+    Ok(())
+}