alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

allow channel items in collections and playlists

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-01 16:29:24 -04:00
parent 8589689f65
commit 951e2b6de3
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -1149,29 +1149,19 @@ namespace MediaBrowser.Controller.Entities
return LinkedChildren
.Select(i =>
{
var requiresPostFilter = true;
if (!string.IsNullOrWhiteSpace(i.Path))
{
requiresPostFilter = false;
if (!locations.Any(l => FileSystem.ContainsSubPath(l, i.Path)))
{
return null;
}
}
var child = GetLinkedChild(i);
if (requiresPostFilter && child != null)
if (child != null)
{
if (string.IsNullOrWhiteSpace(child.Path))
var childLocationType = child.LocationType;
if (childLocationType == LocationType.Remote || childLocationType == LocationType.Virtual)
{
Logger.Debug("Found LinkedChild with null path: {0}", child.Name);
return child;
if (!child.IsVisibleStandalone(user))
{
return null;
}
}
if (!locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
else if (childLocationType == LocationType.FileSystem && !locations.Any(l => FileSystem.ContainsSubPath(l, child.Path)))
{
return null;
}