Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2026-05-29 18:42:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning up searches

Browse Source
This commit is contained in:
Zoe Roux
2021-03-10 00:46:17 +01:00
parent d3d2677a83
commit 356b8a5472
11 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kyoo.CommonAPI/JsonSerializer.cs
+17 -4
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using Kyoo.Models;
using Kyoo.Models.Attributes;
@@ -58,10 +59,22 @@ namespace Kyoo.Controllers
{
public override void WriteJson(JsonWriter writer, PeopleRole value, JsonSerializer serializer)
{
// TODO this seems to not use the property.ShouldSerialize and cause an recursive inclusion error.
JToken t = JToken.FromObject(value, serializer);
JObject obj = t as JObject;
writer.WriteValue(obj);
ICollection<PeopleRole> oldPeople = value.Show?.People;
ICollection<PeopleRole> oldRoles = value.People?.Roles;
if (value.Show != null)
value.Show.People = null;
if (value.People != null)
value.People.Roles = null;
JObject obj = JObject.FromObject(value.ForPeople ? value.People : value.Show, serializer);
obj.Add("role", value.Role);
obj.Add("type", value.Type);
obj.WriteTo(writer);
if (value.Show != null)
value.Show.People = oldPeople;
if (value.People != null)
value.People.Roles = oldRoles;
}
public override PeopleRole ReadJson(JsonReader reader,