flywithu/CryptoExchange.Net
1
0
Fork 0
mirror of https://github.com/JKorf/CryptoExchange.Net synced 2025-07-25 18:57:07 +00:00
Code Issues Releases Wiki Activity

Changed BaseConverter to be able to support duplicate entries

Browse Source
This commit is contained in:
Jan Korf 2019-03-07 10:05:20 +01:00
parent f2beb9f150
commit 4536d5f6c6
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
CryptoExchange.Net/Converters/BaseConverter.cs
View File

@ -8,7 +8,7 @@ namespace CryptoExchange.Net.Converters
{ {
public abstract class BaseConverter<T>: JsonConverter public abstract class BaseConverter<T>: JsonConverter
{ {
protected abstract Dictionary<T, string> Mapping { get; } protected abstract List<KeyValuePair<T, string>> Mapping { get; }
private readonly bool quotes; private readonly bool quotes;
protected BaseConverter(bool useQuotes) protected BaseConverter(bool useQuotes)
@ -18,10 +18,11 @@ namespace CryptoExchange.Net.Converters
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{ {
var stringValue = GetValue((T) value);
if (quotes) if (quotes)
writer.WriteValue(Mapping[(T)value]); writer.WriteValue(stringValue);
else else
writer.WriteRawValue(Mapping[(T)value]); writer.WriteRawValue(stringValue);
} }
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
@ -29,21 +30,18 @@ namespace CryptoExchange.Net.Converters
if (reader.Value == null) if (reader.Value == null)
return null; return null;
var value = reader.Value.ToString(); if (!GetValue(reader.Value.ToString(), out var result))
if (Mapping.ContainsValue(value)) {
return Mapping.Single(m => m.Value == value).Key; Debug.WriteLine($"Cannot map enum. Type: {typeof(T)}, Value: {reader.Value}");
return null;
}
var lowerResult = Mapping.SingleOrDefault(m => string.Equals(m.Value, value, StringComparison.CurrentCultureIgnoreCase)); return result;
if (!lowerResult.Equals(default(KeyValuePair<T, string>)))
return lowerResult.Key;
Debug.WriteLine($"Cannot map enum. Type: {typeof(T)}, Value: {value}");
return null;
} }
public T ReadString(string data) public T ReadString(string data)
{ {
return Mapping.SingleOrDefault(v => v.Value == data).Key; return Mapping.FirstOrDefault(v => v.Value == data).Key;
} }
public override bool CanConvert(Type objectType) public override bool CanConvert(Type objectType)
@ -51,5 +49,23 @@ namespace CryptoExchange.Net.Converters
// Check if it is type, or nullable of type // Check if it is type, or nullable of type
return objectType == typeof(T) || Nullable.GetUnderlyingType(objectType) == typeof(T); return objectType == typeof(T) || Nullable.GetUnderlyingType(objectType) == typeof(T);
} }
private bool GetValue(string value, out T result)
{
var mapping = Mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
if (!mapping.Equals(default(KeyValuePair<T, string>)))
{
result = mapping.Key;
return true;
}
result = default(T);
return false;
}
private string GetValue(T value)
{
return Mapping.FirstOrDefault(v => v.Key.Equals(value)).Value;
}
} }
} }

2
CryptoExchange.Net/CryptoExchange.Net.csproj
View File

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<PackageId>CryptoExchange.Net</PackageId> <PackageId>CryptoExchange.Net</PackageId>
<Authors>JKorf</Authors> <Authors>JKorf</Authors>
<PackageVersion>2.0.11</PackageVersion> <PackageVersion>2.0.12</PackageVersion>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl> <PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/JKorf/CryptoExchange.Net/blob/master/LICENSE</PackageLicenseUrl> <PackageLicenseUrl>https://github.com/JKorf/CryptoExchange.Net/blob/master/LICENSE</PackageLicenseUrl>