From 6cfd21122b165e31073af8047675bebded100571 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 30 Dec 2013 11:50:57 -0500 Subject: [PATCH] download studio/genre images --- MediaBrowser.Providers/ImagesByName/GenreImageProvider.cs | 8 +++++++- .../ImagesByName/GenresManualImageProvider.cs | 6 +++--- MediaBrowser.Providers/ImagesByName/ImageUtils.cs | 5 ++++- .../ImagesByName/StudioImageProvider.cs | 6 ++++++ .../ImagesByName/StudiosManualImageProvider.cs | 6 +++--- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/MediaBrowser.Providers/ImagesByName/GenreImageProvider.cs b/MediaBrowser.Providers/ImagesByName/GenreImageProvider.cs index cc9b4d4cfd..61933824e8 100644 --- a/MediaBrowser.Providers/ImagesByName/GenreImageProvider.cs +++ b/MediaBrowser.Providers/ImagesByName/GenreImageProvider.cs @@ -54,6 +54,12 @@ namespace MediaBrowser.Providers.ImagesByName return false; } + // Try again periodically in case new images were added + if ((DateTime.UtcNow - providerInfo.LastRefreshed).TotalDays > 14) + { + return true; + } + return base.NeedsRefreshInternal(item, providerInfo); } @@ -69,7 +75,7 @@ namespace MediaBrowser.Providers.ImagesByName { get { - return "6"; + return "8"; } } diff --git a/MediaBrowser.Providers/ImagesByName/GenresManualImageProvider.cs b/MediaBrowser.Providers/ImagesByName/GenresManualImageProvider.cs index b8bea4acff..469e133d05 100644 --- a/MediaBrowser.Providers/ImagesByName/GenresManualImageProvider.cs +++ b/MediaBrowser.Providers/ImagesByName/GenresManualImageProvider.cs @@ -45,7 +45,7 @@ namespace MediaBrowser.Providers.ImagesByName public Task> GetImages(IHasImages item, ImageType imageType, CancellationToken cancellationToken) { - return GetImages(item, imageType == ImageType.Primary, imageType == ImageType.Backdrop, cancellationToken); + return GetImages(item, imageType == ImageType.Primary, imageType == ImageType.Thumb, cancellationToken); } public Task> GetAllImages(IHasImages item, CancellationToken cancellationToken) @@ -53,7 +53,7 @@ namespace MediaBrowser.Providers.ImagesByName return GetImages(item, true, true, cancellationToken); } - private async Task> GetImages(IHasImages item, bool posters, bool backdrops, CancellationToken cancellationToken) + private async Task> GetImages(IHasImages item, bool posters, bool thumbs, CancellationToken cancellationToken) { var list = new List(); @@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.ImagesByName cancellationToken.ThrowIfCancellationRequested(); - if (backdrops) + if (thumbs) { var thumbsPath = Path.Combine(_config.ApplicationPaths.CachePath, "imagesbyname", "remotegenrethumbs.txt"); diff --git a/MediaBrowser.Providers/ImagesByName/ImageUtils.cs b/MediaBrowser.Providers/ImagesByName/ImageUtils.cs index cee8c9ded2..82caa420f9 100644 --- a/MediaBrowser.Providers/ImagesByName/ImageUtils.cs +++ b/MediaBrowser.Providers/ImagesByName/ImageUtils.cs @@ -73,7 +73,10 @@ namespace MediaBrowser.Providers.ImagesByName { var text = reader.ReadLine(); - lines.Add(text); + if (!string.IsNullOrWhiteSpace(text)) + { + lines.Add(text); + } } return lines; diff --git a/MediaBrowser.Providers/ImagesByName/StudioImageProvider.cs b/MediaBrowser.Providers/ImagesByName/StudioImageProvider.cs index 11a3a7a674..b147fcec19 100644 --- a/MediaBrowser.Providers/ImagesByName/StudioImageProvider.cs +++ b/MediaBrowser.Providers/ImagesByName/StudioImageProvider.cs @@ -54,6 +54,12 @@ namespace MediaBrowser.Providers.ImagesByName return false; } + // Try again periodically in case new images were added + if ((DateTime.UtcNow - providerInfo.LastRefreshed).TotalDays > 14) + { + return true; + } + return base.NeedsRefreshInternal(item, providerInfo); } diff --git a/MediaBrowser.Providers/ImagesByName/StudiosManualImageProvider.cs b/MediaBrowser.Providers/ImagesByName/StudiosManualImageProvider.cs index 8cabd0c841..062f08020f 100644 --- a/MediaBrowser.Providers/ImagesByName/StudiosManualImageProvider.cs +++ b/MediaBrowser.Providers/ImagesByName/StudiosManualImageProvider.cs @@ -45,7 +45,7 @@ namespace MediaBrowser.Providers.ImagesByName public Task> GetImages(IHasImages item, ImageType imageType, CancellationToken cancellationToken) { - return GetImages(item, imageType == ImageType.Primary, imageType == ImageType.Backdrop, cancellationToken); + return GetImages(item, imageType == ImageType.Primary, imageType == ImageType.Thumb, cancellationToken); } public Task> GetAllImages(IHasImages item, CancellationToken cancellationToken) @@ -53,7 +53,7 @@ namespace MediaBrowser.Providers.ImagesByName return GetImages(item, true, true, cancellationToken); } - private async Task> GetImages(IHasImages item, bool posters, bool backdrops, CancellationToken cancellationToken) + private async Task> GetImages(IHasImages item, bool posters, bool thumbs, CancellationToken cancellationToken) { var list = new List(); @@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.ImagesByName cancellationToken.ThrowIfCancellationRequested(); - if (backdrops) + if (thumbs) { var thumbsPath = Path.Combine(_config.ApplicationPaths.CachePath, "imagesbyname", "remotestudiothumbs.txt");