diff --git a/Kyoo.Common/Controllers/IMetadataProvider.cs b/Kyoo.Common/Controllers/IMetadataProvider.cs index 878129bb..9c144254 100644 --- a/Kyoo.Common/Controllers/IMetadataProvider.cs +++ b/Kyoo.Common/Controllers/IMetadataProvider.cs @@ -13,13 +13,13 @@ namespace Kyoo.Controllers //For the show Task GetShowByID(string id); - Task GetShowFromName(string showName, string showPath); + Task GetShowFromName(string showName); Task> GetPeople(string id); //For the seasons Task GetSeason(string showName, long seasonNumber); //For the episodes - Task GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, string episodePath); + Task GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber); } } diff --git a/Kyoo.Common/Controllers/IProviderManager.cs b/Kyoo.Common/Controllers/IProviderManager.cs index 3f775013..bbb02a60 100644 --- a/Kyoo.Common/Controllers/IProviderManager.cs +++ b/Kyoo.Common/Controllers/IProviderManager.cs @@ -7,9 +7,9 @@ namespace Kyoo.Controllers public interface IProviderManager { Task GetCollectionFromName(string name, Library library); - Task GetShowFromName(string showName, string showPath, Library library); + Task GetShowFromName(string showName, Library library); Task GetSeason(string showName, long seasonNumber, Library library); - Task GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, string episodePath, Library library); + Task GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, Library library); Task> GetPeople(string showExternalIDs, Library library); } } \ No newline at end of file diff --git a/Kyoo/Controllers/Crawler.cs b/Kyoo/Controllers/Crawler.cs index a2591c45..80e25dac 100644 --- a/Kyoo/Controllers/Crawler.cs +++ b/Kyoo/Controllers/Crawler.cs @@ -130,7 +130,8 @@ namespace Kyoo.Controllers if (!libraryManager.IsShowRegistered(showPath, out long showID)) { - Show show = await metadataProvider.GetShowFromName(showTitle, showPath, library); + Show show = await metadataProvider.GetShowFromName(showTitle, library); + show.Path = showPath; showProviderIDs = show.ExternalIDs; showID = libraryManager.RegisterShow(show); @@ -170,8 +171,9 @@ namespace Kyoo.Controllers } } - Episode episode = await metadataProvider.GetEpisode(show.ExternalIDs, seasonNumber, episodeNumber, absoluteNumber, episodePath, library); + Episode episode = await metadataProvider.GetEpisode(show.ExternalIDs, seasonNumber, episodeNumber, absoluteNumber, library); episode.ShowID = show.id; + episode.Path = episodePath; if (seasonID == -1) { diff --git a/Kyoo/Controllers/ProviderManager.cs b/Kyoo/Controllers/ProviderManager.cs index 7a1635d8..f1b2b542 100644 --- a/Kyoo/Controllers/ProviderManager.cs +++ b/Kyoo/Controllers/ProviderManager.cs @@ -58,9 +58,9 @@ namespace Kyoo.Controllers return await GetMetadata(provider => provider.GetCollectionFromName(name), library, $"the collection {name}"); } - public async Task GetShowFromName(string showName, string showPath, Library library) + public async Task GetShowFromName(string showName, Library library) { - Show show = await GetMetadata(provider => provider.GetShowFromName(showName, showPath), library, $"the show {showName}"); + Show show = await GetMetadata(provider => provider.GetShowFromName(showName), library, $"the show {showName}"); await thumbnailsManager.Validate(show); return show; } @@ -70,9 +70,9 @@ namespace Kyoo.Controllers return await GetMetadata(provider => provider.GetSeason(showName, seasonNumber), library, $"the season ${seasonNumber} of {showName}"); } - public async Task GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, string episodePath, Library library) + public async Task GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, Library library) { - Episode episode = await GetMetadata(provider => provider.GetEpisode(externalIDs, seasonNumber, episodeNumber, absoluteNumber, episodePath), library, $"the episode at {episodePath}"); + Episode episode = await GetMetadata(provider => provider.GetEpisode(externalIDs, seasonNumber, episodeNumber, absoluteNumber), library, $"an episode"); await thumbnailsManager.Validate(episode); return episode; }