Merge pull request #1 from jellyfin/master

merge with upstream master

2 files changed, 25 insertions, 27 deletions

diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
index 91c8b2792..e040286ab 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
@@ -1,16 +1,27 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using BDInfo.IO;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.MediaEncoding.BdInfo
 {
-    class BdInfoDirectoryInfo : BDInfo.IO.IDirectoryInfo
+    class BdInfoDirectoryInfo : IDirectoryInfo
     {
-        IFileSystem _fileSystem = null;
+        private readonly IFileSystem _fileSystem = null;
 
-        FileSystemMetadata _impl = null;
+        private readonly FileSystemMetadata _impl = null;
+
+        public BdInfoDirectoryInfo(IFileSystem fileSystem, string path)
+        {
+            _fileSystem = fileSystem;
+            _impl = _fileSystem.GetDirectoryInfo(path);
+        }
+
+        private BdInfoDirectoryInfo(IFileSystem fileSystem, FileSystemMetadata impl)
+        {
+            _fileSystem = fileSystem;
+            _impl = impl;
+        }
 
         public string Name => _impl.Name;
 
@@ -25,22 +36,11 @@ namespace MediaBrowser.MediaEncoding.BdInfo
                 {
                     return new BdInfoDirectoryInfo(_fileSystem, parentFolder);
                 }
+
                 return null;
             }
         }
 
-        public BdInfoDirectoryInfo(IFileSystem fileSystem, string path)
-        {
-            _fileSystem = fileSystem;
-            _impl = _fileSystem.GetDirectoryInfo(path);
-        }
-
-        private BdInfoDirectoryInfo(IFileSystem fileSystem, FileSystemMetadata impl)
-        {
-            _fileSystem = fileSystem;
-            _impl = impl;
-        }
-
         public IDirectoryInfo[] GetDirectories()
         {
             return Array.ConvertAll(_fileSystem.GetDirectories(_impl.FullName).ToArray(),
@@ -50,20 +50,20 @@ namespace MediaBrowser.MediaEncoding.BdInfo
         public IFileInfo[] GetFiles()
         {
             return Array.ConvertAll(_fileSystem.GetFiles(_impl.FullName).ToArray(),
-                x => new BdInfoFileInfo(_fileSystem, x));
+                x => new BdInfoFileInfo(x));
         }
 
         public IFileInfo[] GetFiles(string searchPattern)
         {
             return Array.ConvertAll(_fileSystem.GetFiles(_impl.FullName, new[] { searchPattern }, false, false).ToArray(),
-                x => new BdInfoFileInfo(_fileSystem, x));
+                x => new BdInfoFileInfo(x));
         }
 
         public IFileInfo[] GetFiles(string searchPattern, System.IO.SearchOption searchOption)
         {
             return Array.ConvertAll(_fileSystem.GetFiles(_impl.FullName, new[] { searchPattern }, false,
                     searchOption.HasFlag(System.IO.SearchOption.AllDirectories)).ToArray(),
-                x => new BdInfoFileInfo(_fileSystem, x));
+                x => new BdInfoFileInfo(x));
         }
 
         public static IDirectoryInfo FromFileSystemPath(Model.IO.IFileSystem fs, string path)
diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs
index de9d7cb78..a6ff4f767 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs
@@ -1,11 +1,10 @@
+using System.IO;
 using MediaBrowser.Model.IO;
 
 namespace MediaBrowser.MediaEncoding.BdInfo
 {
     class BdInfoFileInfo : BDInfo.IO.IFileInfo
     {
-        IFileSystem _fileSystem = null;
-
         FileSystemMetadata _impl = null;
 
         public string Name => _impl.Name;
@@ -18,18 +17,17 @@ namespace MediaBrowser.MediaEncoding.BdInfo
 
         public bool IsDir => _impl.IsDirectory;
 
-        public BdInfoFileInfo(IFileSystem fileSystem, FileSystemMetadata impl)
+        public BdInfoFileInfo(FileSystemMetadata impl)
         {
-            _fileSystem = fileSystem;
             _impl = impl;
         }
 
         public System.IO.Stream OpenRead()
         {
-            return _fileSystem.GetFileStream(FullName,
-                FileOpenMode.Open,
-                FileAccessMode.Read,
-                FileShareMode.Read);
+            return new FileStream(FullName,
+                FileMode.Open,
+                FileAccess.Read,
+                FileShare.Read);
         }
 
         public System.IO.StreamReader OpenText()