Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Absorbed PercentJsonConverter into library systems

Browse Source
This commit is contained in:
Justin Swanson 2020-04-01 14:15:23 -05:00 committed by Timothy Baldridge
parent 5829a7ab93
commit 41955daac1
3 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Wabbajack.Common/Json.cs
View File

@ -16,7 +16,8 @@ namespace Wabbajack.Common
new AbolutePathConverter(),
new HashRelativePathConverter(),
new FullPathConverter(),
new GameConverter()
new GameConverter(),
new PercentConverter(),
};
public static void ToJSON<T>(this T obj, string filename)
@ -128,6 +129,20 @@ namespace Wabbajack.Common
}
}
private class PercentConverter : JsonConverter<Percent>
{
public override Percent ReadJson(JsonReader reader, Type objectType, Percent existingValue, bool hasExistingValue, JsonSerializer serializer)
{
double d = (double)reader.Value;
return Percent.FactoryPutInRange(d);
}
public override void WriteJson(JsonWriter writer, Percent value, JsonSerializer serializer)
{
writer.WriteValue(value.Value);
}
}
private class HashRelativePathConverter : JsonConverter<HashRelativePath>
{
public override void WriteJson(JsonWriter writer, HashRelativePath value, JsonSerializer serializer)

23
Wabbajack/Converters/PercentJsonConverter.cs
View File

@ -1,23 +0,0 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Text;
using Newtonsoft.Json;
using Wabbajack.Common;
namespace Wabbajack
{
public class PercentJsonConverter : JsonConverter<Percent>
{
public override Percent ReadJson(JsonReader reader, Type objectType, [AllowNull] Percent existingValue, bool hasExistingValue, JsonSerializer serializer)
{
double d = (double)reader.Value;
return Percent.FactoryPutInRange(d);
}
public override void WriteJson(JsonWriter writer, [AllowNull] Percent value, JsonSerializer serializer)
{
writer.WriteValue(value.Value);
}
}
}

7
Wabbajack/Views/MainWindow.xaml.cs
View File

@ -61,13 +61,6 @@ namespace Wabbajack
}).FireAndForget();
// Load settings
JsonConvert.DefaultSettings = () => new JsonSerializerSettings
{
Converters = new List<JsonConverter>
{
new PercentJsonConverter()
}
};
if (CLIArguments.NoSettings || !MainSettings.TryLoadTypicalSettings(out var settings))
{
_settings = new MainSettings