diff --git a/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs b/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs index c5ab7104..3fe71a89 100644 --- a/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/CollectionConvertors.cs @@ -17,7 +17,7 @@ namespace Kyoo.TheMovieDb /// The converted collection as a . 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 /// The converted collection as a . public static Collection ToCollection(this SearchCollection collection, Provider provider) { - return new() + return new Collection { Slug = Utility.ToSlug(collection.Name), Name = collection.Name, diff --git a/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs b/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs index d1dd499b..75129af3 100644 --- a/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/EpisodeConvertors.cs @@ -18,7 +18,7 @@ namespace Kyoo.TheMovieDb /// The converted episode as a . public static Episode ToEpisode(this TvEpisode episode, int showID, Provider provider) { - return new() + return new Episode { SeasonNumber = episode.SeasonNumber, EpisodeNumber = episode.EpisodeNumber, diff --git a/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs b/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs index 6a0cf9ba..450f6934 100644 --- a/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/MovieConvertors.cs @@ -19,7 +19,7 @@ namespace Kyoo.TheMovieDb /// The converted movie as a . 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 /// The converted movie as a . public static Show ToShow(this SearchMovie movie, Provider provider) { - return new() + return new Show { Slug = Utility.ToSlug(movie.Title), Title = movie.Title, diff --git a/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs b/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs index b3d47410..861f21e0 100644 --- a/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/PeopleConvertors.cs @@ -22,7 +22,7 @@ namespace Kyoo.TheMovieDb /// A representing the movie cast. public static PeopleRole ToPeople(this MovieCast cast, Provider provider) { - return new() + return new PeopleRole { People = new People { @@ -57,7 +57,7 @@ namespace Kyoo.TheMovieDb /// A representing the movie cast. public static PeopleRole ToPeople(this TvCast cast, Provider provider) { - return new() + return new PeopleRole { People = new People { @@ -92,7 +92,7 @@ namespace Kyoo.TheMovieDb /// A representing the movie crew. public static PeopleRole ToPeople(this Crew crew, Provider provider) { - return new() + return new PeopleRole { People = new People { @@ -127,7 +127,7 @@ namespace Kyoo.TheMovieDb /// A representing the person. 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 /// A representing the person. public static People ToPeople(this SearchPerson person, Provider provider) { - return new() + return new People { Slug = Utility.ToSlug(person.Name), Name = person.Name, diff --git a/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs b/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs index 1dcc88a6..a1aa4e51 100644 --- a/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/SeasonConvertors.cs @@ -18,7 +18,7 @@ namespace Kyoo.TheMovieDb /// The converted season as a . public static Season ToSeason(this TvSeason season, int showID, Provider provider) { - return new() + return new Season { SeasonNumber = season.SeasonNumber, Title = season.Name, diff --git a/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs b/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs index 7d1b69a0..342af8e0 100644 --- a/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs @@ -19,7 +19,7 @@ namespace Kyoo.TheMovieDb /// A converted as a . 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 /// A converted as a . public static Show ToShow(this SearchTv tv, Provider provider) { - return new() + return new Show { Slug = Utility.ToSlug(tv.Name), Title = tv.Name, diff --git a/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs b/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs index c8947981..9839d784 100644 --- a/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/StudioConvertors.cs @@ -17,7 +17,7 @@ namespace Kyoo.TheMovieDb /// The converted company as a . 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 /// The converted company as a . public static Studio ToStudio(this SearchCompany company, Provider provider) { - return new() + return new Studio { Slug = Utility.ToSlug(company.Name), Name = company.Name, diff --git a/Kyoo.TheTvdb/Convertors.cs b/Kyoo.TheTvdb/Convertors.cs index 2e1f39cc..185bf0d1 100644 --- a/Kyoo.TheTvdb/Convertors.cs +++ b/Kyoo.TheTvdb/Convertors.cs @@ -48,7 +48,7 @@ namespace Kyoo.TheTvdb /// A show representing the given search result. 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 { - [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 /// A show representing the given series. 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 { - [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 . /// /// The actor to convert - /// The provider representing the tvdb inside kyoo /// A people role representing the given actor in the role they played. - 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 { - [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 /// A episode representing the given tvdb episode. 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 { - [Images.Thumbnail] = episode.Filename != null + [Images.Thumbnail] = string.IsNullOrEmpty(episode.Filename) ? $"https://www.thetvdb.com/banners/{episode.Filename}" : null }, diff --git a/Kyoo.TheTvdb/ProviderTvdb.cs b/Kyoo.TheTvdb/ProviderTvdb.cs index e947ce25..01411d1d 100644 --- a/Kyoo.TheTvdb/ProviderTvdb.cs +++ b/Kyoo.TheTvdb/ProviderTvdb.cs @@ -95,7 +95,7 @@ namespace Kyoo.TheTvdb Show ret = series.Data.ToShow(Provider); TvDbResponse 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; } diff --git a/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs b/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs index 58ce0a8c..a761ab9e 100644 --- a/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs +++ b/tests/Kyoo.Tests/Identifier/Tvdb/ConvertorTests.cs @@ -124,8 +124,7 @@ namespace Kyoo.Tests.Identifier.Tvdb Name = "Name", Role = "role" }; - Provider provider = TestSample.Get(); - PeopleRole people = actor.ToPeopleRole(provider); + PeopleRole people = actor.ToPeopleRole(); Assert.Equal("name", people.Slug); Assert.Equal("Name", people.People.Name);