Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-06-01 04:34:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removing paths parameters from the metadataprovider

Browse Source
This commit is contained in:
Zoe Roux 2020-01-19 01:15:03 +01:00
parent 523c5a652e
commit c0ab6f898a
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kyoo.Common/Controllers/IMetadataProvider.cs
View File

@ -13,13 +13,13 @@ namespace Kyoo.Controllers
//For the show //For the show
Task<Show> GetShowByID(string id); Task<Show> GetShowByID(string id);
Task<Show> GetShowFromName(string showName, string showPath); Task<Show> GetShowFromName(string showName);
Task<IEnumerable<People>> GetPeople(string id); Task<IEnumerable<People>> GetPeople(string id);
//For the seasons //For the seasons
Task<Season> GetSeason(string showName, long seasonNumber); Task<Season> GetSeason(string showName, long seasonNumber);
//For the episodes //For the episodes
Task<Episode> GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, string episodePath); Task<Episode> GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber);
} }
} }

4
Kyoo.Common/Controllers/IProviderManager.cs
View File

@ -7,9 +7,9 @@ namespace Kyoo.Controllers
public interface IProviderManager public interface IProviderManager
{ {
Task<Collection> GetCollectionFromName(string name, Library library); Task<Collection> GetCollectionFromName(string name, Library library);
Task<Show> GetShowFromName(string showName, string showPath, Library library); Task<Show> GetShowFromName(string showName, Library library);
Task<Season> GetSeason(string showName, long seasonNumber, Library library); Task<Season> GetSeason(string showName, long seasonNumber, Library library);
Task<Episode> GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, string episodePath, Library library); Task<Episode> GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, Library library);
Task<IEnumerable<People>> GetPeople(string showExternalIDs, Library library); Task<IEnumerable<People>> GetPeople(string showExternalIDs, Library library);
} }
} }

6
Kyoo/Controllers/Crawler.cs
View File

@ -130,7 +130,8 @@ namespace Kyoo.Controllers
if (!libraryManager.IsShowRegistered(showPath, out long showID)) 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; showProviderIDs = show.ExternalIDs;
showID = libraryManager.RegisterShow(show); 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.ShowID = show.id;
episode.Path = episodePath;
if (seasonID == -1) if (seasonID == -1)
{ {

8
Kyoo/Controllers/ProviderManager.cs
View File

@ -58,9 +58,9 @@ namespace Kyoo.Controllers
return await GetMetadata(provider => provider.GetCollectionFromName(name), library, $"the collection {name}"); return await GetMetadata(provider => provider.GetCollectionFromName(name), library, $"the collection {name}");
} }
public async Task<Show> GetShowFromName(string showName, string showPath, Library library) public async Task<Show> 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); await thumbnailsManager.Validate(show);
return show; return show;
} }
@ -70,9 +70,9 @@ namespace Kyoo.Controllers
return await GetMetadata(provider => provider.GetSeason(showName, seasonNumber), library, $"the season ${seasonNumber} of {showName}"); return await GetMetadata(provider => provider.GetSeason(showName, seasonNumber), library, $"the season ${seasonNumber} of {showName}");
} }
public async Task<Episode> GetEpisode(string externalIDs, long seasonNumber, long episodeNumber, long absoluteNumber, string episodePath, Library library) public async Task<Episode> 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); await thumbnailsManager.Validate(episode);
return episode; return episode;
} }