fix: settings save issues

DearVa · DearVa · commit f5bbf024e2f7 · 2025-09-25T12:52:33.000+08:00
diff --git a/3rd/WritableJsonConfiguration b/3rd/WritableJsonConfiguration
@@ -1 +1 @@
-Subproject commit 8137f4fc6c4e432bb7233aaaa1c1b3c137649a91
+Subproject commit ce5d5fc2f8d9c2c131a34b1a5be9eabbd95ebc20
diff --git a/src/Everywhere/Initialization/SettingsInitializer.cs b/src/Everywhere/Initialization/SettingsInitializer.cs
@@ -43,11 +43,11 @@ public SettingsInitializer(Settings settings, [FromKeyedServices(typeof(Settings
 
     public Task InitializeAsync()
     {
+        InitializeObserver();
+
         InitializeModelProviders();
         InitializeSearchEngineProviders();
 
-        InitializeObserver();
-
         return Task.CompletedTask;
     }
 
@@ -64,6 +64,15 @@ void HandleSettingsChanges(in ObjectObserverChangedEventArgs e)
 
     private void InitializeModelProviders()
     {
+        // Remove duplicate model providers by Id
+        _settings.Model.ModelProviders.Reset(_settings.Model.ModelProviders.DistinctBy(m => m.Id));
+
+        foreach (var modelProvider in _settings.Model.ModelProviders)
+        {
+            // Remove duplicate model definitions by Id
+            modelProvider.ModelDefinitions.Reset(modelProvider.ModelDefinitions.DistinctBy(m => m.Id));
+        }
+
         ApplyModelProviders(
             [
                 new ModelProvider
@@ -606,6 +615,9 @@ private void InitializeSearchEngineProviders()
     {
         var webSearchEngineSettings = _settings.Plugin.WebSearchEngine;
 
+        // Remove duplicate search engine providers by Id
+        webSearchEngineSettings.WebSearchEngineProviders.Reset(webSearchEngineSettings.WebSearchEngineProviders.DistinctBy(p => p.Id));
+
         ApplySearchEngineProviders(
             [
                 new WebSearchEngineProvider

Original file line number	Diff line number	Diff line change
`@@ -43,11 +43,11 @@ public SettingsInitializer(Settings settings, [FromKeyedServices(typeof(Settings`
`43`	`43`
`44`	`44`	`public Task InitializeAsync()`
`45`	`45`	`{`
	`46`	`+ InitializeObserver();`
	`47`	`+`
`46`	`48`	`InitializeModelProviders();`
`47`	`49`	`InitializeSearchEngineProviders();`
`48`	`50`
`49`		`- InitializeObserver();`
`50`		`-`
`51`	`51`	`return Task.CompletedTask;`
`52`	`52`	`}`
`53`	`53`
`@@ -64,6 +64,15 @@ void HandleSettingsChanges(in ObjectObserverChangedEventArgs e)`
`64`	`64`
`65`	`65`	`private void InitializeModelProviders()`
`66`	`66`	`{`
	`67`	`+ // Remove duplicate model providers by Id`
	`68`	`+ _settings.Model.ModelProviders.Reset(_settings.Model.ModelProviders.DistinctBy(m => m.Id));`
	`69`	`+`
	`70`	`+ foreach (var modelProvider in _settings.Model.ModelProviders)`
	`71`	`+ {`
	`72`	`+ // Remove duplicate model definitions by Id`
	`73`	`+ modelProvider.ModelDefinitions.Reset(modelProvider.ModelDefinitions.DistinctBy(m => m.Id));`
	`74`	`+ }`
	`75`	`+`
`67`	`76`	`ApplyModelProviders(`
`68`	`77`	`[`
`69`	`78`	`new ModelProvider`
`@@ -606,6 +615,9 @@ private void InitializeSearchEngineProviders()`
`606`	`615`	`{`
`607`	`616`	`var webSearchEngineSettings = _settings.Plugin.WebSearchEngine;`
`608`	`617`
	`618`	`+ // Remove duplicate search engine providers by Id`
	`619`	`+ webSearchEngineSettings.WebSearchEngineProviders.Reset(webSearchEngineSettings.WebSearchEngineProviders.DistinctBy(p => p.Id));`
	`620`	`+`
`609`	`621`	`ApplySearchEngineProviders(`
`610`	`622`	`[`
`611`	`623`	`new WebSearchEngineProvider`