h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:17:26 +08:00
Code Issues Releases Wiki Activity

Make TypedListConverter not reconstruct serializers

Browse Source
This commit is contained in:
smoogipoo 2017-12-07 03:04:56 +09:00
parent b6b26cfe25
commit 4232a54b32
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/IO/Serialization/Converters/TypedListConverter.cs
View File

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@ -20,12 +19,10 @@ namespace osu.Game.IO.Serialization.Converters
{
var list = new List<T>();
var localSerializer = createLocalSerializer();
var obj = JObject.Load(reader);
var lookupTable = new List<string>();
localSerializer.Populate(obj["LookupTable"].CreateReader(), lookupTable);
serializer.Populate(obj["LookupTable"].CreateReader(), lookupTable);
foreach (var tok in obj["Items"])
{
@ -33,7 +30,7 @@ namespace osu.Game.IO.Serialization.Converters
var typeName = lookupTable[(int)tok["Type"]];
var instance = (T)Activator.CreateInstance(Type.GetType(typeName));
localSerializer.Populate(itemReader, instance);
serializer.Populate(itemReader, instance);
list.Add(instance);
}
@ -45,8 +42,6 @@ namespace osu.Game.IO.Serialization.Converters
{
var list = (List<T>)value;
var localSerializer = createLocalSerializer();
var lookupTable = new List<string>();
var objects = new List<JObject>();
foreach (var item in list)
@ -60,7 +55,7 @@ namespace osu.Game.IO.Serialization.Converters
typeId = lookupTable.Count - 1;
}
var itemObject = JObject.FromObject(item, localSerializer);
var itemObject = JObject.FromObject(item, serializer);
itemObject.AddFirst(new JProperty("Type", typeId));
objects.Add(itemObject);
}
@ -68,7 +63,7 @@ namespace osu.Game.IO.Serialization.Converters
writer.WriteStartObject();
writer.WritePropertyName("LookupTable");
localSerializer.Serialize(writer, lookupTable);
serializer.Serialize(writer, lookupTable);
writer.WritePropertyName("Items");
writer.WriteStartArray();
@ -78,12 +73,5 @@ namespace osu.Game.IO.Serialization.Converters
writer.WriteEndObject();
}
private JsonSerializer createLocalSerializer()
{
var localSettings = JsonSerializableExtensions.CreateGlobalSettings();
localSettings.Converters = localSettings.Converters.Where(c => !(c is TypedListConverter<T>)).ToArray();
return JsonSerializer.Create(localSettings);
}
}
}