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

TVDB: Fixing people images

Browse Source
This commit is contained in:
Zoe Roux 2021-08-05 23:35:10 +02:00
parent 6632ac5f1b
commit daa8d1f04a
10 changed files with 27 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs
View File

@ -17,7 +17,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted collection as a <see cref="Collection"/>.</returns>
public static Collection ToCollection(this TMDbLib.Objects.Collections.Collection collection, Provider provider)
{
return new()
return new Collection
{
Slug = Utility.ToSlug(collection.Name),
Name = collection.Name,
@ -51,7 +51,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted collection as a <see cref="Collection"/>.</returns>
public static Collection ToCollection(this SearchCollection collection, Provider provider)
{
return new()
return new Collection
{
Slug = Utility.ToSlug(collection.Name),
Name = collection.Name,

2
Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs
View File

@ -18,7 +18,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted episode as a <see cref="Episode"/>.</returns>
public static Episode ToEpisode(this TvEpisode episode, int showID, Provider provider)
{
return new()
return new Episode
{
SeasonNumber = episode.SeasonNumber,
EpisodeNumber = episode.EpisodeNumber,

4
Kyoo.TheMovieDb/Convertors/MovieConvertors.cs
View File

@ -19,7 +19,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted movie as a <see cref="Show"/>.</returns>
public static Show ToShow(this Movie movie, Provider provider)
{
return new()
return new Show
{
Slug = Utility.ToSlug(movie.Title),
Title = movie.Title,
@ -69,7 +69,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted movie as a <see cref="Show"/>.</returns>
public static Show ToShow(this SearchMovie movie, Provider provider)
{
return new()
return new Show
{
Slug = Utility.ToSlug(movie.Title),
Title = movie.Title,

10
Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs
View File

@ -22,7 +22,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A <see cref="PeopleRole"/> representing the movie cast.</returns>
public static PeopleRole ToPeople(this MovieCast cast, Provider provider)
{
return new()
return new PeopleRole
{
People = new People
{
@ -57,7 +57,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A <see cref="PeopleRole"/> representing the movie cast.</returns>
public static PeopleRole ToPeople(this TvCast cast, Provider provider)
{
return new()
return new PeopleRole
{
People = new People
{
@ -92,7 +92,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A <see cref="PeopleRole"/> representing the movie crew.</returns>
public static PeopleRole ToPeople(this Crew crew, Provider provider)
{
return new()
return new PeopleRole
{
People = new People
{
@ -127,7 +127,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A <see cref="People"/> representing the person.</returns>
public static People ToPeople(this Person person, Provider provider)
{
return new()
return new People
{
Slug = Utility.ToSlug(person.Name),
Name = person.Name,
@ -157,7 +157,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A <see cref="People"/> representing the person.</returns>
public static People ToPeople(this SearchPerson person, Provider provider)
{
return new()
return new People
{
Slug = Utility.ToSlug(person.Name),
Name = person.Name,

2
Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs
View File

@ -18,7 +18,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted season as a <see cref="Season"/>.</returns>
public static Season ToSeason(this TvSeason season, int showID, Provider provider)
{
return new()
return new Season
{
SeasonNumber = season.SeasonNumber,
Title = season.Name,

4
Kyoo.TheMovieDb/Convertors/ShowConvertors.cs
View File

@ -19,7 +19,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A converted <see cref="TvShow"/> as a <see cref="Show"/>.</returns>
public static Show ToShow(this TvShow tv, Provider provider)
{
return new()
return new Show
{
Slug = Utility.ToSlug(tv.Name),
Title = tv.Name,
@ -68,7 +68,7 @@ namespace Kyoo.TheMovieDb
/// <returns>A converted <see cref="SearchTv"/> as a <see cref="Show"/>.</returns>
public static Show ToShow(this SearchTv tv, Provider provider)
{
return new()
return new Show
{
Slug = Utility.ToSlug(tv.Name),
Title = tv.Name,

4
Kyoo.TheMovieDb/Convertors/StudioConvertors.cs
View File

@ -17,7 +17,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted company as a <see cref="Studio"/>.</returns>
public static Studio ToStudio(this Company company, Provider provider)
{
return new()
return new Studio
{
Slug = Utility.ToSlug(company.Name),
Name = company.Name,
@ -41,7 +41,7 @@ namespace Kyoo.TheMovieDb
/// <returns>The converted company as a <see cref="Studio"/>.</returns>
public static Studio ToStudio(this SearchCompany company, Provider provider)
{
return new()
return new Studio
{
Slug = Utility.ToSlug(company.Name),
Name = company.Name,

30
Kyoo.TheTvdb/Convertors.cs
View File

@ -48,7 +48,7 @@ namespace Kyoo.TheTvdb
/// <returns>A show representing the given search result.</returns>
public static Show ToShow(this SeriesSearchResult result, Provider provider)
{
return new()
return new Show
{
Slug = result.Slug,
Title = result.SeriesName,
@ -58,7 +58,7 @@ namespace Kyoo.TheTvdb
StartAir = _ParseDate(result.FirstAired),
Images = new Dictionary<int, string>
{
[Images.Poster] = result.Poster != null
[Images.Poster] = string.IsNullOrEmpty(result.Poster)
? $"https://www.thetvdb.com{result.Poster}"
: null,
},
@ -82,7 +82,7 @@ namespace Kyoo.TheTvdb
/// <returns>A show representing the given series.</returns>
public static Show ToShow(this Series series, Provider provider)
{
return new()
return new Show
{
Slug = series.Slug,
Title = series.SeriesName,
@ -92,10 +92,10 @@ namespace Kyoo.TheTvdb
StartAir = _ParseDate(series.FirstAired),
Images = new Dictionary<int, string>
{
[Images.Poster] = series.Poster != null
[Images.Poster] = string.IsNullOrEmpty(series.Poster)
? $"https://www.thetvdb.com/banners/{series.Poster}"
: null,
[Images.Thumbnail] = series.FanArt != null
[Images.Thumbnail] = string.IsNullOrEmpty(series.FanArt)
? $"https://www.thetvdb.com/banners/{series.FanArt}"
: null
},
@ -116,11 +116,10 @@ namespace Kyoo.TheTvdb
/// Convert a tvdb actor to a kyoo <see cref="PeopleRole"/>.
/// </summary>
/// <param name="actor">The actor to convert</param>
/// <param name="provider">The provider representing the tvdb inside kyoo</param>
/// <returns>A people role representing the given actor in the role they played.</returns>
public static PeopleRole ToPeopleRole(this Actor actor, Provider provider)
public static PeopleRole ToPeopleRole(this Actor actor)
{
return new()
return new PeopleRole
{
People = new People
{
@ -128,18 +127,9 @@ namespace Kyoo.TheTvdb
Name = actor.Name,
Images = new Dictionary<int, string>
{
[Images.Poster] = actor.Image != null
[Images.Poster] = string.IsNullOrEmpty(actor.Image)
? $"https://www.thetvdb.com/banners/{actor.Image}"
: null
},
ExternalIDs = new []
{
new MetadataID
{
DataID = actor.Id.ToString(),
Link = $"https://www.thetvdb.com/people/{actor.Id}",
Provider = provider
}
}
},
Role = actor.Role,
@ -155,7 +145,7 @@ namespace Kyoo.TheTvdb
/// <returns>A episode representing the given tvdb episode.</returns>
public static Episode ToEpisode(this EpisodeRecord episode, Provider provider)
{
return new()
return new Episode
{
SeasonNumber = episode.AiredSeason,
EpisodeNumber = episode.AiredEpisodeNumber,
@ -164,7 +154,7 @@ namespace Kyoo.TheTvdb
Overview = episode.Overview,
Images = new Dictionary<int, string>
{
[Images.Thumbnail] = episode.Filename != null
[Images.Thumbnail] = string.IsNullOrEmpty(episode.Filename)
? $"https://www.thetvdb.com/banners/{episode.Filename}"
: null
},

2
Kyoo.TheTvdb/ProviderTvdb.cs
View File

@ -95,7 +95,7 @@ namespace Kyoo.TheTvdb
Show ret = series.Data.ToShow(Provider);
TvDbResponse<Actor[]> people = await _client.Series.GetActorsAsync(id);
ret.People = people.Data.Select(x => x.ToPeopleRole(Provider)).ToArray();
ret.People = people.Data.Select(x => x.ToPeopleRole()).ToArray();
return ret;
}

3
tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs
View File

@ -124,8 +124,7 @@ namespace Kyoo.Tests.Identifier.Tvdb
Name = "Name",
Role = "role"
};
Provider provider = TestSample.Get<Provider>();
PeopleRole people = actor.ToPeopleRole(provider);
PeopleRole people = actor.ToPeopleRole();
Assert.Equal("name", people.Slug);
Assert.Equal("Name", people.People.Name);