starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 14:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixes #14952 apply sort on ItemValue query

Browse Source
This commit is contained in:
JPVenson
2025-10-10 09:10:21 +00:00
parent e876e784da
commit a7a92509c7
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
View File

@@ -1232,8 +1232,21 @@ public sealed class BaseItemRepository
ExcludeItemIds = filter.ExcludeItemIds
};
var query = TranslateQuery(innerQuery, context, outerQueryFilter)
.GroupBy(e => e.PresentationUniqueKey);
var masterQuery = TranslateQuery(innerQuery, context, outerQueryFilter)
.GroupBy(e => e.PresentationUniqueKey)
.Select(e => e.FirstOrDefault())
.Select(e => e!.Id);
var query = context.BaseItems
.AsQueryable()
.Include(e => e.TrailerTypes)
.Include(e => e.Provider)
.Include(e => e.LockedFields)
.Include(e => e.Images)
.AsSingleQuery()
.Where(e => masterQuery.Contains(e.Id));
ApplyOrder(query, filter);
var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
if (filter.EnableTotalRecordCount)
@@ -1288,12 +1301,7 @@ public sealed class BaseItemRepository
var resultQuery = query.Select(e => new
{
item = e.AsQueryable()
.Include(e => e.TrailerTypes)
.Include(e => e.Provider)
.Include(e => e.LockedFields)
.Include(e => e.Images)
.AsSingleQuery().First(),
item = e,
// TODO: This is bad refactor!
itemCount = new ItemCounts()
{
@@ -1325,13 +1333,6 @@ public sealed class BaseItemRepository
result.Items =
[
.. query
.Select(e => e.AsQueryable()
.Include(e => e.TrailerTypes)
.Include(e => e.Provider)
.Include(e => e.LockedFields)
.Include(e => e.Images)
.AsSingleQuery()
.First())
.AsEnumerable()
.Where(e => e is not null)
.Select<BaseItemEntity, (BaseItemDto, ItemCounts?)>(e =>