alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-06 14:22:55 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Add support for filtering boxsets by parentId (#16882)

Browse Source
This commit is contained in:
Bond-009
2026-05-21 19:32:39 +02:00
committed by GitHub
parent 40485aa2f6 9dfcc0918f
commit 4209b3ba51
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Jellyfin.Api/Controllers/ItemsController.cs
View File

@@ -280,10 +280,17 @@ public class ItemsController : BaseJellyfinApiController
var item = _libraryManager.GetParentItem(parentId, userId); var item = _libraryManager.GetParentItem(parentId, userId);
QueryResult<BaseItem> result; QueryResult<BaseItem> result;
Guid[] boxSetLinkedChildAncestorIds = [];
if (includeItemTypes.Length == 1 if (includeItemTypes.Length == 1
&& includeItemTypes[0] == BaseItemKind.BoxSet && includeItemTypes[0] == BaseItemKind.BoxSet
&& item is not BoxSet) && item is not BoxSet)
{ {
var isBoxSetsLibrary = item is IHasCollectionType hct && hct.CollectionType == CollectionType.boxsets;
if (parentId.HasValue && item is not UserRootFolder && !isBoxSetsLibrary)
{
boxSetLinkedChildAncestorIds = [parentId.Value];
}
parentId = null; parentId = null;
item = _libraryManager.GetUserRootFolder(); item = _libraryManager.GetUserRootFolder();
} }
@@ -405,6 +412,7 @@ public class ItemsController : BaseJellyfinApiController
MaxPremiereDate = maxPremiereDate?.ToUniversalTime(), MaxPremiereDate = maxPremiereDate?.ToUniversalTime(),
AudioLanguages = audioLanguages, AudioLanguages = audioLanguages,
SubtitleLanguages = subtitleLanguages, SubtitleLanguages = subtitleLanguages,
LinkedChildAncestorIds = boxSetLinkedChildAncestorIds,
}; };
if (ids.Length != 0 || !string.IsNullOrWhiteSpace(searchTerm)) if (ids.Length != 0 || !string.IsNullOrWhiteSpace(searchTerm))

9
Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
View File

@@ -1027,6 +1027,15 @@ public sealed partial class BaseItemRepository
baseQuery = baseQuery.Where(e => e.Parents!.AsQueryable().Any(ancestorFilter)); baseQuery = baseQuery.Where(e => e.Parents!.AsQueryable().Any(ancestorFilter));
} }
if (filter.LinkedChildAncestorIds.Length > 0)
{
// Keep folder-like items (BoxSets, Playlists) whose linked children descend from any of the requested ancestor ids.
var linkedChildAncestorIds = filter.LinkedChildAncestorIds;
baseQuery = baseQuery.Where(e => context.LinkedChildren.Any(lc =>
lc.ParentId == e.Id
&& lc.Child!.Parents!.Any(a => linkedChildAncestorIds.Contains(a.ParentItemId))));
}
if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey)) if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
{ {
baseQuery = baseQuery baseQuery = baseQuery

7
MediaBrowser.Controller/Entities/InternalItemsQuery.cs
View File

@@ -21,6 +21,7 @@ namespace MediaBrowser.Controller.Entities
AlbumArtistIds = []; AlbumArtistIds = [];
AlbumIds = []; AlbumIds = [];
AncestorIds = []; AncestorIds = [];
LinkedChildAncestorIds = [];
ArtistIds = []; ArtistIds = [];
BlockUnratedItems = []; BlockUnratedItems = [];
BoxSetLibraryFolders = []; BoxSetLibraryFolders = [];
@@ -265,6 +266,12 @@ namespace MediaBrowser.Controller.Entities
public Guid[] AncestorIds { get; set; } public Guid[] AncestorIds { get; set; }
/// <summary>
/// Gets or sets a list of ancestor ids that the item's linked children must descend from.
/// Useful for filtering BoxSets/Playlists to only those that contain items from a specific library.
/// </summary>
public Guid[] LinkedChildAncestorIds { get; set; }
public Guid[] TopParentIds { get; set; } public Guid[] TopParentIds { get; set; }
public CollectionType?[] PresetViews { get; set; } public CollectionType?[] PresetViews { get; set; }