The settings loading method is divided into synchronous and asynchronous

TTLC198 · Dec 7, 2023 · b79dc78 · b79dc78
1 parent ad1a326
commit b79dc78
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/HSMonitor/Services/SettingsService.cs b/HSMonitor/Services/SettingsService.cs
@@ -72,10 +72,33 @@ public async Task Reset()
         SettingsReset?.Invoke(this, EventArgs.Empty);
     }
 
-    public async Task Load()
+    public void Load()
     {
         try
         {
+            if (!Directory.Exists(App.SettingsDirPath))
+                Directory.CreateDirectory(App.SettingsDirPath);
+            if (!File.Exists(ConfigurationPath))
+                Settings.JsonToFile(ConfigurationPath);
+
+            var json = File.ReadAllText(ConfigurationPath);
+            Settings = JsonSerializer.Deserialize<ApplicationSettings>(json) ?? throw new InvalidOperationException();
+            Settings.IsAutoStartEnabled = _autoStartSwitch.IsSet;
+            Settings.LastSelectedPort ??= SerialPort.GetPortNames().FirstOrDefault() ?? "COM1";
+            SettingsLoaded?.Invoke(this, EventArgs.Empty);
+        }
+        catch (Exception exception)
+        {
+            _logger.Error(exception);
+        }
+    }
+
+    public async Task LoadAsync()
+    {
+        try
+        {
+            if (!Directory.Exists(App.SettingsDirPath))
+                Directory.CreateDirectory(App.SettingsDirPath);
             if (!File.Exists(ConfigurationPath))
                 Settings.JsonToFile(ConfigurationPath);
 

diff --git a/HSMonitor/ViewModels/MainWindowViewModel.cs b/HSMonitor/ViewModels/MainWindowViewModel.cs
@@ -239,7 +239,7 @@ public async void OnViewFullyLoaded()
 
     public async void ShowSettings()
     {
-        await _settingsService.Load();
+        await _settingsService.LoadAsync();
         await _dialogManager.ShowDialogAsync(_viewModelFactory.CreateSettingsViewModel());
     }
 

diff --git a/HSMonitor/ViewModels/Settings/SettingsViewModel.cs b/HSMonitor/ViewModels/Settings/SettingsViewModel.cs
@@ -52,7 +52,7 @@ public async void Save()
 
     public async void Cancel()
     {
-        await _settingsService.Load();
+        await _settingsService.LoadAsync();
         Close(false);
     }
 }