Merge pull request #1891 from stanionascu/bdinfo-uhd

Upgrade BDInfo plugin to UHD/Atmos/DTS:X support

4 files changed, 117 insertions, 3 deletions

diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
new file mode 100644
index 000000000..91c8b2792
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
@@ -0,0 +1,74 @@
+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
+    {
+        IFileSystem _fileSystem = null;
+
+        FileSystemMetadata _impl = null;
+
+        public string Name => _impl.Name;
+
+        public string FullName => _impl.FullName;
+
+        public IDirectoryInfo Parent
+        {
+            get
+            {
+                var parentFolder = System.IO.Path.GetDirectoryName(_impl.FullName);
+                if (parentFolder != null)
+                {
+                    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(),
+                x => new BdInfoDirectoryInfo(_fileSystem, x));
+        }
+
+        public IFileInfo[] GetFiles()
+        {
+            return Array.ConvertAll(_fileSystem.GetFiles(_impl.FullName).ToArray(),
+                x => new BdInfoFileInfo(_fileSystem, x));
+        }
+
+        public IFileInfo[] GetFiles(string searchPattern)
+        {
+            return Array.ConvertAll(_fileSystem.GetFiles(_impl.FullName, new[] { searchPattern }, false, false).ToArray(),
+                x => new BdInfoFileInfo(_fileSystem, 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));
+        }
+
+        public static IDirectoryInfo FromFileSystemPath(Model.IO.IFileSystem fs, string path)
+        {
+            return new BdInfoDirectoryInfo(fs, path);
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
index 3b6b91684..3260f3051 100644
--- a/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoExaminer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using BDInfo;
@@ -32,7 +32,7 @@ namespace MediaBrowser.MediaEncoding.BdInfo
                 throw new ArgumentNullException(nameof(path));
             }
 
-            var bdrom = new BDROM(path, _fileSystem);
+            var bdrom = new BDROM(BdInfoDirectoryInfo.FromFileSystemPath(_fileSystem, path));
 
             bdrom.Scan();
 
diff --git a/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs b/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs
new file mode 100644
index 000000000..de9d7cb78
--- /dev/null
+++ b/MediaBrowser.MediaEncoding/BdInfo/BdInfoFileInfo.cs
@@ -0,0 +1,40 @@
+using MediaBrowser.Model.IO;
+
+namespace MediaBrowser.MediaEncoding.BdInfo
+{
+    class BdInfoFileInfo : BDInfo.IO.IFileInfo
+    {
+        IFileSystem _fileSystem = null;
+
+        FileSystemMetadata _impl = null;
+
+        public string Name => _impl.Name;
+
+        public string FullName => _impl.FullName;
+
+        public string Extension => _impl.Extension;
+
+        public long Length => _impl.Length;
+
+        public bool IsDir => _impl.IsDirectory;
+
+        public BdInfoFileInfo(IFileSystem fileSystem, FileSystemMetadata impl)
+        {
+            _fileSystem = fileSystem;
+            _impl = impl;
+        }
+
+        public System.IO.Stream OpenRead()
+        {
+            return _fileSystem.GetFileStream(FullName,
+                FileOpenMode.Open,
+                FileAccessMode.Read,
+                FileShareMode.Read);
+        }
+
+        public System.IO.StreamReader OpenText()
+        {
+            return new System.IO.StreamReader(OpenRead());
+        }
+    }
+}
diff --git a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
index e977bd8fe..783457bda 100644
--- a/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
+++ b/MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj
@@ -11,13 +11,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
     <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="BDInfo" Version="0.7.6.1" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0" />
     <PackageReference Include="UTF.Unknown" Version="2.2.0" />
   </ItemGroup>