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

Loading a relation set the inverse relation too but json serialization encounters infinite loops.

Browse Source
This commit is contained in:
Zoe Roux 2021-03-07 01:56:22 +01:00
parent 6bf6746320
commit 9a7b2cb4a1
3 changed files with 75 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
Kyoo.Common/Controllers/Implementations/LibraryManager.cs
View File

@ -261,6 +261,14 @@ namespace Kyoo.Controllers
return obj; return obj;
} }
private async Task SetRelation<T1, T2>(T1 obj, Task<ICollection<T2>> loader, Action<T1, ICollection<T2>> setter, Action<T2, T1> inverse)
{
ICollection<T2> loaded = await loader;
setter(obj, loaded);
foreach (T2 item in loaded)
inverse(item, obj);
}
public Task Load(IResource obj, string member) public Task Load(IResource obj, string member)
{ {
if (obj == null) if (obj == null)
@ -271,41 +279,56 @@ namespace Kyoo.Controllers
(Library l, nameof(Library.Providers)) => ProviderRepository (Library l, nameof(Library.Providers)) => ProviderRepository
.GetAll(x => x.Libraries.Any(y => y.ID == obj.ID)) .GetAll(x => x.Libraries.Any(y => y.ID == obj.ID))
.Then(x => l.Providers = x), .Then(x => l.Providers = x),
(Library l, nameof(Library.Shows)) => ShowRepository (Library l, nameof(Library.Shows)) => ShowRepository
.GetAll(x => x.Libraries.Any(y => y.ID == obj.ID)) .GetAll(x => x.Libraries.Any(y => y.ID == obj.ID))
.Then(x => l.Shows = x), .Then(x => l.Shows = x),
(Library l, nameof(Library.Collections)) => CollectionRepository (Library l, nameof(Library.Collections)) => CollectionRepository
.GetAll(x => x.Libraries.Any(y => y.ID == obj.ID)) .GetAll(x => x.Libraries.Any(y => y.ID == obj.ID))
.Then(x => l.Collections = x), .Then(x => l.Collections = x),
(Collection c, nameof(Library.Shows)) => ShowRepository (Collection c, nameof(Library.Shows)) => ShowRepository
.GetAll(x => x.Collections.Any(y => y.ID == obj.ID)) .GetAll(x => x.Collections.Any(y => y.ID == obj.ID))
.Then(x => c.Shows = x), .Then(x => c.Shows = x),
(Collection c, nameof(Collection.Libraries)) => LibraryRepository (Collection c, nameof(Collection.Libraries)) => LibraryRepository
.GetAll(x => x.Collections.Any(y => y.ID == obj.ID)) .GetAll(x => x.Collections.Any(y => y.ID == obj.ID))
.Then(x => c.Libraries = x), .Then(x => c.Libraries = x),
(Show s, nameof(Show.ExternalIDs)) => ProviderRepository
.GetMetadataID(x => x.ShowID == obj.ID) (Show s, nameof(Show.ExternalIDs)) => SetRelation(s,
.Then(x => s.ExternalIDs = x), ProviderRepository.GetMetadataID(x => x.ShowID == obj.ID),
(x, y) => x.ExternalIDs = y,
(x, y) => x.Show = y),
(Show s, nameof(Show.Genres)) => GenreRepository (Show s, nameof(Show.Genres)) => GenreRepository
.GetAll(x => x.Shows.Any(y => y.ID == obj.ID)) .GetAll(x => x.Shows.Any(y => y.ID == obj.ID))
.Then(x => s.Genres = x), .Then(x => s.Genres = x),
(Show s, nameof(Show.People)) => PeopleRepository (Show s, nameof(Show.People)) => PeopleRepository
.GetFromShow(obj.ID) .GetFromShow(obj.ID)
.Then(x => s.People = x), .Then(x => s.People = x),
(Show s, nameof(Show.Seasons)) => SeasonRepository
.GetAll(x => x.Show.ID == obj.ID) (Show s, nameof(Show.Seasons)) => SetRelation(s,
.Then(x => s.Seasons = x), SeasonRepository.GetAll(x => x.Show.ID == obj.ID),
(Show s, nameof(Show.Episodes)) => EpisodeRepository (x, y) => x.Seasons = y,
.GetAll(x => x.Show.ID == obj.ID) (x, y) => { x.Show = y; x.ShowID = y.ID; }),
.Then(x => s.Episodes = x),
(Show s, nameof(Show.Episodes)) => SetRelation(s,
EpisodeRepository.GetAll(x => x.Show.ID == obj.ID),
(x, y) => x.Episodes = y,
(x, y) => { x.Show = y; x.ShowID = y.ID; }),
(Show s, nameof(Show.Libraries)) => LibraryRepository (Show s, nameof(Show.Libraries)) => LibraryRepository
.GetAll(x => x.Shows.Any(y => y.ID == obj.ID)) .GetAll(x => x.Shows.Any(y => y.ID == obj.ID))
.Then(x => s.Libraries = x), .Then(x => s.Libraries = x),
(Show s, nameof(Show.Collections)) => CollectionRepository (Show s, nameof(Show.Collections)) => CollectionRepository
.GetAll(x => x.Shows.Any(y => y.ID == obj.ID)) .GetAll(x => x.Shows.Any(y => y.ID == obj.ID))
.Then(x => s.Collections = x), .Then(x => s.Collections = x),
(Show s, nameof(Show.Studio)) => StudioRepository (Show s, nameof(Show.Studio)) => StudioRepository
.Get(x => x.Shows.Any(y => y.ID == obj.ID)) .Get(x => x.Shows.Any(y => y.ID == obj.ID))
.Then(x => .Then(x =>
@ -314,12 +337,17 @@ namespace Kyoo.Controllers
s.StudioID = x?.ID ?? 0; s.StudioID = x?.ID ?? 0;
}), }),
(Season s, nameof(Season.ExternalIDs)) => ProviderRepository
.GetMetadataID(x => x.SeasonID == obj.ID) (Season s, nameof(Season.ExternalIDs)) => SetRelation(s,
.Then(x => s.ExternalIDs = x), ProviderRepository.GetMetadataID(x => x.SeasonID == obj.ID),
(Season s, nameof(Season.Episodes)) => EpisodeRepository (x, y) => x.ExternalIDs = y,
.GetAll(x => x.Season.ID == obj.ID) (x, y) => { x.Season = y; x.SeasonID = y.ID; }),
.Then(x => s.Episodes = x),
(Season s, nameof(Season.Episodes)) => SetRelation(s,
EpisodeRepository.GetAll(x => x.Season.ID == obj.ID),
(x, y) => x.Episodes = y,
(x, y) => { x.Season = y; x.SeasonID = y.ID; }),
(Season s, nameof(Season.Show)) => ShowRepository (Season s, nameof(Season.Show)) => ShowRepository
.Get(x => x.Seasons.Any(y => y.ID == obj.ID)) .Get(x => x.Seasons.Any(y => y.ID == obj.ID))
.Then(x => .Then(x =>
@ -328,12 +356,17 @@ namespace Kyoo.Controllers
s.ShowID = x?.ID ?? 0; s.ShowID = x?.ID ?? 0;
}), }),
(Episode e, nameof(Episode.ExternalIDs)) => ProviderRepository
.GetMetadataID(x => x.EpisodeID == obj.ID) (Episode e, nameof(Episode.ExternalIDs)) => SetRelation(e,
.Then(x => e.ExternalIDs = x), ProviderRepository.GetMetadataID(x => x.EpisodeID == obj.ID),
(Episode e, nameof(Episode.Tracks)) => TrackRepository (x, y) => x.ExternalIDs = y,
.GetAll(x => x.Episode.ID == obj.ID) (x, y) => { x.Episode = y; x.EpisodeID = y.ID; }),
.Then(x => e.Tracks = x),
(Episode e, nameof(Episode.Tracks)) => SetRelation(e,
TrackRepository.GetAll(x => x.Episode.ID == obj.ID),
(x, y) => x.Tracks = y,
(x, y) => { x.Episode = y; x.EpisodeID = y.ID; }),
(Episode e, nameof(Episode.Show)) => ShowRepository (Episode e, nameof(Episode.Show)) => ShowRepository
.Get(x => x.Episodes.Any(y => y.ID == obj.ID)) .Get(x => x.Episodes.Any(y => y.ID == obj.ID))
.Then(x => .Then(x =>
@ -341,6 +374,7 @@ namespace Kyoo.Controllers
e.Show = x; e.Show = x;
e.ShowID = x?.ID ?? 0; e.ShowID = x?.ID ?? 0;
}), }),
(Episode e, nameof(Episode.Season)) => SeasonRepository (Episode e, nameof(Episode.Season)) => SeasonRepository
.Get(x => x.Episodes.Any(y => y.ID == e.ID)) .Get(x => x.Episodes.Any(y => y.ID == e.ID))
.Then(x => .Then(x =>
@ -349,6 +383,7 @@ namespace Kyoo.Controllers
e.SeasonID = x?.ID ?? 0; e.SeasonID = x?.ID ?? 0;
}), }),
(Track t, nameof(Track.Episode)) => EpisodeRepository (Track t, nameof(Track.Episode)) => EpisodeRepository
.Get(x => x.Tracks.Any(y => y.ID == obj.ID)) .Get(x => x.Tracks.Any(y => y.ID == obj.ID))
.Then(x => .Then(x =>
@ -357,25 +392,32 @@ namespace Kyoo.Controllers
t.EpisodeID = x?.ID ?? 0; t.EpisodeID = x?.ID ?? 0;
}), }),
(Genre g, nameof(Genre.Shows)) => ShowRepository (Genre g, nameof(Genre.Shows)) => ShowRepository
.GetAll(x => x.Genres.Any(y => y.ID == obj.ID)) .GetAll(x => x.Genres.Any(y => y.ID == obj.ID))
.Then(x => g.Shows = x), .Then(x => g.Shows = x),
(Studio s, nameof(Studio.Shows)) => ShowRepository (Studio s, nameof(Studio.Shows)) => ShowRepository
.GetAll(x => x.Studio.ID == obj.ID) .GetAll(x => x.Studio.ID == obj.ID)
.Then(x => s.Shows = x), .Then(x => s.Shows = x),
(People p, nameof(People.ExternalIDs)) => ProviderRepository
.GetMetadataID(x => x.PeopleID == obj.ID) (People p, nameof(People.ExternalIDs)) => SetRelation(p,
.Then(x => p.ExternalIDs = x), ProviderRepository.GetMetadataID(x => x.PeopleID == obj.ID),
(x, y) => x.ExternalIDs = y,
(x, y) => { x.People = y; x.PeopleID = y.ID; }),
(People p, nameof(People.Roles)) => PeopleRepository (People p, nameof(People.Roles)) => PeopleRepository
.GetFromPeople(obj.ID) .GetFromPeople(obj.ID)
.Then(x => p.Roles = x), .Then(x => p.Roles = x),
(ProviderID p, nameof(ProviderID.Libraries)) => LibraryRepository (ProviderID p, nameof(ProviderID.Libraries)) => LibraryRepository
.GetAll(x => x.Providers.Any(y => y.ID == obj.ID)) .GetAll(x => x.Providers.Any(y => y.ID == obj.ID))
.Then(x => p.Libraries = x), .Then(x => p.Libraries = x),
_ => throw new ArgumentException($"Couldn't find a way to load {member} of {obj.Slug}.") _ => throw new ArgumentException($"Couldn't find a way to load {member} of {obj.Slug}.")
}; };
} }

13
Kyoo.Common/Models/WatchItem.cs
View File

@ -89,7 +89,7 @@ namespace Kyoo.Models
public static async Task<WatchItem> FromEpisode(Episode ep, ILibraryManager library) public static async Task<WatchItem> FromEpisode(Episode ep, ILibraryManager library)
{ {
Show show = await library.GetShow(ep.ShowID); // TODO load only the title, the slug & the IsMovie with the library manager. Show show = await library.GetShow(ep.ShowID);
Episode previous = null; Episode previous = null;
Episode next = null; Episode next = null;
@ -110,6 +110,7 @@ namespace Kyoo.Models
next = await library.GetEpisode(ep.ShowID, ep.SeasonNumber, ep.EpisodeNumber + 1); next = await library.GetEpisode(ep.ShowID, ep.SeasonNumber, ep.EpisodeNumber + 1);
} }
await library.Load(ep, x => x.Tracks);
return new WatchItem(ep.ID, return new WatchItem(ep.ID,
show.Title, show.Title,
show.Slug, show.Slug,
@ -118,9 +119,9 @@ namespace Kyoo.Models
ep.Title, ep.Title,
ep.ReleaseDate, ep.ReleaseDate,
ep.Path, ep.Path,
await library.GetTrack(x => x.EpisodeID == ep.ID && x.Type == StreamType.Video), ep.Tracks.FirstOrDefault(x => x.Type == StreamType.Video),
await library.GetTracks(x => x.EpisodeID == ep.ID && x.Type == StreamType.Audio), ep.Tracks.Where(x => x.Type == StreamType.Audio),
await library.GetTracks(x => x.EpisodeID == ep.ID && x.Type == StreamType.Subtitle)) ep.Tracks.Where(x => x.Type == StreamType.Subtitle))
{ {
IsMovie = show.IsMovie, IsMovie = show.IsMovie,
PreviousEpisode = previous, PreviousEpisode = previous,
@ -137,7 +138,7 @@ namespace Kyoo.Models
PathIO.GetFileNameWithoutExtension(episodePath) + ".txt" PathIO.GetFileNameWithoutExtension(episodePath) + ".txt"
); );
if (!File.Exists(path)) if (!File.Exists(path))
return new Chapter[0]; return Array.Empty<Chapter>();
try try
{ {
return (await File.ReadAllLinesAsync(path)) return (await File.ReadAllLinesAsync(path))
@ -151,7 +152,7 @@ namespace Kyoo.Models
catch catch
{ {
await Console.Error.WriteLineAsync($"Invalid chapter file at {path}"); await Console.Error.WriteLineAsync($"Invalid chapter file at {path}");
return new Chapter[0]; return Array.Empty<Chapter>();
} }
} }
} }

2
Kyoo/Views/WebClient

@ -1 +1 @@
Subproject commit 09edd091b9bc75b697da4dc16eeaf9aadb9d4b05 Subproject commit 35e6a601edc494d1bea142fd419c7750c18d21d9