michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luke Pulverenti 2016-02-09 00:55:52 -05:00
commit bbefb03bcf
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
View File

@ -191,6 +191,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
video.IsHD = true; 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) protected void Set3DFormat(Video video, bool is3D, string format3D)

6
MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

@ -479,7 +479,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
return null; return null;
} }
return new T var returnVideo = new T
{ {
Path = folderPaths[0], Path = folderPaths[0],
@ -489,6 +489,10 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
Name = result.Stacks[0].Name Name = result.Stacks[0].Name
}; };
SetIsoType(returnVideo);
return returnVideo;
} }
private bool IsInvalid(Folder parent, string collectionType) private bool IsInvalid(Folder parent, string collectionType)

14
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -107,6 +107,18 @@
<Content Include="dashboard-ui\bower_components\fastclick\lib\fastclick.js"> <Content Include="dashboard-ui\bower_components\fastclick\lib\fastclick.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </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"> <Content Include="dashboard-ui\components\recordingcreator\recordingcreator.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -161,7 +173,7 @@
<Content Include="dashboard-ui\components\medialibraryeditor\medialibraryeditor.template.html"> <Content Include="dashboard-ui\components\medialibraryeditor\medialibraryeditor.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\metadataeditor\metadataeditor.js"> <Content Include="dashboard-ui\components\metadataeditor\personeditor.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\metadataeditor\metadataeditor.template.html"> <Content Include="dashboard-ui\components\metadataeditor\metadataeditor.template.html">