alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-13 05:42:16 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

bump System.Text.Json

Browse Source
This commit is contained in:
crobibero
2020-08-25 07:33:58 -06:00
parent 25be1a9b20
commit 5f64ab02a0
14 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Common/Json/Converters/JsonNullableInt32Converter.cs
View File

@@ -14,6 +14,11 @@ namespace MediaBrowser.Common.Json.Converters
/// <inheritdoc />
public override int? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.Null)
{
return null;
}
if (reader.TokenType == JsonTokenType.String)
{
ReadOnlySpan<byte> span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;

5
MediaBrowser.Common/Json/Converters/JsonNullableInt64Converter.cs
View File

@@ -21,6 +21,11 @@ namespace MediaBrowser.Common.Json.Converters
/// <returns>Parsed value.</returns>
public override long? Read(ref Utf8JsonReader reader, Type type, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.Null)
{
return null;
}
if (reader.TokenType == JsonTokenType.String)
{
// try to parse number directly from bytes

2
MediaBrowser.Common/Json/JsonDefaults.cs
View File

@@ -25,7 +25,7 @@ namespace MediaBrowser.Common.Json
{
ReadCommentHandling = JsonCommentHandling.Disallow,
WriteIndented = false,
IgnoreNullValues = true
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault
};
options.Converters.Add(new JsonGuidConverter());