Fixed a bug

AlexanderDotH · Apr 27, 2023 · 9423256 · 9423256
1 parent 783a991
commit 9423256
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 9 deletions.
diff --git a/OpenLyricsClient/Backend/Settings/ISettingSection.cs b/OpenLyricsClient/Backend/Settings/ISettingSection.cs
@@ -10,4 +10,5 @@ public interface ISettingSection
     T GetValue<T>(string field);
     Task SetValue<T>(string field, T value);
     JObject Defaults();
+    string[] GetFields();
 }
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Account/AccountSection.cs b/OpenLyricsClient/Backend/Settings/Sections/Account/AccountSection.cs
@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using DevBase.Api.Apis.OpenLyricsClient.Structure.Json;
+using DevBase.Generics;
 using Newtonsoft.Json.Linq;
 using OpenLyricsClient.Backend;
 using OpenLyricsClient.Backend.Settings;
@@ -76,4 +78,14 @@ public JObject Defaults()
 
         return new JsonDeserializer().Serialize(structure);
     }
+
+    public string[] GetFields()
+    {
+        AList<string> fields = new AList<string>();
+
+        foreach (var pair in this._data)
+            fields.Add(pair.Key);
+
+        return fields.GetAsArray();
+    }
 }
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Connection/Spotify/SpotifySection.cs b/OpenLyricsClient/Backend/Settings/Sections/Connection/Spotify/SpotifySection.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
+using DevBase.Generics;
 using Newtonsoft.Json.Linq;
 using OpenLyricsClient.Backend.Structure;
 using OpenLyricsClient.Backend.Structure.Enum;
@@ -96,4 +97,14 @@ public JObject Defaults()
 
         return new JsonDeserializer().Serialize(spotifyAccess);
     }
+
+    public string[] GetFields()
+    {
+        AList<string> fields = new AList<string>();
+
+        foreach (var pair in this._data)
+            fields.Add(pair.Key);
+
+        return fields.GetAsArray();
+    }
 }
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Lyrics/LyricsSection.cs b/OpenLyricsClient/Backend/Settings/Sections/Lyrics/LyricsSection.cs
@@ -68,4 +68,14 @@ public JObject Defaults()
 
         return new JsonDeserializer().Serialize(structure);
     }
+
+    public string[] GetFields()
+    {
+        AList<string> fields = new AList<string>();
+
+        foreach (var pair in this._data)
+            fields.Add(pair.Key);
+
+        return fields.GetAsArray();
+    }
 }
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Romanization/RomanizationSection.cs b/OpenLyricsClient/Backend/Settings/Sections/Romanization/RomanizationSection.cs
@@ -97,4 +97,14 @@ public JObject Defaults()
 
         return new JsonDeserializer().Serialize(structure);
     }
+
+    public string[] GetFields()
+    {
+        AList<string> fields = new AList<string>();
+
+        foreach (var pair in this._data)
+            fields.Add(pair.Key);
+
+        return fields.GetAsArray();
+    }
 }
diff --git a/OpenLyricsClient/Backend/Settings/Sections/Tokens/TokenSection.cs b/OpenLyricsClient/Backend/Settings/Sections/Tokens/TokenSection.cs
@@ -104,4 +104,14 @@ public JObject Defaults()
 
         return new JsonDeserializer().Serialize(structure);
     }
+
+    public string[] GetFields()
+    {
+        AList<string> fields = new AList<string>();
+
+        foreach (var pair in this._data)
+            fields.Add(pair.Key);
+
+        return fields.GetAsArray();
+    }
 }
diff --git a/OpenLyricsClient/Backend/Settings/SettingsHandler.cs b/OpenLyricsClient/Backend/Settings/SettingsHandler.cs
@@ -67,15 +67,14 @@ public async Task TriggerEvent<T>(T section, string field)
 
     public async Task TriggerGlobal()
     {
-        this._sections.ForEach(s =>
+        for (int i = 0; i < this._sections.Length; i++)
         {
-            using (var enumerator = s.Defaults().GetEnumerator())
-            {
-                while (enumerator.MoveNext())
-                {
-                    TriggerEvent(s, enumerator.Current.Key.ToString());
-                }
-            }
-        });
+            ISettingSection section = this._sections.Get(i);
+
+            string[] fields = section.GetFields();
+
+            for (int j = 0; j < fields.Length; j++)
+                await TriggerEvent(section, fields[j]);
+        }
     }
 }