alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-03 23:36:38 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #7767 from 1337joe/prefer-embedded-extras-titles

Browse Source
This commit is contained in:
Bond-009
2022-12-11 20:31:03 +01:00
committed by GitHub
parent d34ded211e a74b8b99af
commit 8d8d0ee911
5 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@@ -1999,38 +1999,35 @@ namespace Emby.Server.Implementations.Library
public List<Folder> GetCollectionFolders(BaseItem item)
{
while (item is not null)
{
var parent = item.GetParent();
if (parent is null || parent is AggregateFolder)
{
break;
}
item = parent;
}
if (item is null)
{
return new List<Folder>();
}
return GetCollectionFoldersInternal(item, GetUserRootFolder().Children.OfType<Folder>());
return GetCollectionFolders(item, GetUserRootFolder().Children.OfType<Folder>());
}
public List<Folder> GetCollectionFolders(BaseItem item, List<Folder> allUserRootChildren)
public List<Folder> GetCollectionFolders(BaseItem item, IEnumerable<Folder> allUserRootChildren)
{
while (item is not null)
{
var parent = item.GetParent();
if (parent is null || parent is AggregateFolder)
if (parent is AggregateFolder)
{
break;
}
item = parent;
if (parent is null)
{
var owner = item.GetOwner();
if (owner is null)
{
break;
}
item = owner;
}
else
{
item = parent;
}
}
if (item is null)