add ByteArrayJsonConverter, MetadataPropertyHandling.ReadAhead

UAssetAPI/JSON/ByteArrayJsonConverter.cs

@@ -0,0 +1,51 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+
+namespace UAssetAPI.JSON
+{
+    public class ByteArrayJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(byte[]);
+        }
+
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            writer.WriteValue(Convert.ToBase64String((byte[])value));
+        }
+
+        public override bool CanRead
+        {
+            get { return true; }
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            string val = reader.Value as string;
+
+            // backwards compatibility for fun
+            if (reader.TokenType == JsonToken.StartObject)
+            {
+                reader.Read();
+                while (reader.TokenType != JsonToken.EndObject)
+                {
+                    if (reader.TokenType != JsonToken.PropertyName) throw new FormatException("Expected PropertyName, got " + reader.TokenType);
+                    string propertyName = reader.Value.ToString();
+                    reader.Read();
+                    object propertyValue = reader.Value;
+                    reader.Read();
+
+                    if (propertyName == "$value")
+                    {
+                        val = propertyValue as string;
+                    }
+                }
+            }
+
+            if (val == null) return null;
+            return Convert.FromBase64String(val);
+        }
+    }
+}

UAssetAPI/UAsset.cs

@@ -1011,6 +1011,7 @@ public void ConvertExportToChildExportAndRead(AssetBinaryReader reader, int i, b
             NullValueHandling = NullValueHandling.Include,
             FloatParseHandling = FloatParseHandling.Double,
             ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+            MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead,
             ContractResolver = new UAssetContractResolver(null),
             Converters = new List<JsonConverter>()
             {
@@ -1021,6 +1022,7 @@ public void ConvertExportToChildExportAndRead(AssetBinaryReader reader, int i, b
                 new FPackageIndexJsonConverter(),
                 new StringEnumConverter(),
                 new GuidJsonConverter(),
+                new ByteArrayJsonConverter()
             }
         };
 
@@ -2751,6 +2753,7 @@ public T DeserializeJsonObject<T>(string json)
                 NullValueHandling = NullValueHandling.Include,
                 FloatParseHandling = FloatParseHandling.Double,
                 ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead,
                 ContractResolver = new UAssetContractResolver(toBeFilled),
                 Converters = new List<JsonConverter>()
                 {
@@ -2761,6 +2764,7 @@ public T DeserializeJsonObject<T>(string json)
                     new FPackageIndexJsonConverter(),
                     new StringEnumConverter(),
                     new GuidJsonConverter(),
+                    new ByteArrayJsonConverter()
                 }
             });
 
@@ -2797,6 +2801,7 @@ public static UAsset DeserializeJson(string json)
                 NullValueHandling = NullValueHandling.Include,
                 FloatParseHandling = FloatParseHandling.Double,
                 ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead,
                 ContractResolver = new UAssetContractResolver(toBeFilled),
                 Converters = new List<JsonConverter>()
                 {
@@ -2807,6 +2812,7 @@ public static UAsset DeserializeJson(string json)
                     new FPackageIndexJsonConverter(),
                     new StringEnumConverter(),
                     new GuidJsonConverter(),
+                    new ByteArrayJsonConverter()
                 }
             });
 
@@ -2846,6 +2852,7 @@ public static UAsset DeserializeJson(Stream stream)
                 NullValueHandling = NullValueHandling.Include,
                 FloatParseHandling = FloatParseHandling.Double,
                 ReferenceLoopHandling = ReferenceLoopHandling.Ignore,
+                MetadataPropertyHandling = MetadataPropertyHandling.ReadAhead,
                 ContractResolver = new UAssetContractResolver(toBeFilled),
                 Converters = new List<JsonConverter>()
                 {
@@ -2856,6 +2863,7 @@ public static UAsset DeserializeJson(Stream stream)
                     new FPackageIndexJsonConverter(),
                     new StringEnumConverter(),
                     new GuidJsonConverter(),
+                    new ByteArrayJsonConverter()
                 }
             });