diff --git a/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs b/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs index 342af8e0..946a8aea 100644 --- a/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs +++ b/Kyoo.TheMovieDb/Convertors/ShowConvertors.cs @@ -53,7 +53,7 @@ namespace Kyoo.TheMovieDb new MetadataID { Provider = provider, - Link = $"https://www.themoviedb.org/movie/{tv.Id}", + Link = $"https://www.themoviedb.org/tv/{tv.Id}", DataID = tv.Id.ToString() } } @@ -88,7 +88,7 @@ namespace Kyoo.TheMovieDb new MetadataID { Provider = provider, - Link = $"https://www.themoviedb.org/movie/{tv.Id}", + Link = $"https://www.themoviedb.org/tv/{tv.Id}", DataID = tv.Id.ToString() } } diff --git a/Kyoo.TheTvdb/Convertors.cs b/Kyoo.TheTvdb/Convertors.cs index 185bf0d1..69ee4c26 100644 --- a/Kyoo.TheTvdb/Convertors.cs +++ b/Kyoo.TheTvdb/Convertors.cs @@ -58,7 +58,7 @@ namespace Kyoo.TheTvdb StartAir = _ParseDate(result.FirstAired), Images = new Dictionary { - [Images.Poster] = string.IsNullOrEmpty(result.Poster) + [Images.Poster] = !string.IsNullOrEmpty(result.Poster) ? $"https://www.thetvdb.com{result.Poster}" : null, }, @@ -92,10 +92,10 @@ namespace Kyoo.TheTvdb StartAir = _ParseDate(series.FirstAired), Images = new Dictionary { - [Images.Poster] = string.IsNullOrEmpty(series.Poster) + [Images.Poster] = !string.IsNullOrEmpty(series.Poster) ? $"https://www.thetvdb.com/banners/{series.Poster}" : null, - [Images.Thumbnail] = string.IsNullOrEmpty(series.FanArt) + [Images.Thumbnail] = !string.IsNullOrEmpty(series.FanArt) ? $"https://www.thetvdb.com/banners/{series.FanArt}" : null }, @@ -127,7 +127,7 @@ namespace Kyoo.TheTvdb Name = actor.Name, Images = new Dictionary { - [Images.Poster] = string.IsNullOrEmpty(actor.Image) + [Images.Poster] = !string.IsNullOrEmpty(actor.Image) ? $"https://www.thetvdb.com/banners/{actor.Image}" : null } @@ -154,7 +154,7 @@ namespace Kyoo.TheTvdb Overview = episode.Overview, Images = new Dictionary { - [Images.Thumbnail] = string.IsNullOrEmpty(episode.Filename) + [Images.Thumbnail] = !string.IsNullOrEmpty(episode.Filename) ? $"https://www.thetvdb.com/banners/{episode.Filename}" : null }, diff --git a/Kyoo/CoreModule.cs b/Kyoo/CoreModule.cs index 2f5c7cfb..51f4f94c 100644 --- a/Kyoo/CoreModule.cs +++ b/Kyoo/CoreModule.cs @@ -101,13 +101,13 @@ namespace Kyoo /// public void Configure(ContainerBuilder builder) { - builder.RegisterComposite(); + builder.RegisterComposite().InstancePerLifetimeScope(); builder.RegisterType().As().SingleInstance(); builder.RegisterType().As().SingleInstance(); builder.RegisterType().As().SingleInstance(); builder.RegisterType().As().SingleInstance(); - builder.RegisterType().As().SingleInstance(); + builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().SingleInstance(); builder.RegisterType().As().InstancePerLifetimeScope(); builder.RegisterType().As().SingleInstance(); diff --git a/Kyoo/Tasks/RegisterEpisode.cs b/Kyoo/Tasks/RegisterEpisode.cs index f939b5f5..c7c7c3e3 100644 --- a/Kyoo/Tasks/RegisterEpisode.cs +++ b/Kyoo/Tasks/RegisterEpisode.cs @@ -121,8 +121,6 @@ namespace Kyoo.Tasks if (season != null) season.Show = show; season = await _RegisterAndFill(season); - if (season != null) - season.Title ??= $"Season {season.SeasonNumber}"; progress.Report(60); episode.Show = show; @@ -175,10 +173,15 @@ namespace Kyoo.Tasks item = await _metadataProvider.Get(item); await _thumbnailsManager.DownloadImages(item); - if (item is Show show && show.People != null) + switch (item) { - foreach (PeopleRole role in show.People) - await _thumbnailsManager.DownloadImages(role.People); + case Show show when show.People != null: + foreach (PeopleRole role in show.People) + await _thumbnailsManager.DownloadImages(role.People); + break; + case Season season: + season.Title ??= $"Season {season.SeasonNumber}"; + break; } return await _libraryManager.CreateIfNotExists(item);