Merge pull request #417 from Splode/bugfix/custom-audio-format-support

Bugfix/custom audio format support

Author: Splode

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ### Bug Fixes
 
+- **Custom notification sounds not playing on Windows** — ADPCM-encoded WAV files (the default output of Windows Sound Recorder) failed to decode because the `symphonia-codec-adpcm` crate was not in the dependency tree. The app would silently fall back to the built-in sound while still displaying the custom filename in Settings. ADPCM decoding is now enabled by adding `symphonia-codec-adpcm` as a direct dependency.
+- **Custom sound file picker offered FLAC, which could never be decoded** — the file picker filter included `.flac` as a valid extension, but FLAC decoding was never compiled in. FLAC has been removed from the filter.
+- **Unsupported audio format selected silently reverted to default** — when a custom sound file was copied successfully but failed to decode (unsupported encoding), the app fell back to the default sound with no indication to the user. The file is now probed immediately after being copied; if decoding fails the file is discarded and an inline error message is shown below the relevant audio row in Settings → Notifications.
 - **Timer not restarting correctly after quickly starting the next round** — when a round completed and the user clicked Start before the engine's follow-up duration update arrived, the update (a `Reconfigure` command) would force the engine back to Idle, cancelling the freshly started timer. The follow-up is now sent as a lighter-weight `Prime` command that updates the stored duration in place without affecting the running phase. Contributed by [@SeanTong11](https://github.com/SeanTong11).
 - **Timer completing instantly when a stale duration update arrives mid-round** — in a rare race, the engine could receive a `Prime` command carrying a duration shorter than the already-elapsed time (e.g. if the round duration was shortened in settings while a timer was running). Without a guard this caused the timer to complete on the very next tick. The `Prime` handler now clamps the new duration to at least one tick beyond the current elapsed position so the timer always advances at least once before completing.
 

src-tauri/Cargo.lock

@@ -37,6 +37,7 @@ axum = { version = "0.8", features = ["ws"] }
 futures-util = "0.3"
 
 rodio = { version = "0.22", default-features = false, features = ["playback", "wav", "mp3", "vorbis"] }
+symphonia-codec-adpcm = "0.5.5"
 tiny-skia = "0.12"
 notify = "8"
 

src-tauri/Cargo.toml

@@ -209,6 +209,18 @@ pub fn find_custom_files(audio_dir: &Path) -> CustomAudioPaths {
     }
 }
 
+/// Probe `path` by attempting to construct a `rodio::Decoder`.
+/// Returns `Ok(())` if the format and codec are recognised, or an error
+/// string suitable for returning to the frontend.
+pub fn probe_audio_file(path: &Path) -> Result<(), String> {
+    let reader = std::fs::File::open(path)
+        .map(std::io::BufReader::new)
+        .map_err(|e| format!("cannot open file: {e}"))?;
+    Decoder::new(reader)
+        .map(|_| ())
+        .map_err(|e| format!("audio format not supported: {e}"))
+}
+
 // ---------------------------------------------------------------------------
 // Audio thread
 // ---------------------------------------------------------------------------

src-tauri/src/audio/mod.rs

@@ -451,6 +451,15 @@ pub fn audio_set_custom(
     let dest = audio_dir.join(format!("{stem}.{ext}"));
     std::fs::copy(src, &dest).map_err(|e| e.to_string())?;
 
+    // Verify the copied file is decodable before committing. If it fails,
+    // clean up the orphan and sync in-memory state to default (the old file
+    // was already deleted above).
+    if let Err(e) = audio::probe_audio_file(&dest) {
+        let _ = std::fs::remove_file(&dest);
+        audio_state.clear_custom_path(&cue);
+        return Err(e);
+    }
+
     audio_state.set_custom_path(&cue, dest);
 
     let display_name = src

src-tauri/src/commands.rs

@@ -43,6 +43,22 @@
     else longBreakAlert = val;
   }
 
+  let workAlertError = $state<string | null>(null);
+  let shortBreakAlertError = $state<string | null>(null);
+  let longBreakAlertError = $state<string | null>(null);
+
+  function getError(id: CueKey): string | null {
+    if (id === 'work_alert') return workAlertError;
+    if (id === 'short_break_alert') return shortBreakAlertError;
+    return longBreakAlertError;
+  }
+
+  function setError(id: CueKey, val: string | null) {
+    if (id === 'work_alert') workAlertError = val;
+    else if (id === 'short_break_alert') shortBreakAlertError = val;
+    else longBreakAlertError = val;
+  }
+
   async function refreshAudioInfo() {
     try {
       const info: CustomAudioInfo = await getCustomAudioInfo();
@@ -76,6 +92,7 @@
   }
 
   async function pickAudio(id: CueKey) {
+    setError(id, null);
     let path: string | null = null;
     try {
       path = await openAudioFilePicker();
@@ -87,15 +104,18 @@
     try {
       const displayName = await setCustomAudio(id, path);
       setFileName(id, displayName);
+      setError(id, null);
     } catch (err) {
       await logError(`[audio] setCustomAudio failed: ${err}`);
+      setError(id, String(err));
     }
   }
 
   async function restoreAudio(id: CueKey) {
     try {
       await clearCustomAudio(id);
       setFileName(id, null);
+      setError(id, null);
     } catch (err) {
       await logError(`[audio] clearCustomAudio failed: ${err}`);
     }
@@ -122,6 +142,9 @@
         <button class="btn-choose" onclick={() => pickAudio(id)}>{m.notif_btn_choose()}</button>
       </div>
     </div>
+    {#if getError(id)}
+      <p class="audio-error">{getError(id)}</p>
+    {/if}
   {/each}
 
   <div class="group-heading">{m.notif_group_desktop()}</div>
@@ -324,4 +347,12 @@
     background: color-mix(in oklch, var(--color-foreground) 14%, transparent);
     color: var(--color-foreground);
   }
+
+  .audio-error {
+    margin: 0;
+    padding: 2px 20px 8px;
+    font-size: 0.72rem;
+    color: var(--color-danger, #e05252);
+    font-family: monospace;
+  }
 </style>

src/lib/components/settings/sections/NotificationsSection.svelte

@@ -60,7 +60,7 @@ export const clearCustomAudio = (cue: string) => invoke<void>('audio_clear_custo
 export const openAudioFilePicker = (): Promise<string | null> =>
   dialogOpen({
     multiple: false,
-    filters: [{ name: 'Audio', extensions: ['mp3', 'wav', 'ogg', 'flac'] }],
+    filters: [{ name: 'Audio', extensions: ['mp3', 'wav', 'ogg'] }],
   }) as Promise<string | null>;
 
 // --- Diagnostic log commands ---