cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 02:18:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

Change image enhancer LastConfigurationChange to ConfigurationCacheKey

Browse Source
This commit is contained in:
Eric Reed 2013-05-23 11:45:13 -04:00
parent 8452e2f125
commit f4a199d275
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Api/Images/ImageService.cs
View File

@ -668,7 +668,6 @@ namespace MediaBrowser.Api.Images
} }
var contentType = MimeTypes.GetMimeType(imagePath); var contentType = MimeTypes.GetMimeType(imagePath);
var dateLastModified = (supportedImageEnhancers.Select(e => e.LastConfigurationChange(item, request.Type)).Concat(new[] { originalFileImageDateModified })).Max();
var cacheGuid = kernel.ImageManager.GetImageCacheTag(imagePath, originalFileImageDateModified, supportedImageEnhancers, item, request.Type); var cacheGuid = kernel.ImageManager.GetImageCacheTag(imagePath, originalFileImageDateModified, supportedImageEnhancers, item, request.Type);
@ -679,7 +678,7 @@ namespace MediaBrowser.Api.Images
cacheDuration = TimeSpan.FromDays(365); cacheDuration = TimeSpan.FromDays(365);
} }
return ToCachedResult(cacheGuid, dateLastModified, cacheDuration, () => new ImageWriter return ToCachedResult(cacheGuid, originalFileImageDateModified, cacheDuration, () => new ImageWriter
{ {
Item = item, Item = item,
Request = request, Request = request,

2
MediaBrowser.Controller/Drawing/ImageManager.cs
View File

@ -642,7 +642,7 @@ namespace MediaBrowser.Controller.Drawing
} }
// Cache name is created with supported enhancers combined with the last config change so we pick up new config changes // 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(); var cacheKeys = imageEnhancers.Select(i => i.ConfigurationCacheKey(item, imageType)).ToList();
cacheKeys.Add(originalImagePath + dateModified.Ticks); cacheKeys.Add(originalImagePath + dateModified.Ticks);
return string.Join("|", cacheKeys.ToArray()).GetMD5(); return string.Join("|", cacheKeys.ToArray()).GetMD5();

6
MediaBrowser.Controller/Providers/IImageEnhancer.cs
View File

@ -24,12 +24,12 @@ namespace MediaBrowser.Controller.Providers
MetadataProviderPriority Priority { get; } MetadataProviderPriority Priority { get; }
/// <summary> /// <summary>
/// Return the date of the last configuration change affecting the provided baseitem and image type /// Return a key incorporating all configuration information related to this item
/// </summary> /// </summary>
/// <param name="item">The item.</param> /// <param name="item">The item.</param>
/// <param name="imageType">Type of the image.</param> /// <param name="imageType">Type of the image.</param>
/// <returns>Date of last config change</returns> /// <returns>Cache key relating to the current state of this item and configuration</returns>
DateTime LastConfigurationChange(BaseItem item, ImageType imageType); string ConfigurationCacheKey(BaseItem item, ImageType imageType);
/// <summary> /// <summary>
/// Gets the size of the enhanced image. /// Gets the size of the enhanced image.