Explorar o código

Validate ffmpeg path

Bond_009 %!s(int64=3) %!d(string=hai) anos
pai
achega
52585a865e
Modificáronse 1 ficheiros con 14 adicións e 6 borrados
  1. 14 6
      MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

+ 14 - 6
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -165,14 +165,22 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 // User had cleared the custom path in UI
                 // User had cleared the custom path in UI
                 newPath = string.Empty;
                 newPath = string.Empty;
             }
             }
-            else if (Directory.Exists(path))
-            {
-                // Given path is directory, so resolve down to filename
-                newPath = GetEncoderPathFromDirectory(path, "ffmpeg");
-            }
             else
             else
             {
             {
-                newPath = path;
+                if (Directory.Exists(path))
+                {
+                    // Given path is directory, so resolve down to filename
+                    newPath = GetEncoderPathFromDirectory(path, "ffmpeg");
+                }
+                else
+                {
+                    newPath = path;
+                }
+
+                if (!new EncoderValidator(_logger, newPath).ValidateVersion())
+                {
+                    throw new ResourceNotFoundException();
+                }
             }
             }
 
 
             // Write the new ffmpeg path to the xml as <EncoderAppPath>
             // Write the new ffmpeg path to the xml as <EncoderAppPath>