diff options
| author | JPVenson <github@jpb.email> | 2025-06-09 04:53:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-08 19:53:18 -0600 |
| commit | 7aee5b1e70a69072dd3d4d9c2b0ca90a370f53d8 (patch) | |
| tree | 8995bd55455ead6cbce7afe4f5dd528a0ffad848 | |
| parent | a8601b379775180599cb935236fba4e5a89ee89d (diff) | |
Fix ExcludeItemId, ExcludeProviderIds and HasAnyProviderId filter (#14249)
| -rw-r--r-- | Jellyfin.Server.Implementations/Item/BaseItemRepository.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs index 3efcb6dd3..0cffcfa02 100644 --- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs +++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs @@ -2145,17 +2145,19 @@ public sealed class BaseItemRepository if (filter.ExcludeItemIds.Length > 0) { 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) { - 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) { - 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) |