parsing improvements

sisk-http · Aug 17, 2024 · fccb140 · fccb140
1 parent 0eae58f
commit fccb140
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/extensions/Sisk.IniConfiguration/IniDocument.cs b/extensions/Sisk.IniConfiguration/IniDocument.cs
@@ -69,7 +69,7 @@ public static IniDocument FromStream(TextReader reader)
 
     internal IniDocument(IniSection[] sections)
     {
-        Sections = sections;
+        Sections = IniSection.MergeIniSections(sections);
     }
 
     /// <summary>

diff --git a/extensions/Sisk.IniConfiguration/IniSection.cs b/extensions/Sisk.IniConfiguration/IniSection.cs
@@ -16,6 +16,34 @@ public sealed class IniSection : IReadOnlyDictionary<string, string[]>
     /// </summary>
     public string Name { get; }
 
+    internal static IniSection[] MergeIniSections(IniSection[] sections)
+    {
+        var sectionNames = sections
+            .DistinctBy(s => s.Name, IniReader.IniNamingComparer)
+            .Select(s => s.Name)
+            .ToArray();
+
+        List<IniSection> result = new List<IniSection>(sectionNames.Length);
+        for (int i = 0; i < sectionNames.Length; i++)
+        {
+            string currentName = sectionNames[i];
+            List<(string, string)> allProperties = new();
+
+            for (int j = 0; j < sections.Length; j++)
+            {
+                IniSection s = sections[j];
+                if (IniReader.IniNamingComparer.Compare(s.Name, currentName) == 0)
+                {
+                    allProperties.AddRange(s.items);
+                }
+            }
+
+            result.Add(new IniSection(currentName, allProperties.ToArray()));
+        }
+
+        return result.ToArray();
+    }
+
     internal IniSection(string name, (string, string)[] items)
     {
         this.items = items;