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

Removed grouping key for testing

Browse Source
This commit is contained in:
JPVenson
2024-11-16 23:33:04 +00:00
parent b6177363e9
commit 17e4485b94
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,24 +240,29 @@ public sealed class BaseItemRepository(
private IQueryable<BaseItemEntity> ApplyGroupingFilter(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
{
var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
{
dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).Select(e => e.First());
}
else if (enableGroupByPresentationUniqueKey)
{
dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).Select(e => e.First());
}
else if (filter.GroupBySeriesPresentationUniqueKey)
{
dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).Select(e => e.First());
}
else
{
dbQuery = dbQuery.Distinct();
dbQuery = ApplyOrder(dbQuery, filter);
}
// var enableGroupByPresentationUniqueKey = EnableGroupByPresentationUniqueKey(filter);
// if (enableGroupByPresentationUniqueKey && filter.GroupBySeriesPresentationUniqueKey)
// {
// dbQuery = ApplyOrder(dbQuery, filter);
// dbQuery = dbQuery.GroupBy(e => new { e.PresentationUniqueKey, e.SeriesPresentationUniqueKey }).Select(e => e.First());
// }
// else if (enableGroupByPresentationUniqueKey)
// {
// dbQuery = ApplyOrder(dbQuery, filter);
// dbQuery = dbQuery.GroupBy(e => e.PresentationUniqueKey).Select(e => e.First());
// }
// else if (filter.GroupBySeriesPresentationUniqueKey)
// {
// dbQuery = ApplyOrder(dbQuery, filter);
// dbQuery = dbQuery.GroupBy(e => e.SeriesPresentationUniqueKey).Select(e => e.First());
// }
// else
// {
// dbQuery = dbQuery.Distinct();
// dbQuery = ApplyOrder(dbQuery, filter);
// }
dbQuery = dbQuery.Distinct();
dbQuery = ApplyOrder(dbQuery, filter);
return dbQuery;
}
@@ -293,7 +298,7 @@ public sealed class BaseItemRepository(
private IQueryable<BaseItemEntity> PrepareItemQuery(JellyfinDbContext context, InternalItemsQuery filter)
{
IQueryable<BaseItemEntity> dbQuery = context.BaseItems.AsNoTracking().AsSingleQuery()
IQueryable<BaseItemEntity> dbQuery = context.BaseItems.AsNoTracking().AsSplitQuery()
.Include(e => e.TrailerTypes)
.Include(e => e.Provider)
.Include(e => e.LockedFields);