Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta

3 files changed, 35 insertions, 2 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index fd74b68b8..9ebf82c02 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -191,6 +191,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                     video.IsHD = true;
                 }
             }
+
+            SetIsoType(video);
+        }
+
+        protected void SetIsoType(Video video)
+        {
+            if (video.VideoType == VideoType.Iso)
+            {
+                if (video.Path.IndexOf("dvd", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    video.IsoType = IsoType.Dvd;
+                }
+                else if (video.Path.IndexOf("bluray", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    video.IsoType = IsoType.BluRay;
+                }
+            }
         }
 
         protected void Set3DFormat(Video video, bool is3D, string format3D)
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 39b62968f..23424bf3c 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -479,7 +479,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
                 return null;
             }
 
-            return new T
+            var returnVideo = new T
             {
                 Path = folderPaths[0],
 
@@ -489,6 +489,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
                 Name = result.Stacks[0].Name
             };
+
+            SetIsoType(returnVideo);
+
+            return returnVideo;
         }
 
         private bool IsInvalid(Folder parent, string collectionType)
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 5b3a83b73..c68126a4e 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -107,6 +107,18 @@
     <Content Include="dashboard-ui\bower_components\fastclick\lib\fastclick.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\components\guestinviter\guestinviter.js">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

+    <Content Include="dashboard-ui\components\guestinviter\guestinviter.template.html">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

+    <Content Include="dashboard-ui\components\metadataeditor\metadataeditor.js">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

+    <Content Include="dashboard-ui\components\metadataeditor\personeditor.template.html">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\components\recordingcreator\recordingcreator.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

@@ -161,7 +173,7 @@
     <Content Include="dashboard-ui\components\medialibraryeditor\medialibraryeditor.template.html">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

-    <Content Include="dashboard-ui\components\metadataeditor\metadataeditor.js">

+    <Content Include="dashboard-ui\components\metadataeditor\personeditor.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

     <Content Include="dashboard-ui\components\metadataeditor\metadataeditor.template.html">