Rename module_identifiers to module_identifiers_by_game

Handle fields and nested converters in prop name changed converter
KSP-CKAN · Aug 20, 2023 · f6d439f · f6d439f
1 parent f0c315d
commit f6d439f
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 6 deletions.
diff --git a/Core/Converters/JsonPropertyNamesChangedConverter.cs b/Core/Converters/JsonPropertyNamesChangedConverter.cs
@@ -49,7 +49,6 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
         public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
         {
             object instance = Activator.CreateInstance(objectType);
-            var props = objectType.GetTypeInfo().DeclaredProperties.ToList();
             JObject jo = JObject.Load(reader);
             var changes = mapping;
             foreach (JProperty jp in jo.Properties())
@@ -59,14 +58,44 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 {
                     name = jp.Name;
                 }
-                PropertyInfo prop = props.FirstOrDefault(pi => pi.CanWrite && (
-                    pi.GetCustomAttribute<JsonPropertyAttribute>()?.PropertyName == name
-                    || pi.Name == name));
-                prop?.SetValue(instance, jp.Value.ToObject(prop.PropertyType, serializer));
+                PropertyInfo prop = objectType.GetTypeInfo().DeclaredProperties.FirstOrDefault(pi =>
+                    pi.CanWrite
+                    && (pi.GetCustomAttribute<JsonPropertyAttribute>()?.PropertyName ?? pi.Name) == name);
+                if (prop != null)
+                {
+                    prop.SetValue(instance,
+                                  GetValue(prop.GetCustomAttribute<JsonConverterAttribute>(),
+                                           jp.Value, prop.PropertyType, serializer));
+                }
+                else
+                {
+                    // No property, maybe there's a field
+                    FieldInfo field = objectType.GetTypeInfo().DeclaredFields.FirstOrDefault(fi =>
+                        (fi.GetCustomAttribute<JsonPropertyAttribute>()?.PropertyName ?? fi.Name) == name);
+                    if (field != null)
+                    {
+                        field.SetValue(instance,
+                                       GetValue(field.GetCustomAttribute<JsonConverterAttribute>(),
+                                                jp.Value, field.FieldType, serializer));
+                    }
+                }
             }
             return instance;
         }
 
+        private static object GetValue(JsonConverterAttribute attrib,
+                                       JToken value, Type outputType, JsonSerializer serializer)
+            => attrib != null ? ApplyConverter((JsonConverter)Activator.CreateInstance(attrib.ConverterType,
+                                                                                       attrib.ConverterParameters),
+                                               value, outputType, serializer)
+                              : value.ToObject(outputType, serializer);
+
+        private static object ApplyConverter(JsonConverter converter,
+                                             JToken value, Type outputType, JsonSerializer serializer)
+            => converter.CanRead ? converter.ReadJson(new JTokenReader(value),
+                                                      outputType, null, serializer)
+                                 : value.ToObject(outputType, serializer);
+
         /// <summary>
         /// This is what you need to override in your child class
         /// </summary>

diff --git a/GUI/Labels/ModuleLabel.cs b/GUI/Labels/ModuleLabel.cs
@@ -6,6 +6,7 @@
 namespace CKAN.GUI
 {
     [JsonObject(MemberSerialization.OptIn)]
+    [JsonConverter(typeof(ModuleIdentifiersRenamedConverter))]
     public class ModuleLabel
     {
         [JsonProperty("name", NullValueHandling = NullValueHandling.Ignore)]
@@ -41,7 +42,7 @@ public class ModuleLabel
         [DefaultValue(false)]
         public bool    HoldVersion;
 
-        [JsonProperty("module_identifiers", NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty("module_identifiers_by_game", NullValueHandling = NullValueHandling.Ignore)]
         public HashSet<string> ModuleIdentifiers = new HashSet<string>();
 
         /// <summary>
@@ -72,4 +73,16 @@ public void Remove(string identifier)
             ModuleIdentifiers.Remove(identifier);
         }
     }
+
+    /// <summary>
+    /// Protect old clients from trying to load a file they can't parse
+    /// </summary>
+    public class ModuleIdentifiersRenamedConverter : JsonPropertyNamesChangedConverter
+    {
+        protected override Dictionary<string, string> mapping
+            => new Dictionary<string, string>
+            {
+                { "module_identifiers", "module_identifiers_by_game" }
+            };
+    }
 }