Explorar o código

Merge pull request #1094 from cvium/imageprocessor_exception

Skip processing of images that don't exist
Bond-009 %!s(int64=6) %!d(string=hai) anos
pai
achega
58068e249a
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      Emby.Drawing/ImageProcessor.cs

+ 6 - 2
Emby.Drawing/ImageProcessor.cs

@@ -180,6 +180,12 @@ namespace Emby.Drawing
 
 
             var supportedImageInfo = await GetSupportedImage(originalImagePath, dateModified).ConfigureAwait(false);
             var supportedImageInfo = await GetSupportedImage(originalImagePath, dateModified).ConfigureAwait(false);
             originalImagePath = supportedImageInfo.path;
             originalImagePath = supportedImageInfo.path;
+
+            if (!File.Exists(originalImagePath))
+            {
+                return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified);
+            }
+
             dateModified = supportedImageInfo.dateModified;
             dateModified = supportedImageInfo.dateModified;
             bool requiresTransparency = TransparentImageTypes.Contains(Path.GetExtension(originalImagePath));
             bool requiresTransparency = TransparentImageTypes.Contains(Path.GetExtension(originalImagePath));
 
 
@@ -265,8 +271,6 @@ namespace Emby.Drawing
             {
             {
                 // If it fails for whatever reason, return the original image
                 // If it fails for whatever reason, return the original image
                 _logger.LogError(ex, "Error encoding image");
                 _logger.LogError(ex, "Error encoding image");
-
-                // Just spit out the original file if all the options are default
                 return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified);
                 return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified);
             }
             }
             finally
             finally