More gracefully handle audio file not found exceptions.

EDCD · Jul 5, 2023 · 0a11835 · 0a11835
1 parent 9a89812
commit 0a11835
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/SpeechService/SpeechService.cs b/SpeechService/SpeechService.cs
@@ -328,9 +328,9 @@ public void Speak(string speech, string defaultVoice, int echoDelay, int distort
                     try
                     {
                         // Play the audio, waiting for the audio to complete unless we're in async mode
-                        if (async)
+                        if ( async )
                         {
-                            Task.Run(() => PlayAudio(fileName, volumeOverride));
+                            Task.Run( () => PlayAudio( fileName, volumeOverride ) );
                         }
                         else
                         {
@@ -345,10 +345,11 @@ public void Speak(string speech, string defaultVoice, int echoDelay, int distort
                             }
                         }
                     }
-                    catch (Exception e)
+                    catch ( Exception e )
                     {
-                        Logging.Warn(e.Message, e);
+                        Logging.Warn( e.Message, e );
                     }
+
                     continue;
                 }
 
@@ -648,9 +649,16 @@ public void PlayAudio ( string fileName, decimal? volumeOverride, bool useLegacy
                 {
                     audioSource = CodecFactory.Instance.GetCodec( fileName );
                 }
+                catch ( FileNotFoundException fnfe )
+                {
+                    Say( null, $"Audio file not found at {fileName}.", 0 );
+                    Logging.Warn( fnfe.Message, fnfe );
+                    throw;
+                }
                 catch ( NotSupportedException e )
                 {
-                    Logging.Debug( $"Skipping unsupported audio file {fileName}.", e );
+                    Say( null, "Audio file format not supported.", 0 );
+                    Logging.Warn( $"Skipping unsupported audio file {fileName}.", e );
                     throw;
                 }
                 if ( !( audioSource?.Length > 0 ) ) { return; }