alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-18 13:40:45 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Cleanup and fix version ordering

Browse Source
This commit is contained in:
Shadowghost
2026-02-09 00:45:48 +01:00
parent 0a99a78ddc
commit edc6caf255
4 changed files with 49 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -730,7 +730,7 @@ namespace MediaBrowser.Controller.Entities
public QueryResult<BaseItem> QueryRecursive(InternalItemsQuery query)
{
if (!query.ForceDirect && RequiresPostFiltering(query))
if (!query.ForceDirect && CollapseBoxSetItems(query, this, query.User, ConfigurationManager))
{
query.CollapseBoxSetItems = true;
SetCollapseBoxSetItemTypes(query);
@@ -743,15 +743,15 @@ namespace MediaBrowser.Controller.Entities
query.Parent = this;
}
if (RequiresPostFiltering2(query))
if (query.IncludeItemTypes.Length == 1 && query.IncludeItemTypes[0] == BaseItemKind.BoxSet)
{
return QueryWithPostFiltering2(query);
return QueryWithPostFiltering(query);
}
return LibraryManager.GetItemsResult(query);
}
protected QueryResult<BaseItem> QueryWithPostFiltering2(InternalItemsQuery query)
protected QueryResult<BaseItem> QueryWithPostFiltering(InternalItemsQuery query)
{
var startIndex = query.StartIndex;
var limit = query.Limit;
@@ -797,28 +797,6 @@ namespace MediaBrowser.Controller.Entities
returnItems.ToArray());
}
private bool RequiresPostFiltering2(InternalItemsQuery query)
{
if (query.IncludeItemTypes.Length == 1 && query.IncludeItemTypes[0] == BaseItemKind.BoxSet)
{
Logger.LogDebug("Query requires post-filtering due to BoxSet query");
return true;
}
return false;
}
private bool RequiresPostFiltering(InternalItemsQuery query)
{
if (CollapseBoxSetItems(query, this, query.User, ConfigurationManager))
{
Logger.LogDebug("Query requires post-filtering due to CollapseBoxSetItems");
return true;
}
return false;
}
private static BaseItem[] SortItemsByRequest(InternalItemsQuery query, IReadOnlyList<BaseItem> items)
{
return items.OrderBy(i => Array.IndexOf(query.ItemIds, i.Id)).ToArray();