mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Merge pull request #4735 from crobibero/json-recursion
Fix JsonConverter recursion
This commit is contained in:
commit
94d805d03d
@ -342,10 +342,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts.HdHomerun
|
|||||||
|
|
||||||
public string URL { get; set; }
|
public string URL { get; set; }
|
||||||
|
|
||||||
[JsonConverter(typeof(JsonBoolNumberConverter))]
|
|
||||||
public bool Favorite { get; set; }
|
public bool Favorite { get; set; }
|
||||||
|
|
||||||
[JsonConverter(typeof(JsonBoolNumberConverter))]
|
|
||||||
public bool DRM { get; set; }
|
public bool DRM { get; set; }
|
||||||
|
|
||||||
public int HD { get; set; }
|
public int HD { get; set; }
|
||||||
|
@ -24,7 +24,7 @@ namespace MediaBrowser.Common.Json.Converters
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
|
public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
|
||||||
{
|
{
|
||||||
JsonSerializer.Serialize(writer, value, options);
|
writer.WriteBooleanValue(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -19,5 +19,16 @@ namespace Jellyfin.Common.Tests.Json
|
|||||||
var value = JsonSerializer.Deserialize<bool>(input, options);
|
var value = JsonSerializer.Deserialize<bool>(input, options);
|
||||||
Assert.Equal(value, output);
|
Assert.Equal(value, output);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Theory]
|
||||||
|
[InlineData(true, "true")]
|
||||||
|
[InlineData(false, "false")]
|
||||||
|
public static void Serialize_Bool_Success(bool input, string output)
|
||||||
|
{
|
||||||
|
var options = new JsonSerializerOptions();
|
||||||
|
options.Converters.Add(new JsonBoolNumberConverter());
|
||||||
|
var value = JsonSerializer.Serialize(input, options);
|
||||||
|
Assert.Equal(value, output);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user