Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix seasons random (#13224) (#14335)

Browse Source 
Sorting was always enabled so removed the `enableSorting` parameter
in QueryResult method.

Co-authored-by: Maxime <>
This commit is contained in:
Bond-009 2025-07-04 19:18:38 +02:00 committed by GitHub
commit 5c36b44484
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,7 +695,7 @@ namespace MediaBrowser.Controller.Entities
items = GetRecursiveChildren(user, query); items = GetRecursiveChildren(user, query);
} }
return PostFilterAndSort(items, query, true); return PostFilterAndSort(items, query);
} }
if (this is not UserRootFolder if (this is not UserRootFolder
@ -959,10 +959,10 @@ namespace MediaBrowser.Controller.Entities
items = GetChildren(user, true, childQuery).Where(filter); items = GetChildren(user, true, childQuery).Where(filter);
} }
return PostFilterAndSort(items, query, true); return PostFilterAndSort(items, query);
} }
protected QueryResult<BaseItem> PostFilterAndSort(IEnumerable<BaseItem> items, InternalItemsQuery query, bool enableSorting) protected QueryResult<BaseItem> PostFilterAndSort(IEnumerable<BaseItem> items, InternalItemsQuery query)
{ {
var user = query.User; var user = query.User;
@ -995,7 +995,7 @@ namespace MediaBrowser.Controller.Entities
items = UserViewBuilder.FilterForAdjacency(items.ToList(), query.AdjacentTo.Value); items = UserViewBuilder.FilterForAdjacency(items.ToList(), query.AdjacentTo.Value);
} }
return UserViewBuilder.SortAndPage(items, null, query, LibraryManager, enableSorting); return UserViewBuilder.SortAndPage(items, null, query, LibraryManager);
} }
private static IEnumerable<BaseItem> CollapseBoxSetItemsIfNeeded( private static IEnumerable<BaseItem> CollapseBoxSetItemsIfNeeded(

2
MediaBrowser.Controller/Entities/TV/Season.cs
View File

@ -179,7 +179,7 @@ namespace MediaBrowser.Controller.Entities.TV
var items = GetEpisodes(user, query.DtoOptions, true).Where(filter); var items = GetEpisodes(user, query.DtoOptions, true).Where(filter);
return PostFilterAndSort(items, query, false); return PostFilterAndSort(items, query);
} }
/// <summary> /// <summary>

2
MediaBrowser.Controller/Entities/UserRootFolder.cs
View File

@ -80,7 +80,7 @@ namespace MediaBrowser.Controller.Entities
PresetViews = query.PresetViews PresetViews = query.PresetViews
}); });
return UserViewBuilder.SortAndPage(result, null, query, LibraryManager, true); return UserViewBuilder.SortAndPage(result, null, query, LibraryManager);
} }
public override int GetChildCount(User user) public override int GetChildCount(User user)

12
MediaBrowser.Controller/Entities/UserViewBuilder.cs
View File

@ -438,22 +438,18 @@ namespace MediaBrowser.Controller.Entities
items = FilterForAdjacency(items.ToList(), query.AdjacentTo.Value); items = FilterForAdjacency(items.ToList(), query.AdjacentTo.Value);
} }
return SortAndPage(items, totalRecordLimit, query, libraryManager, true); return SortAndPage(items, totalRecordLimit, query, libraryManager);
} }
public static QueryResult<BaseItem> SortAndPage( public static QueryResult<BaseItem> SortAndPage(
IEnumerable<BaseItem> items, IEnumerable<BaseItem> items,
int? totalRecordLimit, int? totalRecordLimit,
InternalItemsQuery query, InternalItemsQuery query,
ILibraryManager libraryManager, ILibraryManager libraryManager)
bool enableSorting)
{ {
if (enableSorting) if (query.OrderBy.Count > 0)
{ {
if (query.OrderBy.Count > 0) items = libraryManager.Sort(items, query.User, query.OrderBy);
{
items = libraryManager.Sort(items, query.User, query.OrderBy);
}
} }
var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray(); var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray();