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

Small bugs fixs

Browse Source
This commit is contained in:
Zoe Roux 2021-08-06 00:24:23 +02:00
parent daa8d1f04a
commit 14f4065921
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ namespace Kyoo.TheMovieDb
new MetadataID new MetadataID
{ {
Provider = provider, Provider = provider,
Link = $"https://www.themoviedb.org/movie/{tv.Id}", Link = $"https://www.themoviedb.org/tv/{tv.Id}",
DataID = tv.Id.ToString() DataID = tv.Id.ToString()
} }
} }
@ -88,7 +88,7 @@ namespace Kyoo.TheMovieDb
new MetadataID new MetadataID
{ {
Provider = provider, Provider = provider,
Link = $"https://www.themoviedb.org/movie/{tv.Id}", Link = $"https://www.themoviedb.org/tv/{tv.Id}",
DataID = tv.Id.ToString() DataID = tv.Id.ToString()
} }
} }

10
Kyoo.TheTvdb/Convertors.cs
View File

@ -58,7 +58,7 @@ namespace Kyoo.TheTvdb
StartAir = _ParseDate(result.FirstAired), StartAir = _ParseDate(result.FirstAired),
Images = new Dictionary<int, string> Images = new Dictionary<int, string>
{ {
[Images.Poster] = string.IsNullOrEmpty(result.Poster) [Images.Poster] = !string.IsNullOrEmpty(result.Poster)
? $"https://www.thetvdb.com{result.Poster}" ? $"https://www.thetvdb.com{result.Poster}"
: null, : null,
}, },
@ -92,10 +92,10 @@ namespace Kyoo.TheTvdb
StartAir = _ParseDate(series.FirstAired), StartAir = _ParseDate(series.FirstAired),
Images = new Dictionary<int, string> Images = new Dictionary<int, string>
{ {
[Images.Poster] = string.IsNullOrEmpty(series.Poster) [Images.Poster] = !string.IsNullOrEmpty(series.Poster)
? $"https://www.thetvdb.com/banners/{series.Poster}" ? $"https://www.thetvdb.com/banners/{series.Poster}"
: null, : null,
[Images.Thumbnail] = string.IsNullOrEmpty(series.FanArt) [Images.Thumbnail] = !string.IsNullOrEmpty(series.FanArt)
? $"https://www.thetvdb.com/banners/{series.FanArt}" ? $"https://www.thetvdb.com/banners/{series.FanArt}"
: null : null
}, },
@ -127,7 +127,7 @@ namespace Kyoo.TheTvdb
Name = actor.Name, Name = actor.Name,
Images = new Dictionary<int, string> Images = new Dictionary<int, string>
{ {
[Images.Poster] = string.IsNullOrEmpty(actor.Image) [Images.Poster] = !string.IsNullOrEmpty(actor.Image)
? $"https://www.thetvdb.com/banners/{actor.Image}" ? $"https://www.thetvdb.com/banners/{actor.Image}"
: null : null
} }
@ -154,7 +154,7 @@ namespace Kyoo.TheTvdb
Overview = episode.Overview, Overview = episode.Overview,
Images = new Dictionary<int, string> Images = new Dictionary<int, string>
{ {
[Images.Thumbnail] = string.IsNullOrEmpty(episode.Filename) [Images.Thumbnail] = !string.IsNullOrEmpty(episode.Filename)
? $"https://www.thetvdb.com/banners/{episode.Filename}" ? $"https://www.thetvdb.com/banners/{episode.Filename}"
: null : null
}, },

4
Kyoo/CoreModule.cs
View File

@ -101,13 +101,13 @@ namespace Kyoo
/// <inheritdoc /> /// <inheritdoc />
public void Configure(ContainerBuilder builder) public void Configure(ContainerBuilder builder)
{ {
builder.RegisterComposite<FileSystemComposite, IFileSystem>(); builder.RegisterComposite<FileSystemComposite, IFileSystem>().InstancePerLifetimeScope();
builder.RegisterType<LocalFileSystem>().As<IFileSystem>().SingleInstance(); builder.RegisterType<LocalFileSystem>().As<IFileSystem>().SingleInstance();
builder.RegisterType<HttpFileSystem>().As<IFileSystem>().SingleInstance(); builder.RegisterType<HttpFileSystem>().As<IFileSystem>().SingleInstance();
builder.RegisterType<ConfigurationManager>().As<IConfigurationManager>().SingleInstance(); builder.RegisterType<ConfigurationManager>().As<IConfigurationManager>().SingleInstance();
builder.RegisterType<Transcoder>().As<ITranscoder>().SingleInstance(); builder.RegisterType<Transcoder>().As<ITranscoder>().SingleInstance();
builder.RegisterType<ThumbnailsManager>().As<IThumbnailsManager>().SingleInstance(); builder.RegisterType<ThumbnailsManager>().As<IThumbnailsManager>().InstancePerLifetimeScope();
builder.RegisterType<TaskManager>().As<ITaskManager>().SingleInstance(); builder.RegisterType<TaskManager>().As<ITaskManager>().SingleInstance();
builder.RegisterType<LibraryManager>().As<ILibraryManager>().InstancePerLifetimeScope(); builder.RegisterType<LibraryManager>().As<ILibraryManager>().InstancePerLifetimeScope();
builder.RegisterType<RegexIdentifier>().As<IIdentifier>().SingleInstance(); builder.RegisterType<RegexIdentifier>().As<IIdentifier>().SingleInstance();

13
Kyoo/Tasks/RegisterEpisode.cs
View File

@ -121,8 +121,6 @@ namespace Kyoo.Tasks
if (season != null) if (season != null)
season.Show = show; season.Show = show;
season = await _RegisterAndFill(season); season = await _RegisterAndFill(season);
if (season != null)
season.Title ??= $"Season {season.SeasonNumber}";
progress.Report(60); progress.Report(60);
episode.Show = show; episode.Show = show;
@ -175,10 +173,15 @@ namespace Kyoo.Tasks
item = await _metadataProvider.Get(item); item = await _metadataProvider.Get(item);
await _thumbnailsManager.DownloadImages(item); await _thumbnailsManager.DownloadImages(item);
if (item is Show show && show.People != null) switch (item)
{ {
foreach (PeopleRole role in show.People) case Show show when show.People != null:
await _thumbnailsManager.DownloadImages(role.People); 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); return await _libraryManager.CreateIfNotExists(item);