unkin/jellyfin-ha-src
4
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

Fix favorite filter performance

Browse Source
This commit is contained in:
Shadowghost
2026-07-24 22:37:23 +02:00
parent f2f66606d7
commit 766be1e8bb
6 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jellyfin.Server.Implementations/Item/BaseItemRepository.ByName.cs
+8 -13
View File
@@ -168,21 +168,16 @@ public sealed partial class BaseItemRepository
IsSeries = filter.IsSeries
});
// Resolve, then materialize, the set of clean values belonging to items that match the inner filter.
var matchingCleanValues = context.ItemValuesMap
.Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type))
.Join(
innerQueryFilter,
ivm => ivm.ItemId,
g => g.Id,
(ivm, g) => ivm.ItemValue.CleanValue)
.Distinct()
.ToList();
// Match CleanName against the resolved clean values.
var innerQuery = PrepareItemQuery(context, filter)
.Where(e => e.Type == returnType)
.WhereOneOrMany(matchingCleanValues, e => e.CleanName!);
.Where(e => context.ItemValuesMap
.Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type) && ivm.ItemValue.CleanValue == e.CleanName)
.Join(
innerQueryFilter,
ivm => ivm.ItemId,
g => g.Id,
(ivm, g) => ivm.ItemId)
.Any());
var outerQueryFilter = new InternalItemsQuery(filter.User)
{
Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
+24 -10
View File
@@ -434,20 +434,34 @@ public sealed partial class BaseItemRepository
if (filter.IsLiked.HasValue)
{
var isLiked = filter.IsLiked.Value;
baseQuery = baseQuery.Where(e => e.UserData!.Any(ud => ud.UserId == filter.User!.Id && ud.Rating >= UserItemData.MinLikeValue) == isLiked);
var likedIds = context.UserData
.Where(ud => ud.UserId == filter.User!.Id && ud.Rating >= UserItemData.MinLikeValue)
.Select(ud => ud.ItemId);
baseQuery = filter.IsLiked.Value
? baseQuery.Where(e => likedIds.Contains(e.Id))
: baseQuery.Where(e => !likedIds.Contains(e.Id));
}
if (filter.IsFavoriteOrLiked.HasValue)
if (filter.IsFavoriteOrLiked.HasValue || filter.IsFavorite.HasValue)
{
var isFavoriteOrLiked = filter.IsFavoriteOrLiked.Value;
baseQuery = baseQuery.Where(e => e.UserData!.Any(ud => ud.UserId == filter.User!.Id && ud.IsFavorite) == isFavoriteOrLiked);
}
var favoriteIds = context.UserData
.Where(ud => ud.UserId == filter.User!.Id && ud.IsFavorite)
.Select(ud => ud.ItemId);
if (filter.IsFavorite.HasValue)
{
var isFavorite = filter.IsFavorite.Value;
baseQuery = baseQuery.Where(e => e.UserData!.Any(ud => ud.UserId == filter.User!.Id && ud.IsFavorite) == isFavorite);
if (filter.IsFavoriteOrLiked.HasValue)
{
baseQuery = filter.IsFavoriteOrLiked.Value
? baseQuery.Where(e => favoriteIds.Contains(e.Id))
: baseQuery.Where(e => !favoriteIds.Contains(e.Id));
}
if (filter.IsFavorite.HasValue)
{
baseQuery = filter.IsFavorite.Value
? baseQuery.Where(e => favoriteIds.Contains(e.Id))
: baseQuery.Where(e => !favoriteIds.Contains(e.Id));
}
}
if (filter.IsPlayed.HasValue)