fix(Config): Fix issue when loading and writting to the configuration

Fixes SOUNDSWITCH-P
Belphemur · May 8, 2021 · 76e60a5 · 76e60a5
1 parent 660b4bb
commit 76e60a5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 16 deletions.
diff --git a/SoundSwitch/Framework/Configuration/ConfigurationManager.cs b/SoundSwitch/Framework/Configuration/ConfigurationManager.cs
@@ -12,9 +12,9 @@
 * GNU General Public License for more details.
 ********************************************************************/
 
-using System.Diagnostics;
 using System.IO;
 using Newtonsoft.Json;
+using Serilog;
 
 namespace SoundSwitch.Framework.Configuration
 {
@@ -60,26 +60,32 @@ static ConfigurationManager()
             }
             else
             {
-                var contents = File.ReadAllText(filePath);
-                obj = JsonConvert.DeserializeObject<T>(contents);
+                var serializer = new JsonSerializer {NullValueHandling = NullValueHandling.Ignore};
+                using (var fileOpen = File.OpenRead(filePath))
+                using (var reader = new JsonTextReader(new StreamReader(fileOpen)))
+                {
+                    obj = serializer.Deserialize<T>(reader);
+                }
+
                 if (obj == null)
                 {
-                    Trace.WriteLine("Problem with deserialization");
-                    Trace.WriteLine("Contents: " + contents);
+                    Log.Warning("Can't deserialize the config file {type}: {filePath}", typeof(T), filePath);
                     obj = new T();
                 }
             }
+
             obj.FileLocation = filePath;
             if (obj.Migrate())
             {
                 obj.Save();
-            };
+            }
+
             return obj;
         }
 
         private static string GetFilePath<T>() where T : IConfiguration, new()
         {
-            var filePath = Path.Combine(SRoot, typeof (T).Name + ".json");
+            var filePath = Path.Combine(SRoot, typeof(T).Name + ".json");
             return filePath;
         }
 
@@ -91,10 +97,9 @@ static ConfigurationManager()
         {
             configuration.FileLocation = null;
             var serializer = new JsonSerializer {NullValueHandling = NullValueHandling.Ignore};
-            using (var writer = new JsonTextWriter(new StreamWriter(GetFilePath<T>())))
-            {
-                serializer.Serialize(writer, configuration);
-            }
+            using var fileOpen = File.OpenWrite(GetFilePath<T>());
+            using var writer = new JsonTextWriter(new StreamWriter(fileOpen));
+            serializer.Serialize(writer, configuration);
         }
     }
 }
diff --git a/SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs b/SoundSwitch/Framework/Configuration/SoundSwitchConfiguration.cs
@@ -107,6 +107,7 @@ public SoundSwitchConfiguration()
         public HashSet<string> MigratedFields { get; set; }
 
         // Needed by Interface
+        [JsonIgnore]
         public string FileLocation { get; set; }
 
         /// <summary>
@@ -192,7 +193,7 @@ public bool Migrate()
 
         public void Save()
         {
-            Log.Debug("Saving configuration ", this);
+            Log.Debug("Saving configuration {configuration}", this);
             ConfigurationManager.SaveConfiguration(this);
         }
 

diff --git a/SoundSwitch/Model/AppModel.cs b/SoundSwitch/Model/AppModel.cs
@@ -224,14 +224,20 @@ public void InitializeMain()
 
             ProfileManager = new ProfileManager(new WindowMonitor(), AudioSwitcher.Instance, ActiveAudioDeviceLister, TrayIcon.ShowError, new TriggerFactory(), _notificationManager);
             RegisterHotKey(AppConfigs.Configuration.PlaybackHotKey);
+            var saveConfig = false;
             if (!RegisterHotKey(AppConfigs.Configuration.RecordingHotKey))
             {
                 AppConfigs.Configuration.RecordingHotKey.Enabled = false;
-                AppConfigs.Configuration.Save();
+                saveConfig = true;
             }
             if (!RegisterHotKey(AppConfigs.Configuration.MuteRecordingHotKey))
             {
                 AppConfigs.Configuration.MuteRecordingHotKey.Enabled = false;
+                saveConfig = true;
+            }
+
+            if (saveConfig)
+            {
                 AppConfigs.Configuration.Save();
             }
 

diff --git a/SoundSwitch/Model/SoundSwitchApplicationContext.cs b/SoundSwitch/Model/SoundSwitchApplicationContext.cs
@@ -14,6 +14,7 @@ public class SoundSwitchApplicationContext : ApplicationContext
     {
         public SoundSwitchApplicationContext()
         {
+
             BannerManager.Setup();
             var deviceActiveLister          = new CachedAudioDeviceLister(DeviceState.Active);
             var deviceUnpluggedActiveLister = new CachedAudioDeviceLister(DeviceState.Active | DeviceState.Unplugged);

diff --git a/SoundSwitch/Program.cs b/SoundSwitch/Program.cs
@@ -22,7 +22,6 @@
 using Sentry;
 using Serilog;
 using SoundSwitch.Framework;
-using SoundSwitch.Framework.Configuration;
 using SoundSwitch.Framework.Logger.Configuration;
 using SoundSwitch.Framework.NotificationManager;
 using SoundSwitch.Framework.WinApi;
@@ -148,8 +147,6 @@ private static void InitializeLogger()
                 $"{Application.ProductName}  {AssemblyUtils.GetReleaseState()} ({Application.ProductVersion})");
             Log.Information($"OS: {Environment.OSVersion}");
             Log.Information($"Framework: {Environment.Version}");
-
-            SentrySdk.ConfigureScope(scope => { scope.AddAttachment(AppConfigs.Configuration.FileLocation); });
         }
 
         /// <summary>