🐛 fix(Backups): Restore settings erroneous write default settings

Author: Yu-Core

src/SwashbucklerDiary.Rcl/Components/DialogComponents/RadioDialog.razor.cs

@@ -20,7 +20,7 @@ public partial class RadioDialog<TItem, TItemValue> : DialogComponentBase
         public string? Title { get; set; }
 
         [Parameter, EditorRequired]
-        public ICollection<TItem> Items { get; set; } = default!;
+        public IEnumerable<TItem> Items { get; set; } = default!;
 
         [Parameter]
         public Func<TItem, string>? ItemText { get; set; }

src/SwashbucklerDiary.Rcl/Layout/MainLayoutBase.cs

@@ -92,8 +92,9 @@ protected async void HandleSettingsChanged()
         {
             var theme = SettingService.Get(it => it.Theme);
             await ThemeService.SetThemeAsync((Shared.Theme)theme);
-            var language = SettingService.Get(it => it.Language);
-            I18n.SetCulture(language);
+            // A bug, it will cause the language selection RadioDialog to fail to select
+            //var language = SettingService.Get(it => it.Language);
+            //I18n.SetCulture(language);
         }
     }
 }

src/SwashbucklerDiary.Rcl/Services/SettingService/ISettingService.cs

@@ -146,7 +146,7 @@ public Setting SaveSettingsToObject(Func<string, bool>? func = null)
             var obj = new Setting();
             var properties = obj.GetType().GetProperties();
 
-            var method = this.GetType()?.GetMethod(nameof(Get), [typeof(string)])
+            var getMethod = this.GetType()?.GetMethod(nameof(Get), [typeof(string)])
                          ?? throw new InvalidOperationException($"{nameof(Get)} does not exist");
 
             if (func is not null)
@@ -158,8 +158,8 @@ public Setting SaveSettingsToObject(Func<string, bool>? func = null)
             {
                 if (property.CanWrite)
                 {
-                    var genericMethod = method.MakeGenericMethod(property.PropertyType);
-                    var value = genericMethod.Invoke(this, [property.Name]);
+                    var getGenericMethod = getMethod.MakeGenericMethod(property.PropertyType);
+                    var value = getGenericMethod.Invoke(this, [property.Name]);
                     property.SetValue(obj, value);
                 }
             }
@@ -170,29 +170,43 @@ public Setting SaveSettingsToObject(Func<string, bool>? func = null)
         public async Task SetSettingsFromObjectAsync(Setting obj, Func<string, bool>? func = null)
         {
             var properties = obj.GetType().GetProperties();
-            var method = this.GetType()?.GetMethod(nameof(SetAsync))
+            var setAsyncMethod = this.GetType()?.GetMethod(nameof(SetAsync))
                          ?? throw new InvalidOperationException($"{nameof(SetAsync)} does not exist");
+            var getMethod = this.GetType()?.GetMethod(nameof(Get), [typeof(string)])
+                         ?? throw new InvalidOperationException($"{nameof(Get)} does not exist");
 
             if (func is not null)
             {
                 properties = properties.Where(it => func.Invoke(it.Name)).ToArray();
             }
 
+            var removeKeys = new List<string>();
             foreach (var property in properties)
             {
                 if (property.CanRead && DefalutSettings.TryGetValue(property.Name, out var defaultValue))
                 {
                     var value = property.GetValue(obj);
-                    if (value == defaultValue)
+                    var getGenericMethod = getMethod.MakeGenericMethod(property.PropertyType);
+                    var currentValue = getGenericMethod.Invoke(this, [property.Name]);
+
+                    if (Object.Equals(value, currentValue))
                     {
                         continue;
                     }
 
-                    var genericMethod = method.MakeGenericMethod(property.PropertyType);
-                    await (Task)genericMethod.Invoke(this, [property.Name, value])!;
+                    if (Object.Equals(value, defaultValue))
+                    {
+                        removeKeys.Add(property.Name);
+                        continue;
+                    }
+
+                    var setAsyncGenericMethod = setAsyncMethod.MakeGenericMethod(property.PropertyType);
+                    await (Task)setAsyncGenericMethod.Invoke(this, [property.Name, value])!;
                 }
             }
 
+            await RemoveAsync(removeKeys);
+
             SettingsChanged?.Invoke();
         }
     }