Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing nested serializing

Browse Source
This commit is contained in:
Zoe Roux 2021-03-07 18:15:14 +01:00
parent 9a7b2cb4a1
commit fab9a3f6a1
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Kyoo.CommonAPI/JsonSerializer.cs
View File

@ -1,3 +1,4 @@
using System;
using System.Reflection; using System.Reflection;
using Kyoo.Models.Attributes; using Kyoo.Models.Attributes;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -7,6 +8,8 @@ namespace Kyoo.Controllers
{ {
public class JsonPropertyIgnorer : CamelCasePropertyNamesContractResolver public class JsonPropertyIgnorer : CamelCasePropertyNamesContractResolver
{ {
private int _depth = -1;
protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization) protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
{ {
JsonProperty property = base.CreateProperty(member, memberSerialization); JsonProperty property = base.CreateProperty(member, memberSerialization);
@ -15,10 +18,12 @@ namespace Kyoo.Controllers
if (relation != null) if (relation != null)
{ {
if (relation.RelationID == null) if (relation.RelationID == null)
property.ShouldSerialize = x => member.GetValue(x) != null; property.ShouldSerialize = x => _depth == 0 && member.GetValue(x) != null;
else else
property.ShouldSerialize = x => property.ShouldSerialize = x =>
{ {
if (_depth != 0)
return false;
if (member.GetValue(x) != null) if (member.GetValue(x) != null)
return true; return true;
return x.GetType().GetProperty(relation.RelationID)?.GetValue(x) != null; return x.GetType().GetProperty(relation.RelationID)?.GetValue(x) != null;
@ -31,5 +36,13 @@ namespace Kyoo.Controllers
property.ShouldDeserialize = _ => false; property.ShouldDeserialize = _ => false;
return property; return property;
} }
protected override JsonContract CreateContract(Type objectType)
{
JsonContract contract = base.CreateContract(objectType);
contract.OnSerializingCallbacks.Add((_, _) => _depth++);
contract.OnSerializedCallbacks.Add((_, _) => _depth--);
return contract;
}
} }
} }

2
Kyoo/Controllers/Repositories/EpisodeRepository.cs
View File

@ -46,7 +46,7 @@ namespace Kyoo.Controllers
public override Task<Episode> Get(string slug) public override Task<Episode> Get(string slug)
{ {
Match match = Regex.Match(slug, @"(?<show>.*)-s(?<season>\d*)-e(?<episode>\d*)"); Match match = Regex.Match(slug, @"(?<show>.*)-s(?<season>\d*)e(?<episode>\d*)");
if (!match.Success) if (!match.Success)
return _database.Episodes.FirstOrDefaultAsync(x => x.Show.Slug == slug); return _database.Episodes.FirstOrDefaultAsync(x => x.Show.Slug == slug);