Deukhoofd/PkmnLib.NET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweaks for JSON loading, minor refactor of unit tests

Browse Source
This commit is contained in:
Deukhoofd
2025-02-08 09:49:16 +01:00
parent 51dfc4d07e
commit 58e9f4c3d1
11 changed files with 63 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PkmnLib.Dataloader/AbilityDataLoader.cs
View File

@@ -15,17 +15,15 @@ public static class AbilityDataLoader
{
private static Dictionary<string, SerializedAbility> LoadAbilitiesData(Stream stream)
{
var obj = JsonSerializer.Deserialize<JsonObject>(stream);
var obj = JsonSerializer.Deserialize<JsonObject>(stream, JsonOptions.DefaultOptions);
if (obj == null)
throw new InvalidDataException("Ability data is empty.");
obj.Remove("$schema");
var cleanedString = obj.ToJsonString();
var objects = JsonSerializer.Deserialize<Dictionary<string, SerializedAbility>>(cleanedString,
new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
});
var objects =
JsonSerializer.Deserialize<Dictionary<string, SerializedAbility>>(cleanedString,
JsonOptions.DefaultOptions);
if (objects == null)
throw new InvalidDataException("Ability data is empty.");
return objects;

2
PkmnLib.Dataloader/GrowthRateDataLoader.cs
View File

@@ -10,7 +10,7 @@ public static class GrowthRateDataLoader
{
public static GrowthRateLibrary LoadGrowthRates(Stream stream)
{
var objects = JsonSerializer.Deserialize<Dictionary<string, uint[]>>(stream)!;
var objects = JsonSerializer.Deserialize<Dictionary<string, uint[]>>(stream, JsonOptions.DefaultOptions)!;
var library = new GrowthRateLibrary();
foreach (var (key, value) in objects)
{

5
PkmnLib.Dataloader/ItemDataLoader.cs
View File

@@ -17,10 +17,7 @@ public static class ItemDataLoader
public static ItemLibrary LoadItems(Stream stream)
{
var library = new ItemLibrary();
var obj = JsonSerializer.Deserialize<SerializedItem[]>(stream, new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
});
var obj = JsonSerializer.Deserialize<SerializedItem[]>(stream, JsonOptions.DefaultOptions);
if (obj == null)
throw new InvalidDataException("Item data is empty.");
var items = obj.Select(DeserializeItem);

13
PkmnLib.Dataloader/JsonOptions.cs Normal file
View File

@@ -0,0 +1,13 @@
using System.Text.Json;
namespace PkmnLib.Dataloader;
internal static class JsonOptions
{
public static JsonSerializerOptions DefaultOptions => new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
AllowTrailingCommas = true,
ReadCommentHandling = JsonCommentHandling.Skip,
};
}

6
PkmnLib.Dataloader/MoveDataLoader.cs
View File

@@ -17,11 +17,7 @@ public static class MoveDataLoader
public static MoveLibrary LoadMoves(Stream stream, TypeLibrary typeLibrary)
{
var library = new MoveLibrary();
var objects = JsonSerializer.Deserialize<SerializedMoveDataWrapper>(stream,
new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
});
var objects = JsonSerializer.Deserialize<SerializedMoveDataWrapper>(stream, JsonOptions.DefaultOptions);
if (objects == null)
throw new InvalidDataException("Move data is empty.");
var moves = objects.Data.Select(x => DeserializeMove(x, typeLibrary));

8
PkmnLib.Dataloader/SpeciesDataLoader.cs
View File

@@ -17,15 +17,11 @@ public static class SpeciesDataLoader
{
private static Dictionary<string, SerializedSpecies> LoadSpeciesData(Stream stream)
{
var obj = JsonSerializer.Deserialize<JsonObject>(stream);
var obj = JsonSerializer.Deserialize<JsonObject>(stream, JsonOptions.DefaultOptions);
if (obj == null)
throw new InvalidDataException("Species data is empty.");
var jsonConfig = new JsonSerializerOptions()
{
PropertyNameCaseInsensitive = true,
};
return obj.Where(x => x.Key != "$schema")
.ToDictionary(x => x.Key, x => x.Value.Deserialize<SerializedSpecies>(jsonConfig));
.ToDictionary(x => x.Key, x => x.Value.Deserialize<SerializedSpecies>(JsonOptions.DefaultOptions));
}
public static SpeciesLibrary LoadSpecies(Stream[] streams, IReadOnlyTypeLibrary typeLibrary)