mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-07 03:48:06 +02:00
commit
fe882b46e7
3 changed files with 35 additions and 2 deletions
|
@ -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)
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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">
|
||||||
|
|
Loading…
Reference in a new issue