Merge pull request #1222 from MediaBrowser/dev

3.0.5768.7

1 files changed, 4 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
index 6b99883a5..bd634ed73 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -14,6 +14,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using CommonIO;
 
 namespace MediaBrowser.Server.Implementations.MediaEncoder
 {
@@ -134,11 +135,11 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
 
                         var protocol = MediaProtocol.File;
 
-                        var inputPath = MediaEncoderHelpers.GetInputArgument(video.Path, protocol, null, video.PlayableStreamFileNames);
+                        var inputPath = MediaEncoderHelpers.GetInputArgument(_fileSystem, video.Path, protocol, null, video.PlayableStreamFileNames);
 
                         try
                         {
-                            Directory.CreateDirectory(Path.GetDirectoryName(path));
+							_fileSystem.CreateDirectory(Path.GetDirectoryName(path));
 
                             using (var stream = await _encoder.ExtractVideoImage(inputPath, protocol, video.Video3DFormat, time, cancellationToken).ConfigureAwait(false))
                             {
@@ -194,7 +195,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
 
             try
             {
-                return Directory.EnumerateFiles(path)
+                return _fileSystem.GetFilePaths(path)
                     .ToList();
             }
             catch (DirectoryNotFoundException)