diff options
Diffstat (limited to 'MediaBrowser.Providers/Manager/ItemImageProvider.cs')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ItemImageProvider.cs | 180 |
1 files changed, 69 insertions, 111 deletions
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs index f2fa4dc29..773ad354c 100644 --- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs +++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs @@ -34,13 +34,13 @@ namespace MediaBrowser.Providers.Manager _fileSystem = fileSystem; } - public bool ValidateImages(IHasImages item, IEnumerable<IImageProvider> providers) + public bool ValidateImages(IHasImages item, IEnumerable<IImageProvider> providers, IDirectoryService directoryService) { - var hasChanges = item.ValidateImages(); + var hasChanges = item.ValidateImages(directoryService); - foreach (var provider in providers.OfType<IImageFileProvider>()) + foreach (var provider in providers.OfType<ILocalImageFileProvider>()) { - var images = provider.GetImages(item); + var images = provider.GetImages(item, directoryService); if (MergeImages(item, images)) { @@ -53,9 +53,9 @@ namespace MediaBrowser.Providers.Manager public async Task<RefreshResult> RefreshImages(IHasImages item, IEnumerable<IImageProvider> imageProviders, ImageRefreshOptions refreshOptions, MetadataOptions savedOptions, CancellationToken cancellationToken) { - var result = new RefreshResult { UpdateType = ItemUpdateType.Unspecified }; + var result = new RefreshResult { UpdateType = ItemUpdateType.None }; - var providers = GetImageProviders(item, imageProviders).ToList(); + var providers = imageProviders.ToList(); var providerIds = new List<Guid>(); @@ -63,18 +63,24 @@ namespace MediaBrowser.Providers.Manager var backdropLimit = item.HasImage(ImageType.Backdrop) ? 0 : savedOptions.GetLimit(ImageType.Backdrop); var screenshotLimit = item.HasImage(ImageType.Screenshot) ? 0 : savedOptions.GetLimit(ImageType.Screenshot); - foreach (var provider in providers.OfType<IRemoteImageProvider>()) + foreach (var provider in providers) { - await RefreshFromProvider(item, provider, refreshOptions, savedOptions, backdropLimit, screenshotLimit, result, cancellationToken).ConfigureAwait(false); + var remoteProvider = provider as IRemoteImageProvider; - providerIds.Add(provider.GetType().FullName.GetMD5()); - } + if (remoteProvider != null) + { + await RefreshFromProvider(item, remoteProvider, refreshOptions, savedOptions, backdropLimit, screenshotLimit, result, cancellationToken).ConfigureAwait(false); + providerIds.Add(provider.GetType().FullName.GetMD5()); + continue; + } - foreach (var provider in providers.OfType<IDynamicImageProvider>()) - { - await RefreshFromProvider(item, provider, savedOptions, result, cancellationToken).ConfigureAwait(false); + var dynamicImageProvider = provider as IDynamicImageProvider; - providerIds.Add(provider.GetType().FullName.GetMD5()); + if (dynamicImageProvider != null) + { + await RefreshFromProvider(item, dynamicImageProvider, savedOptions, result, cancellationToken).ConfigureAwait(false); + providerIds.Add(provider.GetType().FullName.GetMD5()); + } } result.Providers = providerIds; @@ -111,8 +117,7 @@ namespace MediaBrowser.Providers.Manager { var mimeType = "image/" + Path.GetExtension(response.Path).TrimStart('.').ToLower(); - var stream = _fileSystem.GetFileStream(response.Path, FileMode.Open, FileAccess.Read, - FileShare.Read, true); + var stream = _fileSystem.GetFileStream(response.Path, FileMode.Open, FileAccess.Read, FileShare.Read, true); await _providerManager.SaveImage((BaseItem)item, stream, mimeType, imageType, null, cancellationToken).ConfigureAwait(false); } @@ -172,23 +177,16 @@ namespace MediaBrowser.Providers.Manager return false; } - if (images.Contains(ImageType.Backdrop) && item.BackdropImagePaths.Count < backdropLimit) + if (images.Contains(ImageType.Backdrop) && item.GetImages(ImageType.Backdrop).Count() < backdropLimit) { return false; } - if (images.Contains(ImageType.Screenshot)) + if (images.Contains(ImageType.Screenshot) && item.GetImages(ImageType.Screenshot).Count() < backdropLimit) { - var hasScreenshots = item as IHasScreenshots; - if (hasScreenshots != null) - { - if (hasScreenshots.ScreenshotImagePaths.Count < screenshotLimit) - { - return false; - } - } - } - + return false; + } + return true; } @@ -214,24 +212,35 @@ namespace MediaBrowser.Providers.Manager } _logger.Debug("Running {0} for {1}", provider.GetType().Name, item.Path ?? item.Name); - - var images = await provider.GetAllImages(item, cancellationToken).ConfigureAwait(false); + + var images = await _providerManager.GetAvailableRemoteImages(item, new RemoteImageQuery + { + ProviderName = provider.Name, + IncludeAllLanguages = false, + IncludeDisabledProviders = false, + + }, cancellationToken).ConfigureAwait(false); + var list = images.ToList(); + int minWidth; foreach (var type in _singularImages) { if (savedOptions.IsEnabled(type) && !item.HasImage(type)) { - await DownloadImage(item, provider, result, list, type, cancellationToken).ConfigureAwait(false); + minWidth = savedOptions.GetMinWidth(type); + await DownloadImage(item, provider, result, list, minWidth, type, cancellationToken).ConfigureAwait(false); } } - await DownloadBackdrops(item, backdropLimit, provider, result, list, cancellationToken).ConfigureAwait(false); + minWidth = savedOptions.GetMinWidth(ImageType.Backdrop); + await DownloadBackdrops(item, ImageType.Backdrop, backdropLimit, provider, result, list, minWidth, cancellationToken).ConfigureAwait(false); var hasScreenshots = item as IHasScreenshots; if (hasScreenshots != null) { - await DownloadScreenshots(hasScreenshots, screenshotLimit, provider, result, list, cancellationToken).ConfigureAwait(false); + minWidth = savedOptions.GetMinWidth(ImageType.Screenshot); + await DownloadBackdrops(item, ImageType.Screenshot, screenshotLimit, provider, result, list, minWidth, cancellationToken).ConfigureAwait(false); } } catch (OperationCanceledException) @@ -246,25 +255,7 @@ namespace MediaBrowser.Providers.Manager } } - /// <summary> - /// Gets the image providers. - /// </summary> - /// <param name="item">The item.</param> - /// <param name="imageProviders">The image providers.</param> - /// <returns>IEnumerable{IImageProvider}.</returns> - private IEnumerable<IImageProvider> GetImageProviders(IHasImages item, IEnumerable<IImageProvider> imageProviders) - { - var providers = imageProviders; - - if (!_config.Configuration.EnableInternetProviders) - { - providers = providers.Where(i => !(i is IRemoteImageProvider)); - } - - return providers; - } - - private bool MergeImages(IHasImages item, List<LocalImageInfo> images) + public bool MergeImages(IHasImages item, List<LocalImageInfo> images) { var changed = false; @@ -274,50 +265,42 @@ namespace MediaBrowser.Providers.Manager if (image != null) { - var oldPath = item.GetImagePath(type); + var currentImage = item.GetImageInfo(type, 0); - item.SetImagePath(type, image.Path); - - if (!string.Equals(oldPath, image.Path, StringComparison.OrdinalIgnoreCase)) + if (currentImage == null || !string.Equals(currentImage.Path, image.FileInfo.FullName, StringComparison.OrdinalIgnoreCase)) { + item.SetImagePath(type, image.FileInfo); changed = true; } } } - // The change reporting will only be accurate at the count level - // Improve this if/when needed var backdrops = images.Where(i => i.Type == ImageType.Backdrop).ToList(); if (backdrops.Count > 0) { - var oldCount = item.BackdropImagePaths.Count; - - item.BackdropImagePaths = item.BackdropImagePaths - .Concat(backdrops.Select(i => i.Path)) - .Distinct(StringComparer.OrdinalIgnoreCase) + var foundImages = images.Where(i => i.Type == ImageType.Backdrop) + .Select(i => i.FileInfo) .ToList(); - if (oldCount != item.BackdropImagePaths.Count) + if (foundImages.Count > 0) { - changed = true; + if (item.AddImages(ImageType.Backdrop, foundImages)) + { + changed = true; + } } } var hasScreenshots = item as IHasScreenshots; if (hasScreenshots != null) { - var screenshots = images.Where(i => i.Type == ImageType.Screenshot).ToList(); + var foundImages = images.Where(i => i.Type == ImageType.Screenshot) + .Select(i => i.FileInfo) + .ToList(); - if (screenshots.Count > 0) + if (foundImages.Count > 0) { - var oldCount = hasScreenshots.ScreenshotImagePaths.Count; - - hasScreenshots.ScreenshotImagePaths = hasScreenshots.ScreenshotImagePaths - .Concat(screenshots.Select(i => i.Path)) - .Distinct(StringComparer.OrdinalIgnoreCase) - .ToList(); - - if (oldCount != hasScreenshots.ScreenshotImagePaths.Count) + if (item.AddImages(ImageType.Screenshot, foundImages)) { changed = true; } @@ -327,10 +310,15 @@ namespace MediaBrowser.Providers.Manager return changed; } - private async Task DownloadImage(IHasImages item, IRemoteImageProvider provider, RefreshResult result, IEnumerable<RemoteImageInfo> images, ImageType type, CancellationToken cancellationToken) + private async Task DownloadImage(IHasImages item, IRemoteImageProvider provider, RefreshResult result, IEnumerable<RemoteImageInfo> images, int minWidth, ImageType type, CancellationToken cancellationToken) { foreach (var image in images.Where(i => i.Type == type)) { + if (image.Width.HasValue && image.Width.Value < minWidth) + { + continue; + } + var url = image.Url; try @@ -344,7 +332,7 @@ namespace MediaBrowser.Providers.Manager } catch (HttpException ex) { - // Sometimes providers send back bad url's. Just move onto the next image + // Sometimes providers send back bad url's. Just move to the next image if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound) { continue; @@ -354,48 +342,18 @@ namespace MediaBrowser.Providers.Manager } } - private async Task DownloadBackdrops(IHasImages item, int limit, IRemoteImageProvider provider, RefreshResult result, IEnumerable<RemoteImageInfo> images, CancellationToken cancellationToken) + private async Task DownloadBackdrops(IHasImages item, ImageType imageType, int limit, IRemoteImageProvider provider, RefreshResult result, IEnumerable<RemoteImageInfo> images, int minWidth, CancellationToken cancellationToken) { - const ImageType imageType = ImageType.Backdrop; - foreach (var image in images.Where(i => i.Type == imageType)) { - if (item.BackdropImagePaths.Count >= limit) - { - break; - } - - var url = image.Url; - - try - { - var response = await provider.GetImageResponse(url, cancellationToken).ConfigureAwait(false); - - await _providerManager.SaveImage((BaseItem)item, response.Content, response.ContentType, imageType, null, cancellationToken).ConfigureAwait(false); - result.UpdateType = result.UpdateType | ItemUpdateType.ImageUpdate; - break; - } - catch (HttpException ex) + if (item.GetImages(imageType).Count() >= limit) { - // Sometimes providers send back bad url's. Just move onto the next image - if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound) - { - continue; - } break; } - } - } - - private async Task DownloadScreenshots(IHasScreenshots item, int limit, IRemoteImageProvider provider, RefreshResult result, IEnumerable<RemoteImageInfo> images, CancellationToken cancellationToken) - { - const ImageType imageType = ImageType.Screenshot; - foreach (var image in images.Where(i => i.Type == imageType)) - { - if (item.ScreenshotImagePaths.Count >= limit) + if (image.Width.HasValue && image.Width.Value < minWidth) { - break; + continue; } var url = image.Url; |