Feature: Improve settings load

Author: BornToBeRoot

Source/NETworkManager.Settings/LocalSettingsManager.cs

@@ -115,7 +115,7 @@ public static void Load()
             }
         }
 
-        // Initialize new settings if loading failed or file does not exist
+        // Initialize new local settings if file does not exist or loading failed
         Initialize();
     }
 

Source/NETworkManager.Settings/SettingsManager.cs

@@ -266,43 +266,68 @@ public static void Load()
         // Check if JSON file exists
         if (File.Exists(filePath))
         {
-            Log.Info($"Loading settings from: {filePath}");
+            try
+            {
+                Log.Info($"Loading settings from: {filePath}");
 
-            Current = DeserializeFromFile(filePath);
+                Current = DeserializeFromFile(filePath);
 
-            Log.Info("Settings loaded successfully.");
+                Log.Info("Settings loaded successfully.");
 
-            // Reset change tracking
-            Current.SettingsChanged = false;
+                // Reset change tracking
+                Current.SettingsChanged = false;
 
-            return;
-        }
+                return;
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"Failed to load settings from: {filePath}", ex);
+
+                Backup(filePath,
+                    GetSettingsFolderLocation(),
+                    $"{TimestampHelper.GetTimestamp()}_corrupted_{Path.GetFileName(filePath)}");
 
+                ConfigurationManager.Current.ShowSettingsResetNoteOnStartup = true;
+            }
+        }
         // Check if legacy XML file exists and migrate it
-        if (File.Exists(legacyFilePath))
+        else if (File.Exists(legacyFilePath))
         {
-            Log.Info("Legacy XML settings file found. Migrating to JSON format...");
+            try
+            {
+                Log.Info("Legacy XML settings file found. Migrating to JSON format...");
 
-            Current = DeserializeFromXmlFile(legacyFilePath);
+                Current = DeserializeFromXmlFile(legacyFilePath);
 
-            Current.SettingsChanged = false;
+                Current.SettingsChanged = false;
 
-            // Save in new JSON format
-            Save();
+                // Save in new JSON format
+                Save();
 
-            // Create a backup of the legacy XML file and delete the original
-            Backup(legacyFilePath,
-                GetSettingsBackupFolderLocation(),
-                TimestampHelper.GetTimestampFilename(GetLegacySettingsFileName()));
+                // Create a backup of the legacy XML file and delete the original
+                Backup(legacyFilePath,
+                    GetSettingsBackupFolderLocation(),
+                    TimestampHelper.GetTimestampFilename(GetLegacySettingsFileName()));
 
-            File.Delete(legacyFilePath);
+                File.Delete(legacyFilePath);
 
-            Log.Info("Settings migration from XML to JSON completed successfully.");
+                Log.Info("Settings migration from XML to JSON completed successfully.");
 
-            return;
+                return;
+            }
+            catch (Exception ex)
+            {
+                Log.Error($"Failed to load legacy settings from: {legacyFilePath}", ex);
+
+                Backup(legacyFilePath,
+                    GetSettingsFolderLocation(),
+                    $"{TimestampHelper.GetTimestamp()}_corrupted_{Path.GetFileName(legacyFilePath)}");
+
+                ConfigurationManager.Current.ShowSettingsResetNoteOnStartup = true;
+            }
         }
 
-        // Initialize the default settings if there is no settings file.
+        // Initialize new settings if file does not exist or loading failed
         Initialize();
     }
 

Source/NETworkManager/App.xaml.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
-using System.Text.Json;
 using System.Threading;
 using System.Windows;
 using System.Windows.Threading;
@@ -88,21 +86,12 @@ by BornToBeRoot
 
         // Load (or initialize) local settings
         LocalSettingsManager.Load();
-        
-        // Load (or initialize) settings
-        try
-        {
-            if (CommandLineManager.Current.ResetSettings)
-                SettingsManager.Initialize();
-            else
-                SettingsManager.Load();
-        }
-        catch (Exception ex)
-        {
-            Log.Error("Could not load application settings!", ex);
 
-            HandleCorruptedSettingsFile();
-        }        
+        // Load (or initialize) settings
+        if (CommandLineManager.Current.ResetSettings)
+            SettingsManager.Initialize();
+        else
+            SettingsManager.Load();
 
         // Upgrade settings if necessary
         var settingsVersion = Version.Parse(SettingsManager.Current.Version);
@@ -209,27 +198,6 @@ by BornToBeRoot
         StartupUri = new Uri("MainWindow.xaml", UriKind.Relative);
     }
 
-    /// <summary>
-    ///     Handles a corrupted settings file by creating a backup and initializing default settings.
-    /// </summary>
-    private void HandleCorruptedSettingsFile()
-    {
-        // Create backup of corrupted file
-        var destinationFile =
-            $"{TimestampHelper.GetTimestamp()}_corrupted_" + SettingsManager.GetSettingsFileName();
-
-        File.Copy(SettingsManager.GetSettingsFilePath(),
-            Path.Combine(SettingsManager.GetSettingsFolderLocation(), destinationFile));
-
-        Log.Info($"A backup of the corrupted settings file has been saved under {destinationFile}");
-
-        // Initialize default application settings
-        Log.Info("Initialize default application settings...");
-
-        SettingsManager.Initialize();
-        ConfigurationManager.Current.ShowSettingsResetNoteOnStartup = true;
-    }
-
     /// <summary>
     /// Handles the tick event of the dispatcher timer to trigger a background job and save data.
     /// </summary>