| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635 | 
							- using MediaBrowser.Common.Extensions;
 
- using MediaBrowser.Common.IO;
 
- using MediaBrowser.Controller.Entities;
 
- using MediaBrowser.Controller.Entities.TV;
 
- using MediaBrowser.Controller.Providers;
 
- using MediaBrowser.Model.Drawing;
 
- using MediaBrowser.Model.Entities;
 
- using MediaBrowser.Model.Logging;
 
- using MediaBrowser.Model.Serialization;
 
- using System;
 
- using System.Collections.Concurrent;
 
- using System.Collections.Generic;
 
- using System.Drawing;
 
- using System.Drawing.Drawing2D;
 
- using System.Drawing.Imaging;
 
- using System.IO;
 
- using System.Linq;
 
- using System.Threading.Tasks;
 
- namespace MediaBrowser.Controller.Drawing
 
- {
 
-     /// <summary>
 
-     /// Class ImageManager
 
-     /// </summary>
 
-     public class ImageManager : IDisposable
 
-     {
 
-         /// <summary>
 
-         /// Gets the image size cache.
 
-         /// </summary>
 
-         /// <value>The image size cache.</value>
 
-         private FileSystemRepository ImageSizeCache { get; set; }
 
-         /// <summary>
 
-         /// Gets or sets the resized image cache.
 
-         /// </summary>
 
-         /// <value>The resized image cache.</value>
 
-         private FileSystemRepository ResizedImageCache { get; set; }
 
-         /// <summary>
 
-         /// Gets the cropped image cache.
 
-         /// </summary>
 
-         /// <value>The cropped image cache.</value>
 
-         private FileSystemRepository CroppedImageCache { get; set; }
 
-         /// <summary>
 
-         /// Gets the cropped image cache.
 
-         /// </summary>
 
-         /// <value>The cropped image cache.</value>
 
-         private FileSystemRepository EnhancedImageCache { get; set; }
 
-         /// <summary>
 
-         /// The cached imaged sizes
 
-         /// </summary>
 
-         private readonly ConcurrentDictionary<string, Task<ImageSize>> _cachedImagedSizes = new ConcurrentDictionary<string, Task<ImageSize>>();
 
-         /// <summary>
 
-         /// The _logger
 
-         /// </summary>
 
-         private readonly ILogger _logger;
 
-         /// <summary>
 
-         /// The _protobuf serializer
 
-         /// </summary>
 
-         private readonly IProtobufSerializer _protobufSerializer;
 
-         /// <summary>
 
-         /// The _kernel
 
-         /// </summary>
 
-         private readonly Kernel _kernel;
 
-         /// <summary>
 
-         /// Initializes a new instance of the <see cref="ImageManager" /> class.
 
-         /// </summary>
 
-         /// <param name="kernel">The kernel.</param>
 
-         /// <param name="protobufSerializer">The protobuf serializer.</param>
 
-         /// <param name="logger">The logger.</param>
 
-         public ImageManager(Kernel kernel, IProtobufSerializer protobufSerializer, ILogger logger, IServerApplicationPaths appPaths)
 
-         {
 
-             _protobufSerializer = protobufSerializer;
 
-             _logger = logger;
 
-             _kernel = kernel;
 
-             ImageSizeCache = new FileSystemRepository(Path.Combine(appPaths.ImageCachePath, "image-sizes"));
 
-             ResizedImageCache = new FileSystemRepository(Path.Combine(appPaths.ImageCachePath, "resized-images"));
 
-             CroppedImageCache = new FileSystemRepository(Path.Combine(appPaths.ImageCachePath, "cropped-images"));
 
-             EnhancedImageCache = new FileSystemRepository(Path.Combine(appPaths.ImageCachePath, "enhanced-images"));
 
-         }
 
-         /// <summary>
 
-         /// Processes an image by resizing to target dimensions
 
-         /// </summary>
 
-         /// <param name="entity">The entity that owns the image</param>
 
-         /// <param name="imageType">The image type</param>
 
-         /// <param name="imageIndex">The image index (currently only used with backdrops)</param>
 
-         /// <param name="cropWhitespace">if set to <c>true</c> [crop whitespace].</param>
 
-         /// <param name="dateModified">The last date modified of the original image file</param>
 
-         /// <param name="toStream">The stream to save the new image to</param>
 
-         /// <param name="width">Use if a fixed width is required. Aspect ratio will be preserved.</param>
 
-         /// <param name="height">Use if a fixed height is required. Aspect ratio will be preserved.</param>
 
-         /// <param name="maxWidth">Use if a max width is required. Aspect ratio will be preserved.</param>
 
-         /// <param name="maxHeight">Use if a max height is required. Aspect ratio will be preserved.</param>
 
-         /// <param name="quality">Quality level, from 0-100. Currently only applies to JPG. The default value should suffice.</param>
 
-         /// <returns>Task.</returns>
 
-         /// <exception cref="System.ArgumentNullException">entity</exception>
 
-         public async Task ProcessImage(BaseItem entity, ImageType imageType, int imageIndex, bool cropWhitespace, DateTime dateModified, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality)
 
-         {
 
-             if (entity == null)
 
-             {
 
-                 throw new ArgumentNullException("entity");
 
-             }
 
-             if (toStream == null)
 
-             {
 
-                 throw new ArgumentNullException("toStream");
 
-             }
 
-             var originalImagePath = GetImagePath(entity, imageType, imageIndex);
 
-             if (cropWhitespace)
 
-             {
 
-                 try
 
-                 {
 
-                     originalImagePath = GetCroppedImage(originalImagePath, dateModified);
 
-                 }
 
-                 catch (Exception ex)
 
-                 {
 
-                     // We have to have a catch-all here because some of the .net image methods throw a plain old Exception
 
-                     _logger.ErrorException("Error cropping image", ex);
 
-                 }
 
-             }
 
-             try
 
-             {
 
-                 // Enhance if we have enhancers
 
-                 var ehnancedImagePath = await GetEnhancedImage(originalImagePath, dateModified, entity, imageType, imageIndex).ConfigureAwait(false);
 
-                 // If the path changed update dateModified
 
-                 if (!ehnancedImagePath.Equals(originalImagePath, StringComparison.OrdinalIgnoreCase))
 
-                 {
 
-                     dateModified = File.GetLastWriteTimeUtc(ehnancedImagePath);
 
-                     originalImagePath = ehnancedImagePath;
 
-                 }
 
-             }
 
-             catch
 
-             {
 
-                 _logger.Error("Error enhancing image");
 
-             }
 
-             var originalImageSize = await GetImageSize(originalImagePath, dateModified).ConfigureAwait(false);
 
-             // Determine the output size based on incoming parameters
 
-             var newSize = DrawingUtils.Resize(originalImageSize, width, height, maxWidth, maxHeight);
 
-             if (!quality.HasValue)
 
-             {
 
-                 quality = 90;
 
-             }
 
-             var cacheFilePath = GetCacheFilePath(originalImagePath, newSize, quality.Value, dateModified);
 
-             // Grab the cache file if it already exists
 
-             try
 
-             {
 
-                 using (var fileStream = new FileStream(cacheFilePath, FileMode.Open, FileAccess.Read, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
 
-                 {
 
-                     await fileStream.CopyToAsync(toStream).ConfigureAwait(false);
 
-                 }
 
-                 return;
 
-             }
 
-             catch (FileNotFoundException)
 
-             {
 
-                 // Cache file doesn't exist. No biggie.
 
-             }
 
-             using (var fileStream = File.OpenRead(originalImagePath))
 
-             {
 
-                 using (var originalImage = Bitmap.FromStream(fileStream, true, false))
 
-                 {
 
-                     var newWidth = Convert.ToInt32(newSize.Width);
 
-                     var newHeight = Convert.ToInt32(newSize.Height);
 
-                     // Graphics.FromImage will throw an exception if the PixelFormat is Indexed, so we need to handle that here
 
-                     var thumbnail = originalImage.PixelFormat.HasFlag(PixelFormat.Indexed) ? new Bitmap(originalImage, newWidth, newHeight) : new Bitmap(newWidth, newHeight, originalImage.PixelFormat);
 
-                     // Preserve the original resolution
 
-                     thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution);
 
-                     var thumbnailGraph = Graphics.FromImage(thumbnail);
 
-                     thumbnailGraph.CompositingQuality = CompositingQuality.HighQuality;
 
-                     thumbnailGraph.SmoothingMode = SmoothingMode.HighQuality;
 
-                     thumbnailGraph.InterpolationMode = InterpolationMode.HighQualityBicubic;
 
-                     thumbnailGraph.PixelOffsetMode = PixelOffsetMode.HighQuality;
 
-                     thumbnailGraph.CompositingMode = CompositingMode.SourceOver;
 
-                     thumbnailGraph.DrawImage(originalImage, 0, 0, newWidth, newHeight);
 
-                     var outputFormat = originalImage.RawFormat;
 
-                     using (var memoryStream = new MemoryStream { })
 
-                     {
 
-                         // Save to the memory stream
 
-                         thumbnail.Save(outputFormat, memoryStream, quality.Value);
 
-                         var bytes = memoryStream.ToArray();
 
-                         var outputTask = Task.Run(async () => await toStream.WriteAsync(bytes, 0, bytes.Length));
 
-                         // Save to the cache location
 
-                         using (var cacheFileStream = new FileStream(cacheFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
 
-                         {
 
-                             // Save to the filestream
 
-                             await cacheFileStream.WriteAsync(bytes, 0, bytes.Length);
 
-                         }
 
-                         await outputTask.ConfigureAwait(false);
 
-                     }
 
-                     thumbnailGraph.Dispose();
 
-                     thumbnail.Dispose();
 
-                 }
 
-             }
 
-         }
 
-         /// <summary>
 
-         /// Gets the cache file path based on a set of parameters
 
-         /// </summary>
 
-         /// <param name="originalPath">The path to the original image file</param>
 
-         /// <param name="outputSize">The size to output the image in</param>
 
-         /// <param name="quality">Quality level, from 0-100. Currently only applies to JPG. The default value should suffice.</param>
 
-         /// <param name="dateModified">The last modified date of the image</param>
 
-         /// <returns>System.String.</returns>
 
-         private string GetCacheFilePath(string originalPath, ImageSize outputSize, int quality, DateTime dateModified)
 
-         {
 
-             var filename = originalPath;
 
-             filename += "width=" + outputSize.Width;
 
-             filename += "height=" + outputSize.Height;
 
-             filename += "quality=" + quality;
 
-             filename += "datemodified=" + dateModified.Ticks;
 
-             return ResizedImageCache.GetResourcePath(filename, Path.GetExtension(originalPath));
 
-         }
 
-         /// <summary>
 
-         /// Gets image dimensions
 
-         /// </summary>
 
-         /// <param name="imagePath">The image path.</param>
 
-         /// <param name="dateModified">The date modified.</param>
 
-         /// <returns>Task{ImageSize}.</returns>
 
-         /// <exception cref="System.ArgumentNullException">imagePath</exception>
 
-         public Task<ImageSize> GetImageSize(string imagePath, DateTime dateModified)
 
-         {
 
-             if (string.IsNullOrEmpty(imagePath))
 
-             {
 
-                 throw new ArgumentNullException("imagePath");
 
-             }
 
-             var name = imagePath + "datemodified=" + dateModified.Ticks;
 
-             return _cachedImagedSizes.GetOrAdd(name, keyName => GetImageSizeTask(keyName, imagePath));
 
-         }
 
-         /// <summary>
 
-         /// Gets cached image dimensions, or results null if non-existant
 
-         /// </summary>
 
-         /// <param name="keyName">Name of the key.</param>
 
-         /// <param name="imagePath">The image path.</param>
 
-         /// <returns>Task{ImageSize}.</returns>
 
-         private Task<ImageSize> GetImageSizeTask(string keyName, string imagePath)
 
-         {
 
-             return Task.Run(() => GetImageSize(keyName, imagePath));
 
-         }
 
-         /// <summary>
 
-         /// Gets the size of the image.
 
-         /// </summary>
 
-         /// <param name="keyName">Name of the key.</param>
 
-         /// <param name="imagePath">The image path.</param>
 
-         /// <returns>ImageSize.</returns>
 
-         private ImageSize GetImageSize(string keyName, string imagePath)
 
-         {
 
-             // Now check the file system cache
 
-             var fullCachePath = ImageSizeCache.GetResourcePath(keyName, ".pb");
 
-             try
 
-             {
 
-                 var result = _protobufSerializer.DeserializeFromFile<int[]>(fullCachePath);
 
-                 return new ImageSize { Width = result[0], Height = result[1] };
 
-             }
 
-             catch (FileNotFoundException)
 
-             {
 
-                 // Cache file doesn't exist no biggie
 
-             }
 
-             var size = ImageHeader.GetDimensions(imagePath, _logger);
 
-             var imageSize = new ImageSize { Width = size.Width, Height = size.Height };
 
-             // Update the file system cache
 
-             CacheImageSize(fullCachePath, size.Width, size.Height);
 
-             return imageSize;
 
-         }
 
-         /// <summary>
 
-         /// Caches image dimensions
 
-         /// </summary>
 
-         /// <param name="cachePath">The cache path.</param>
 
-         /// <param name="width">The width.</param>
 
-         /// <param name="height">The height.</param>
 
-         private void CacheImageSize(string cachePath, int width, int height)
 
-         {
 
-             var output = new[] { width, height };
 
-             _protobufSerializer.SerializeToFile(output, cachePath);
 
-         }
 
-         /// <summary>
 
-         /// Gets the image path.
 
-         /// </summary>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imageType">Type of the image.</param>
 
-         /// <param name="imageIndex">Index of the image.</param>
 
-         /// <returns>System.String.</returns>
 
-         /// <exception cref="System.ArgumentNullException">item</exception>
 
-         /// <exception cref="System.InvalidOperationException"></exception>
 
-         public string GetImagePath(BaseItem item, ImageType imageType, int imageIndex)
 
-         {
 
-             if (item == null)
 
-             {
 
-                 throw new ArgumentNullException("item");
 
-             }
 
-             if (imageType == ImageType.Backdrop)
 
-             {
 
-                 if (item.BackdropImagePaths == null)
 
-                 {
 
-                     throw new InvalidOperationException(string.Format("Item {0} does not have any Backdrops.", item.Name));
 
-                 }
 
-                 return item.BackdropImagePaths[imageIndex];
 
-             }
 
-             if (imageType == ImageType.Screenshot)
 
-             {
 
-                 if (item.ScreenshotImagePaths == null)
 
-                 {
 
-                     throw new InvalidOperationException(string.Format("Item {0} does not have any Screenshots.", item.Name));
 
-                 }
 
-                 return item.ScreenshotImagePaths[imageIndex];
 
-             }
 
-             if (imageType == ImageType.Chapter)
 
-             {
 
-                 var video = (Video)item;
 
-                 if (video.Chapters == null)
 
-                 {
 
-                     throw new InvalidOperationException(string.Format("Item {0} does not have any Chapters.", item.Name));
 
-                 }
 
-                 return video.Chapters[imageIndex].ImagePath;
 
-             }
 
-             
 
-             return item.GetImage(imageType);
 
-         }
 
-         /// <summary>
 
-         /// Gets the image date modified.
 
-         /// </summary>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imageType">Type of the image.</param>
 
-         /// <param name="imageIndex">Index of the image.</param>
 
-         /// <returns>DateTime.</returns>
 
-         /// <exception cref="System.ArgumentNullException">item</exception>
 
-         public DateTime GetImageDateModified(BaseItem item, ImageType imageType, int imageIndex)
 
-         {
 
-             if (item == null)
 
-             {
 
-                 throw new ArgumentNullException("item");
 
-             }
 
-             var imagePath = GetImagePath(item, imageType, imageIndex);
 
-             return GetImageDateModified(item, imagePath);
 
-         }
 
-         /// <summary>
 
-         /// Gets the image date modified.
 
-         /// </summary>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imagePath">The image path.</param>
 
-         /// <returns>DateTime.</returns>
 
-         /// <exception cref="System.ArgumentNullException">item</exception>
 
-         public DateTime GetImageDateModified(BaseItem item, string imagePath)
 
-         {
 
-             if (item == null)
 
-             {
 
-                 throw new ArgumentNullException("item");
 
-             }
 
-             if (string.IsNullOrEmpty(imagePath))
 
-             {
 
-                 throw new ArgumentNullException("imagePath");
 
-             }
 
-             
 
-             var metaFileEntry = item.ResolveArgs.GetMetaFileByPath(imagePath);
 
-             // If we didn't the metafile entry, check the Season
 
-             if (!metaFileEntry.HasValue)
 
-             {
 
-                 var episode = item as Episode;
 
-                 if (episode != null && episode.Season != null)
 
-                 {
 
-                     episode.Season.ResolveArgs.GetMetaFileByPath(imagePath);
 
-                 }
 
-             }
 
-             // See if we can avoid a file system lookup by looking for the file in ResolveArgs
 
-             return metaFileEntry == null ? File.GetLastWriteTimeUtc(imagePath) : metaFileEntry.Value.LastWriteTimeUtc;
 
-         }
 
-         /// <summary>
 
-         /// Crops whitespace from an image, caches the result, and returns the cached path
 
-         /// </summary>
 
-         /// <param name="originalImagePath">The original image path.</param>
 
-         /// <param name="dateModified">The date modified.</param>
 
-         /// <returns>System.String.</returns>
 
-         private string GetCroppedImage(string originalImagePath, DateTime dateModified)
 
-         {
 
-             var name = originalImagePath;
 
-             name += "datemodified=" + dateModified.Ticks;
 
-             var croppedImagePath = CroppedImageCache.GetResourcePath(name, Path.GetExtension(originalImagePath));
 
-             if (!CroppedImageCache.ContainsFilePath(croppedImagePath))
 
-             {
 
-                 using (var fileStream = File.OpenRead(originalImagePath))
 
-                 {
 
-                     using (var originalImage = (Bitmap)Bitmap.FromStream(fileStream, true, false))
 
-                     {
 
-                         var outputFormat = originalImage.RawFormat;
 
-                         using (var croppedImage = originalImage.CropWhitespace())
 
-                         {
 
-                             using (var cacheFileStream = new FileStream(croppedImagePath, FileMode.Create))
 
-                             {
 
-                                 croppedImage.Save(outputFormat, cacheFileStream, 100);
 
-                             }
 
-                         }
 
-                     }
 
-                 }
 
-             }
 
-             return croppedImagePath;
 
-         }
 
-         /// <summary>
 
-         /// Runs an image through the image enhancers, caches the result, and returns the cached path
 
-         /// </summary>
 
-         /// <param name="originalImagePath">The original image path.</param>
 
-         /// <param name="dateModified">The date modified of the original image file.</param>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imageType">Type of the image.</param>
 
-         /// <param name="imageIndex">Index of the image.</param>
 
-         /// <returns>System.String.</returns>
 
-         /// <exception cref="System.ArgumentNullException">originalImagePath</exception>
 
-         public async Task<string> GetEnhancedImage(string originalImagePath, DateTime dateModified, BaseItem item, ImageType imageType, int imageIndex)
 
-         {
 
-             if (string.IsNullOrEmpty(originalImagePath))
 
-             {
 
-                 throw new ArgumentNullException("originalImagePath");
 
-             }
 
-             if (item == null)
 
-             {
 
-                 throw new ArgumentNullException("item");
 
-             }
 
-             var supportedEnhancers = _kernel.ImageEnhancers.Where(i => i.Supports(item, imageType)).ToList();
 
-             // No enhancement - don't cache
 
-             if (supportedEnhancers.Count == 0)
 
-             {
 
-                 return originalImagePath;
 
-             }
 
-             var cacheGuid = GetImageCacheTag(originalImagePath, dateModified, supportedEnhancers, item, imageType);
 
-             // All enhanced images are saved as png to allow transparency
 
-             var enhancedImagePath = EnhancedImageCache.GetResourcePath(cacheGuid + ".png");
 
-             if (!EnhancedImageCache.ContainsFilePath(enhancedImagePath))
 
-             {
 
-                 using (var fileStream = File.OpenRead(originalImagePath))
 
-                 {
 
-                     using (var originalImage = Image.FromStream(fileStream, true, false))
 
-                     {
 
-                         //Pass the image through registered enhancers
 
-                         using (var newImage = await ExecuteImageEnhancers(supportedEnhancers, originalImage, item, imageType, imageIndex).ConfigureAwait(false))
 
-                         {
 
-                             //And then save it in the cache
 
-                             newImage.Save(enhancedImagePath, ImageFormat.Png);
 
-                         }
 
-                     }
 
-                 }
 
-             }
 
-             return enhancedImagePath;
 
-         }
 
-         /// <summary>
 
-         /// Gets the image cache tag.
 
-         /// </summary>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imageType">Type of the image.</param>
 
-         /// <param name="imagePath">The image path.</param>
 
-         /// <returns>Guid.</returns>
 
-         /// <exception cref="System.ArgumentNullException">item</exception>
 
-         public Guid GetImageCacheTag(BaseItem item, ImageType imageType, string imagePath)
 
-         {
 
-             if (item == null)
 
-             {
 
-                 throw new ArgumentNullException("item");
 
-             }
 
-             if (string.IsNullOrEmpty(imagePath))
 
-             {
 
-                 throw new ArgumentNullException("imagePath");
 
-             }
 
-             
 
-             var dateModified = GetImageDateModified(item, imagePath);
 
-             var supportedEnhancers = _kernel.ImageEnhancers.Where(i => i.Supports(item, imageType));
 
-             return GetImageCacheTag(imagePath, dateModified, supportedEnhancers, item, imageType);
 
-         }
 
-         /// <summary>
 
-         /// Gets the image cache tag.
 
-         /// </summary>
 
-         /// <param name="originalImagePath">The original image path.</param>
 
-         /// <param name="dateModified">The date modified of the original image file.</param>
 
-         /// <param name="imageEnhancers">The image enhancers.</param>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imageType">Type of the image.</param>
 
-         /// <returns>Guid.</returns>
 
-         /// <exception cref="System.ArgumentNullException">item</exception>
 
-         public Guid GetImageCacheTag(string originalImagePath, DateTime dateModified, IEnumerable<IImageEnhancer> imageEnhancers, BaseItem item, ImageType imageType)
 
-         {
 
-             if (item == null)
 
-             {
 
-                 throw new ArgumentNullException("item");
 
-             }
 
-             if (imageEnhancers == null)
 
-             {
 
-                 throw new ArgumentNullException("imageEnhancers");
 
-             }
 
-             if (string.IsNullOrEmpty(originalImagePath))
 
-             {
 
-                 throw new ArgumentNullException("originalImagePath");
 
-             }
 
-             // Cache name is created with supported enhancers combined with the last config change so we pick up new config changes
 
-             var cacheKeys = imageEnhancers.Select(i => i.GetType().Name + i.LastConfigurationChange(item, imageType).Ticks).ToList();
 
-             cacheKeys.Add(originalImagePath + dateModified.Ticks);
 
-             return string.Join("|", cacheKeys.ToArray()).GetMD5();
 
-         }
 
-         /// <summary>
 
-         /// Executes the image enhancers.
 
-         /// </summary>
 
-         /// <param name="imageEnhancers">The image enhancers.</param>
 
-         /// <param name="originalImage">The original image.</param>
 
-         /// <param name="item">The item.</param>
 
-         /// <param name="imageType">Type of the image.</param>
 
-         /// <param name="imageIndex">Index of the image.</param>
 
-         /// <returns>Task{EnhancedImage}.</returns>
 
-         private async Task<Image> ExecuteImageEnhancers(IEnumerable<IImageEnhancer> imageEnhancers, Image originalImage, BaseItem item, ImageType imageType, int imageIndex)
 
-         {
 
-             var result = originalImage;
 
-             // Run the enhancers sequentially in order of priority
 
-             foreach (var enhancer in imageEnhancers)
 
-             {
 
-                 var typeName = enhancer.GetType().Name;
 
-                 _logger.Debug("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--");
 
-                 try
 
-                 {
 
-                     result = await enhancer.EnhanceImageAsync(item, result, imageType, imageIndex).ConfigureAwait(false);
 
-                 }
 
-                 catch (Exception ex)
 
-                 {
 
-                     _logger.ErrorException("{0} failed enhancing {1}", ex, typeName, item.Name);
 
-                     throw;
 
-                 }
 
-             }
 
-             return result;
 
-         }
 
-         public void Dispose()
 
-         {
 
-             Dispose(true);
 
-         }
 
-         /// <summary>
 
-         /// Releases unmanaged and - optionally - managed resources.
 
-         /// </summary>
 
-         /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
 
-         protected void Dispose(bool dispose)
 
-         {
 
-             if (dispose)
 
-             {
 
-                 ImageSizeCache.Dispose();
 
-                 ResizedImageCache.Dispose();
 
-                 CroppedImageCache.Dispose();
 
-                 EnhancedImageCache.Dispose();
 
-             }
 
-         }
 
-     }
 
- }
 
 
  |