Fix MSUMonitorService settings desync

MattEqualsCoder · MattEqualsCoder · commit 4eea6651dbf2 · 2024-03-18T17:32:59.000-04:00
diff --git a/MSURandomizerLibrary/Services/MsuMonitorService.cs b/MSURandomizerLibrary/Services/MsuMonitorService.cs
@@ -8,7 +8,7 @@ internal class MsuMonitorService(
     ILogger<MsuMonitorService> logger,
     IMsuGameService gameService,
     IMsuSelectorService msuSelectorService,
-    MsuUserOptions msuUserOptions,
+    IMsuUserOptionsService msuUserOptions,
     MsuAppSettings msuAppSettings)
     : IMsuMonitorService
 {
@@ -71,7 +71,7 @@ public void Stop()
 
     private void UpdateOutputPath()
     {
-        _outputPath = msuUserOptions.MsuCurrentSongOutputFilePath;
+        _outputPath = msuUserOptions.MsuUserOptions.MsuCurrentSongOutputFilePath;
         if (string.IsNullOrWhiteSpace(_outputPath))
         {
             _outputPath = msuAppSettings.DefaultMsuCurrentSongOutputFilePath;
@@ -93,7 +93,7 @@ private void GameServiceOnOnTrackChanged(object sender, TrackNumberChangedEventA
             }
             try
             {
-                _ = File.WriteAllTextAsync(_outputPath, _currentTrack.GetDisplayText(msuUserOptions.TrackDisplayFormat));
+                _ = File.WriteAllTextAsync(_outputPath, _currentTrack.GetDisplayText(msuUserOptions.MsuUserOptions.TrackDisplayFormat));
             }
             catch (Exception ex)
             {

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ internal class MsuMonitorService(`
`8`	`8`	`ILogger<MsuMonitorService> logger,`
`9`	`9`	`IMsuGameService gameService,`
`10`	`10`	`IMsuSelectorService msuSelectorService,`
`11`		`- MsuUserOptions msuUserOptions,`
	`11`	`+ IMsuUserOptionsService msuUserOptions,`
`12`	`12`	`MsuAppSettings msuAppSettings)`
`13`	`13`	`: IMsuMonitorService`
`14`	`14`	`{`
`@@ -71,7 +71,7 @@ public void Stop()`
`71`	`71`
`72`	`72`	`private void UpdateOutputPath()`
`73`	`73`	`{`
`74`		`- _outputPath = msuUserOptions.MsuCurrentSongOutputFilePath;`
	`74`	`+ _outputPath = msuUserOptions.MsuUserOptions.MsuCurrentSongOutputFilePath;`
`75`	`75`	`if (string.IsNullOrWhiteSpace(_outputPath))`
`76`	`76`	`{`
`77`	`77`	`_outputPath = msuAppSettings.DefaultMsuCurrentSongOutputFilePath;`
`@@ -93,7 +93,7 @@ private void GameServiceOnOnTrackChanged(object sender, TrackNumberChangedEventA`
`93`	`93`	`}`
`94`	`94`	`try`
`95`	`95`	`{`
`96`		`- _ = File.WriteAllTextAsync(_outputPath, _currentTrack.GetDisplayText(msuUserOptions.TrackDisplayFormat));`
	`96`	`+ _ = File.WriteAllTextAsync(_outputPath, _currentTrack.GetDisplayText(msuUserOptions.MsuUserOptions.TrackDisplayFormat));`
`97`	`97`	`}`
`98`	`98`	`catch (Exception ex)`
`99`	`99`	`{`