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 ExcludeItemId, ExcludeProviderIds and HasAnyProviderId filter (#14249)

Browse Source
This commit is contained in:
JPVenson 2025-06-09 04:53:18 +03:00 committed by GitHub
parent a8601b3797
commit 7aee5b1e70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2145,17 +2145,19 @@ public sealed class BaseItemRepository
if (filter.ExcludeItemIds.Length > 0) if (filter.ExcludeItemIds.Length > 0)
{ {
baseQuery = baseQuery baseQuery = baseQuery
.Where(e => !filter.ItemIds.Contains(e.Id)); .Where(e => !filter.ExcludeItemIds.Contains(e.Id));
} }
if (filter.ExcludeProviderIds is not null && filter.ExcludeProviderIds.Count > 0) if (filter.ExcludeProviderIds is not null && filter.ExcludeProviderIds.Count > 0)
{ {
baseQuery = baseQuery.Where(e => !e.Provider!.All(f => !filter.ExcludeProviderIds.All(w => f.ProviderId == w.Key && f.ProviderValue == w.Value))); var exclude = filter.ExcludeProviderIds.Select(e => $"{e.Key}:{e.Value}").ToArray();
baseQuery = baseQuery.Where(e => e.Provider!.Select(f => f.ProviderId + ":" + f.ProviderValue)!.All(f => !exclude.Contains(f)));
} }
if (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0) if (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0)
{ {
baseQuery = baseQuery.Where(e => e.Provider!.Any(f => !filter.HasAnyProviderId.Any(w => f.ProviderId == w.Key && f.ProviderValue == w.Value))); var include = filter.HasAnyProviderId.Select(e => $"{e.Key}:{e.Value}").ToArray();
baseQuery = baseQuery.Where(e => e.Provider!.Select(f => f.ProviderId + ":" + f.ProviderValue)!.Any(f => include.Contains(f)));
} }
if (filter.HasImdbId.HasValue) if (filter.HasImdbId.HasValue)