Merge #3957 Re-sort module properties after merging

KSP-CKAN · Dec 15, 2023 · d43a2ac · d43a2ac
2 parents c831d80 + 94e9e91
commit d43a2ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
 
 ## v1.34.3
 
+### Internal
 
+- [Netkan] Re-sort module properties after merging (#3957 by: HebaruSan)
 
 ## v1.34.2 (Minkowski²)
 

diff --git a/Netkan/Model/Metadata.cs b/Netkan/Model/Metadata.cs
@@ -6,6 +6,7 @@
 
 using CKAN.Versioning;
 using CKAN.NetKAN.Extensions;
+using CKAN.NetKAN.Transformers;
 
 namespace CKAN.NetKAN.Model
 {
@@ -124,8 +125,9 @@ public Metadata(YamlMappingNode yaml) : this(yaml?.ToJObject())
 
         public static Metadata Merge(Metadata[] modules)
             => modules.Length == 1 ? modules[0]
-                                   : new Metadata(MergeJson(modules.Select(m => m._json)
-                                                                   .ToArray()));
+                                   : PropertySortTransformer.SortProperties(
+                                       new Metadata(MergeJson(modules.Select(m => m._json)
+                                                                     .ToArray())));
 
         private static JObject MergeJson(JObject[] jsons)
         {

diff --git a/Netkan/Program.cs b/Netkan/Program.cs
@@ -62,8 +62,7 @@ public static int Main(string[] args)
                     );
                     inf.ValidateCkan(ckan);
                     Console.WriteLine(QueueHandler.serializeCkan(
-                        new PropertySortTransformer().Transform(ckan, null).First()
-                    ));
+                        PropertySortTransformer.SortProperties(ckan)));
                     return ExitOk;
                 }
 

diff --git a/Netkan/Transformers/PropertySortTransformer.cs b/Netkan/Transformers/PropertySortTransformer.cs
@@ -110,6 +110,10 @@ public IEnumerable<Metadata> Transform(Metadata metadata, TransformOptions opts)
             yield return new Metadata(sortedJson);
         }
 
+        public static Metadata SortProperties(Metadata metadata)
+            => new PropertySortTransformer().Transform(metadata, null)
+                                            .First();
+
         private static double GetPropertySortOrder(string propertyName)
             => PropertySortOrder.TryGetValue(propertyName, out int sortOrder)
                 ? sortOrder