refactor ObjectSettings<T>.SettingsSavePath method

Author: Aytackydln

Project-Aurora/Project-Aurora/Profiles/Application.cs

@@ -48,6 +48,7 @@ public class Application : ObjectSettings<ApplicationSettings>, ILightEvent, INo
     #endregion
 
     #region Internal Properties
+    protected override string SettingsSavePath => Path.Combine(GetProfileFolderPath(), "settings.json");
     protected ImageSource? icon;
     public virtual ImageSource Icon => icon ??= new BitmapImage(new Uri(GetBaseUri(), @"/AuroraRgb;component/" + Config.IconURI));
 
@@ -72,7 +73,6 @@ private static Uri GetBaseUri()
     protected Application(LightEventConfig config)
     {
         Config = config;
-        SettingsSavePath = Path.Combine(GetProfileFolderPath(), "settings.json");
         config.Application = this;
         config.Event.ResetGameState(config.GameStateType);
         Profiles = new ObservableCollection<ApplicationProfile>();
@@ -678,7 +678,10 @@ protected override async Task LoadSettings(Type settingsType)
     {
         await base.LoadSettings(settingsType);
 
-        Settings.PropertyChanged += OnSettingsPropertyChanged;
+        if (Settings != null)
+        {
+            Settings.PropertyChanged += OnSettingsPropertyChanged;
+        }
     }
 
     private async void OnSettingsPropertyChanged(object? sender, PropertyChangedEventArgs e)

Project-Aurora/Project-Aurora/Settings/ObjectSettings.cs

@@ -5,10 +5,10 @@
 
 namespace AuroraRgb.Settings;
 
-public class ObjectSettings<T>
+public abstract class ObjectSettings<T>
 {
-    protected string? SettingsSavePath { get; set; }
-    public T? Settings { get; protected set; }
+    protected abstract string SettingsSavePath { get; }
+    public T? Settings { get; private set; }
 
     public async Task SaveSettings()
     {
@@ -17,11 +17,6 @@ public async Task SaveSettings()
 
     protected async Task SaveSettings(Type settingsType)
     {
-        if (SettingsSavePath == null)
-        {
-            return;
-        }
-
         if (Settings == null) {
             Settings = (T)Activator.CreateInstance(settingsType);
             SettingsCreateHook();
@@ -58,12 +53,6 @@ protected async Task LoadSettings()
 
     protected virtual async Task LoadSettings(Type settingsType)
     {
-        if (SettingsSavePath == null)
-        {
-            Global.logger.Warning("Type {Type} does not have a setting save path!", GetType());
-            return;
-        }
-
         if (File.Exists(SettingsSavePath))
         {
             try

Project-Aurora/Project-Aurora/Settings/PluginManager.cs

@@ -94,12 +94,7 @@ public class PluginManager : ObjectSettings<PluginManagerSettings>, IPluginHost
     public const string PluginDirectory = "Plugins";
 
     public Dictionary<string, IPlugin> Plugins { get; set; } = new();
-
-    public PluginManager()
-    {
-        SettingsSavePath = Path.Combine(Global.AppDataDirectory, "PluginSettings.json");
-    }
-
+    protected override string SettingsSavePath => Path.Combine(Global.AppDataDirectory, "PluginSettings.json");
     public bool Initialized { get; protected set; }
 
     public async Task<bool> Initialize(CancellationToken cancellationToken)