diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-10-30 12:47:42 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-10-30 12:47:42 -0400 |
| commit | 0b211b06043e2f315950090108ddcde40bcc6d78 (patch) | |
| tree | c01b856c35f4c5262127749c9d4e8b15122de9e9 /MediaBrowser.Providers/Manager | |
| parent | 69615442989316346dd55658aa2183daf72b1554 (diff) | |
| parent | 8ea02ee02068f7e7361e143301b51ca57e45615a (diff) | |
Merge pull request #1241 from MediaBrowser/master
update dynamic images
Diffstat (limited to 'MediaBrowser.Providers/Manager')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ImageSaver.cs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs index 9d183c880c..e8eece299a 100644 --- a/MediaBrowser.Providers/Manager/ImageSaver.cs +++ b/MediaBrowser.Providers/Manager/ImageSaver.cs @@ -119,13 +119,9 @@ namespace MediaBrowser.Providers.Manager var index = imageIndex ?? 0; - var paths = !string.IsNullOrEmpty(internalCacheKey) ? - new[] { GetCacheKeyPath(item, type, mimeType, internalCacheKey) } : - GetSavePaths(item, type, imageIndex, mimeType, saveLocally); + var paths = GetSavePaths(item, type, imageIndex, mimeType, saveLocally); - var retryPaths = !string.IsNullOrEmpty(internalCacheKey) ? - new[] { GetCacheKeyPath(item, type, mimeType, internalCacheKey) } : - GetSavePaths(item, type, imageIndex, mimeType, false); + var retryPaths = GetSavePaths(item, type, imageIndex, mimeType, false); // If there are more than one output paths, the stream will need to be seekable var memoryStream = new MemoryStream(); @@ -196,7 +192,7 @@ namespace MediaBrowser.Providers.Manager } catch (UnauthorizedAccessException) { - var retry = !string.IsNullOrWhiteSpace(retryPath) && + var retry = !string.IsNullOrWhiteSpace(retryPath) && !string.Equals(path, retryPath, StringComparison.OrdinalIgnoreCase); if (retry) @@ -213,12 +209,6 @@ namespace MediaBrowser.Providers.Manager await SaveImageToLocation(source, retryPath, cancellationToken).ConfigureAwait(false); } - private string GetCacheKeyPath(IHasImages item, ImageType type, string mimeType, string key) - { - var extension = MimeTypes.ToExtension(mimeType); - return Path.Combine(item.GetInternalMetadataPath(), type.ToString().ToLower() + "_key_" + key + extension); - } - /// <summary> /// Saves the image to location. /// </summary> |
