Add formatter

ButterscotchV · Jan 28, 2024 · 3bf5c3b · 3bf5c3b
1 parent d1db005
commit 3bf5c3b
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 13 deletions.
diff --git a/ButterSTT/ButterSTT.csproj b/ButterSTT/ButterSTT.csproj
@@ -9,7 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="AprilAsr" Version="0.0.1.7" />
-    <PackageReference Include="NAudio" Version="2.1.0" />
+    <PackageReference Include="CSharpier.MsBuild" Version="0.27.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="NAudio" Version="2.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ButterSTT/EnglishCapitalization.cs b/ButterSTT/EnglishCapitalization.cs
@@ -12,7 +12,10 @@ public static string Capitalize(string message)
         }
 
         // Capitalizes starts of sentences and standalone "I"s, must be run on a lowercase string
-        [GeneratedRegex(@"(^|[?!.])\s*?([a-z])|(^|[^a-z])i($|[^a-z])", RegexOptions.Multiline & RegexOptions.NonBacktracking)]
+        [GeneratedRegex(
+            @"(^|[?!.])\s*?([a-z])|(^|[^a-z])i($|[^a-z])",
+            RegexOptions.Multiline & RegexOptions.NonBacktracking
+        )]
         private static partial Regex BasicCapitals();
     }
 }
diff --git a/ButterSTT/OSCHandler.cs b/ButterSTT/OSCHandler.cs
@@ -16,7 +16,11 @@ public static OscMessage MakeChatboxTyping(bool isTyping)
             return new OscMessage("/chatbox/typing", isTyping);
         }
 
-        public static OscMessage MakeChatboxInput(string message, bool skipKeyboard = true, bool playNotification = false)
+        public static OscMessage MakeChatboxInput(
+            string message,
+            bool skipKeyboard = true,
+            bool playNotification = false
+        )
         {
             return new OscMessage("/chatbox/input", message, skipKeyboard, playNotification);
         }

diff --git a/ButterSTT/Program.cs b/ButterSTT/Program.cs
@@ -5,8 +5,13 @@
 Directory.CreateDirectory(modelsDir);
 
 // Find the first model available
-var modelPath = Directory.GetFiles(modelsDir).FirstOrDefault(name => !string.IsNullOrWhiteSpace(name) && name.EndsWith(".april"), null) ??
-    throw new FileNotFoundException($"Could not find any available AprilAsr models (*.april) in \"{modelsDir}\".");
+var modelPath =
+    Directory
+        .GetFiles(modelsDir)
+        .FirstOrDefault(name => !string.IsNullOrWhiteSpace(name) && name.EndsWith(".april"), null)
+    ?? throw new FileNotFoundException(
+        $"Could not find any available AprilAsr models (*.april) in \"{modelsDir}\"."
+    );
 
 using var speechToTextHandler = new SpeechToTextHandler(modelPath);
 speechToTextHandler.StartRecording();

diff --git a/ButterSTT/SpeechToTextHandler.cs b/ButterSTT/SpeechToTextHandler.cs
@@ -34,7 +34,9 @@ public SpeechToTextHandler(string modelPath, int deviceNumber = 0)
             Model = new AprilModel(modelPath);
             ModelPath = modelPath;
 
-            Console.WriteLine($"Model loaded from \"{modelPath}\":\n  > Name: {Model.Name}\n  > Description: {Model.Description}\n  > Language: {Model.Language}\n  > Sample Rate: {Model.SampleRate} Hz");
+            Console.WriteLine(
+                $"Model loaded from \"{modelPath}\":\n  > Name: {Model.Name}\n  > Description: {Model.Description}\n  > Language: {Model.Language}\n  > Sample Rate: {Model.SampleRate} Hz"
+            );
 
             // Initialize session
             Session = new AprilSession(Model, OnAprilTokens, async: true);
@@ -70,7 +72,8 @@ public void StopRecording()
         public void SwapMicrophoneDevice(int deviceNumber)
         {
             // If it's already using this device, ignore it and continue
-            if (AudioIn.DeviceNumber == deviceNumber) return;
+            if (AudioIn.DeviceNumber == deviceNumber)
+                return;
 
             var wasRecording = MicrophoneRecording;
 
@@ -95,7 +98,8 @@ public void SwapMicrophoneDevice(int deviceNumber)
 
         private void OnMicData(object? sender, WaveInEventArgs args)
         {
-            if (args.BytesRecorded <= 0) return;
+            if (args.BytesRecorded <= 0)
+                return;
 
             // Convert the bytes to shorts
             var shorts = new short[args.BytesRecorded / 2];
@@ -108,7 +112,8 @@ private void OnMicStop(object? sender, StoppedEventArgs args)
             Session.Flush();
             MicrophoneRecording = false;
 
-            if (RestartRecordingNextStop) StartRecording();
+            if (RestartRecordingNextStop)
+                StartRecording();
         }
 
         private void OnAprilTokens(AprilResultKind result, AprilToken[] tokens)
@@ -134,26 +139,40 @@ private void OnAprilTokens(AprilResultKind result, AprilToken[] tokens)
                 aprilOutput.Append(token.Token);
             }
 
-            var aprilOutputString = tokens.Length > 0 ? EnglishCapitalization.Capitalize(aprilOutput.ToString().Trim()) : "";
+            var aprilOutputString =
+                tokens.Length > 0
+                    ? EnglishCapitalization.Capitalize(aprilOutput.ToString().Trim())
+                    : "";
 
             try
             {
                 if (tokens.Length > 0 && !string.IsNullOrWhiteSpace(aprilOutputString))
                 {
                     // Only print if at the end of a word or sentence, we don't want to print incomplete words
                     var lastToken = tokens.Last();
-                    if ((lastToken.WordBoundary || lastToken.SentenceEnd) && (DateTime.Now - lastMessage).TotalSeconds > 1.3d)
+                    if (
+                        (lastToken.WordBoundary || lastToken.SentenceEnd)
+                        && (DateTime.Now - lastMessage).TotalSeconds > 1.3d
+                    )
                     {
                         lastMessage = DateTime.Now;
                         if (result != AprilResultKind.FinalRecognition)
                         {
                             // Still typing the message... Show as typing!
-                            oscHandler.OSCSender.Send(new OscBundle(0, OSCHandler.MakeChatboxInput(aprilOutputString), OSCHandler.MakeChatboxTyping(true)));
+                            oscHandler.OSCSender.Send(
+                                new OscBundle(
+                                    0,
+                                    OSCHandler.MakeChatboxInput(aprilOutputString),
+                                    OSCHandler.MakeChatboxTyping(true)
+                                )
+                            );
                         }
                         else
                         {
                             // Just send the message, no more typing
-                            oscHandler.OSCSender.Send(OSCHandler.MakeChatboxInput(aprilOutputString));
+                            oscHandler.OSCSender.Send(
+                                OSCHandler.MakeChatboxInput(aprilOutputString)
+                            );
                         }
                     }
                 }