| | | 1 | | using System; |
| | | 2 | | using System.Collections.Generic; |
| | | 3 | | using System.Linq; |
| | | 4 | | using System.Threading; |
| | | 5 | | using System.Threading.Tasks; |
| | | 6 | | using Jellyfin.Data.Enums; |
| | | 7 | | using Jellyfin.Database.Implementations; |
| | | 8 | | using Jellyfin.Database.Implementations.Entities; |
| | | 9 | | using Jellyfin.Extensions; |
| | | 10 | | using MediaBrowser.Controller.Dto; |
| | | 11 | | using MediaBrowser.Controller.Entities; |
| | | 12 | | using MediaBrowser.Controller.Library; |
| | | 13 | | using MediaBrowser.Controller.Persistence; |
| | | 14 | | using MediaBrowser.Model.Querying; |
| | | 15 | | using MediaBrowser.Model.Search; |
| | | 16 | | using Microsoft.EntityFrameworkCore; |
| | | 17 | | using Microsoft.Extensions.Logging; |
| | | 18 | | |
| | | 19 | | namespace Emby.Server.Implementations.Library.Search; |
| | | 20 | | |
| | | 21 | | /// <summary> |
| | | 22 | | /// Manages search providers and orchestrates search operations. |
| | | 23 | | /// </summary> |
| | | 24 | | public class SearchManager : ISearchManager |
| | | 25 | | { |
| | | 26 | | private readonly ILibraryManager _libraryManager; |
| | | 27 | | private readonly IUserManager _userManager; |
| | | 28 | | private readonly IDbContextFactory<JellyfinDbContext> _dbProvider; |
| | | 29 | | private readonly IItemQueryHelpers _queryHelpers; |
| | | 30 | | private readonly ILogger<SearchManager> _logger; |
| | 22 | 31 | | private IExternalSearchProvider[] _externalProviders = []; |
| | 22 | 32 | | private IInternalSearchProvider[] _internalProviders = []; |
| | | 33 | | |
| | | 34 | | /// <summary> |
| | | 35 | | /// Initializes a new instance of the <see cref="SearchManager"/> class. |
| | | 36 | | /// </summary> |
| | | 37 | | /// <param name="libraryManager">The library manager.</param> |
| | | 38 | | /// <param name="userManager">The user manager.</param> |
| | | 39 | | /// <param name="dbProvider">The database context factory.</param> |
| | | 40 | | /// <param name="queryHelpers">The shared item query helpers.</param> |
| | | 41 | | /// <param name="logger">The logger.</param> |
| | | 42 | | public SearchManager( |
| | | 43 | | ILibraryManager libraryManager, |
| | | 44 | | IUserManager userManager, |
| | | 45 | | IDbContextFactory<JellyfinDbContext> dbProvider, |
| | | 46 | | IItemQueryHelpers queryHelpers, |
| | | 47 | | ILogger<SearchManager> logger) |
| | | 48 | | { |
| | 22 | 49 | | _libraryManager = libraryManager; |
| | 22 | 50 | | _userManager = userManager; |
| | 22 | 51 | | _dbProvider = dbProvider; |
| | 22 | 52 | | _queryHelpers = queryHelpers; |
| | 22 | 53 | | _logger = logger; |
| | 22 | 54 | | } |
| | | 55 | | |
| | | 56 | | /// <inheritdoc/> |
| | | 57 | | public void AddParts(IEnumerable<ISearchProvider> providers) |
| | | 58 | | { |
| | 22 | 59 | | var allProviders = providers.OrderBy(p => p.Priority).ToArray(); |
| | | 60 | | |
| | 22 | 61 | | _externalProviders = allProviders.OfType<IExternalSearchProvider>().ToArray(); |
| | 22 | 62 | | _internalProviders = allProviders.OfType<IInternalSearchProvider>().ToArray(); |
| | | 63 | | |
| | 22 | 64 | | _logger.LogInformation( |
| | 22 | 65 | | "Registered {ExternalCount} external search providers: {ExternalProviders}. Fallback providers: {FallbackPro |
| | 22 | 66 | | _externalProviders.Length, |
| | 22 | 67 | | string.Join(", ", _externalProviders.Select(p => $"{p.Name} (priority {p.Priority})")), |
| | 22 | 68 | | string.Join(", ", _internalProviders.Select(p => $"{p.Name} (priority {p.Priority})"))); |
| | 22 | 69 | | } |
| | | 70 | | |
| | | 71 | | /// <inheritdoc/> |
| | | 72 | | public IReadOnlyList<ISearchProvider> GetProviders() |
| | | 73 | | { |
| | 0 | 74 | | return [.. _externalProviders, .. _internalProviders]; |
| | | 75 | | } |
| | | 76 | | |
| | | 77 | | /// <inheritdoc/> |
| | | 78 | | public async Task<IReadOnlyList<SearchResult>> GetSearchResultsAsync( |
| | | 79 | | SearchProviderQuery query, |
| | | 80 | | CancellationToken cancellationToken = default) |
| | | 81 | | { |
| | 0 | 82 | | ArgumentNullException.ThrowIfNull(query); |
| | 0 | 83 | | ArgumentException.ThrowIfNullOrWhiteSpace(query.SearchTerm); |
| | | 84 | | |
| | 0 | 85 | | var searchTerm = query.SearchTerm.Trim().RemoveDiacritics(); |
| | | 86 | | |
| | 0 | 87 | | var externalTask = CollectFromProvidersAsync(_externalProviders, query, searchTerm, cancellationToken); |
| | 0 | 88 | | var internalTask = _internalProviders.Length > 0 |
| | 0 | 89 | | ? CollectFromProvidersAsync(_internalProviders, query, searchTerm, cancellationToken) |
| | 0 | 90 | | : Task.FromResult<IReadOnlyList<SearchResult>>([]); |
| | | 91 | | |
| | 0 | 92 | | await Task.WhenAll(externalTask, internalTask).ConfigureAwait(false); |
| | | 93 | | |
| | 0 | 94 | | var externalResults = await externalTask.ConfigureAwait(false); |
| | | 95 | | |
| | | 96 | | // Internal providers apply user-access filtering inline in their queries. External |
| | | 97 | | // providers don't know about user permissions, so they may return IDs from hidden |
| | | 98 | | // libraries or items the user is otherwise blocked from. Filter them here to close |
| | | 99 | | // that gap. The Items controller's second roundtrip via folder.GetItems applies most |
| | | 100 | | // of these again, but it does not restrict by TopParentIds when ItemIds is set. |
| | 0 | 101 | | if (externalResults.Count > 0 && query.UserId.HasValue && !query.UserId.Value.IsEmpty()) |
| | | 102 | | { |
| | 0 | 103 | | var user = _userManager.GetUserById(query.UserId.Value); |
| | 0 | 104 | | if (user is not null) |
| | | 105 | | { |
| | 0 | 106 | | externalResults = await FilterByUserAccessAsync(externalResults, user, query, cancellationToken).Configu |
| | | 107 | | } |
| | | 108 | | } |
| | | 109 | | |
| | 0 | 110 | | if (externalResults.Count > 0) |
| | | 111 | | { |
| | 0 | 112 | | return externalResults; |
| | | 113 | | } |
| | | 114 | | |
| | 0 | 115 | | var internalResults = await internalTask.ConfigureAwait(false); |
| | 0 | 116 | | if (_internalProviders.Length > 0) |
| | | 117 | | { |
| | 0 | 118 | | _logger.LogDebug("No results from external providers, using internal provider results"); |
| | | 119 | | } |
| | | 120 | | |
| | 0 | 121 | | return internalResults; |
| | 0 | 122 | | } |
| | | 123 | | |
| | | 124 | | private async Task<IReadOnlyList<SearchResult>> FilterByUserAccessAsync( |
| | | 125 | | IReadOnlyList<SearchResult> candidates, |
| | | 126 | | User user, |
| | | 127 | | SearchProviderQuery query, |
| | | 128 | | CancellationToken cancellationToken) |
| | | 129 | | { |
| | | 130 | | // SetUser populates parental rating + blocked/allowed tags, Build populates TopParentIds |
| | | 131 | | // for the user's accessible libraries. The candidate ids are applied to the query below |
| | | 132 | | // rather than to the filter because LibraryManager.AddUserToQuery skips TopParentIds when |
| | | 133 | | // ItemIds is non-empty. |
| | 0 | 134 | | var accessFilter = SearchQueryAccessFilter.Build(user, query, _libraryManager); |
| | | 135 | | |
| | 0 | 136 | | Guid[] candidateIds = [.. candidates.Select(c => c.ItemId)]; |
| | | 137 | | |
| | 0 | 138 | | var dbContext = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false); |
| | 0 | 139 | | await using (dbContext.ConfigureAwait(false)) |
| | | 140 | | { |
| | 0 | 141 | | var baseQuery = dbContext.BaseItems |
| | 0 | 142 | | .AsNoTracking() |
| | 0 | 143 | | .WhereOneOrMany(candidateIds, e => e.Id); |
| | | 144 | | |
| | 0 | 145 | | baseQuery = _queryHelpers.ApplyAccessFiltering(dbContext, baseQuery, accessFilter); |
| | | 146 | | |
| | 0 | 147 | | var allowedCount = await baseQuery.CountAsync(cancellationToken).ConfigureAwait(false); |
| | 0 | 148 | | if (allowedCount == candidates.Count) |
| | | 149 | | { |
| | 0 | 150 | | return candidates; |
| | | 151 | | } |
| | | 152 | | |
| | 0 | 153 | | var allowedIds = await baseQuery |
| | 0 | 154 | | .Select(e => e.Id) |
| | 0 | 155 | | .ToHashSetAsync(cancellationToken) |
| | 0 | 156 | | .ConfigureAwait(false); |
| | | 157 | | |
| | 0 | 158 | | var filtered = candidates.Where(c => allowedIds.Contains(c.ItemId)).ToList(); |
| | 0 | 159 | | if (filtered.Count < candidates.Count) |
| | | 160 | | { |
| | 0 | 161 | | _logger.LogDebug( |
| | 0 | 162 | | "Dropped {Dropped} of {Total} search candidates due to user access filtering", |
| | 0 | 163 | | candidates.Count - filtered.Count, |
| | 0 | 164 | | candidates.Count); |
| | | 165 | | } |
| | | 166 | | |
| | 0 | 167 | | return filtered; |
| | | 168 | | } |
| | 0 | 169 | | } |
| | | 170 | | |
| | | 171 | | /// <inheritdoc/> |
| | | 172 | | public async Task<QueryResult<SearchHintInfo>> GetSearchHintsAsync(SearchQuery query, CancellationToken cancellation |
| | | 173 | | { |
| | 0 | 174 | | ArgumentNullException.ThrowIfNull(query); |
| | 0 | 175 | | ArgumentException.ThrowIfNullOrWhiteSpace(query.SearchTerm); |
| | | 176 | | |
| | 0 | 177 | | var providerQuery = BuildProviderQuery(query); |
| | 0 | 178 | | var candidates = await GetSearchResultsAsync(providerQuery, cancellationToken).ConfigureAwait(false); |
| | 0 | 179 | | if (candidates.Count == 0) |
| | | 180 | | { |
| | 0 | 181 | | return new QueryResult<SearchHintInfo>(); |
| | | 182 | | } |
| | | 183 | | |
| | 0 | 184 | | var candidateScores = BuildScoreLookup(candidates); |
| | 0 | 185 | | var user = query.UserId.IsEmpty() ? null : _userManager.GetUserById(query.UserId); |
| | | 186 | | |
| | 0 | 187 | | var excludeItemTypes = BuildExcludeItemTypes(query); |
| | 0 | 188 | | var includeItemTypes = BuildIncludeItemTypes(query); |
| | | 189 | | |
| | 0 | 190 | | var internalQuery = new InternalItemsQuery(user) |
| | 0 | 191 | | { |
| | 0 | 192 | | ItemIds = candidateScores.Keys.ToArray(), |
| | 0 | 193 | | ExcludeItemTypes = excludeItemTypes.ToArray(), |
| | 0 | 194 | | IncludeItemTypes = includeItemTypes.Count > 0 ? includeItemTypes.ToArray() : [], |
| | 0 | 195 | | MediaTypes = query.MediaTypes.ToArray(), |
| | 0 | 196 | | IncludeItemsByName = !query.ParentId.HasValue, |
| | 0 | 197 | | ParentId = query.ParentId ?? Guid.Empty, |
| | 0 | 198 | | Recursive = true, |
| | 0 | 199 | | IsKids = query.IsKids, |
| | 0 | 200 | | IsMovie = query.IsMovie, |
| | 0 | 201 | | IsNews = query.IsNews, |
| | 0 | 202 | | IsSeries = query.IsSeries, |
| | 0 | 203 | | IsSports = query.IsSports, |
| | 0 | 204 | | DtoOptions = new DtoOptions |
| | 0 | 205 | | { |
| | 0 | 206 | | Fields = |
| | 0 | 207 | | [ |
| | 0 | 208 | | ItemFields.AirTime, |
| | 0 | 209 | | ItemFields.DateCreated, |
| | 0 | 210 | | ItemFields.ChannelInfo, |
| | 0 | 211 | | ItemFields.ParentId |
| | 0 | 212 | | ] |
| | 0 | 213 | | } |
| | 0 | 214 | | }; |
| | | 215 | | |
| | | 216 | | // MusicArtist items are "ItemsByName" entities - virtual items that aggregate content by artist name |
| | | 217 | | // rather than being stored as regular library items. They require special handling: |
| | | 218 | | // 1. Convert ParentId to AncestorIds (to filter by library folder) |
| | | 219 | | // 2. Set IncludeItemsByName = true (to include these virtual items in results) |
| | | 220 | | // 3. Clear IncludeItemTypes (GetAllArtists handles type filtering internally) |
| | | 221 | | // 4. Use GetAllArtists() instead of GetItemList() to query the artist index |
| | | 222 | | IReadOnlyList<BaseItem> items; |
| | 0 | 223 | | if (internalQuery.IncludeItemTypes.Length == 1 && internalQuery.IncludeItemTypes[0] == BaseItemKind.MusicArtist) |
| | | 224 | | { |
| | 0 | 225 | | if (!internalQuery.ParentId.IsEmpty()) |
| | | 226 | | { |
| | 0 | 227 | | internalQuery.AncestorIds = [internalQuery.ParentId]; |
| | 0 | 228 | | internalQuery.ParentId = Guid.Empty; |
| | | 229 | | } |
| | | 230 | | |
| | 0 | 231 | | internalQuery.IncludeItemsByName = true; |
| | 0 | 232 | | internalQuery.IncludeItemTypes = []; |
| | 0 | 233 | | items = _libraryManager.GetAllArtists(internalQuery).Items.Select(i => i.Item).ToList(); |
| | | 234 | | } |
| | | 235 | | else |
| | | 236 | | { |
| | 0 | 237 | | items = _libraryManager.GetItemList(internalQuery); |
| | | 238 | | } |
| | | 239 | | |
| | 0 | 240 | | var orderedResults = items |
| | 0 | 241 | | .Select(item => new SearchHintInfo { Item = item }) |
| | 0 | 242 | | .OrderByDescending(hint => candidateScores.GetValueOrDefault(hint.Item.Id, 0f)) |
| | 0 | 243 | | .ToList(); |
| | | 244 | | |
| | 0 | 245 | | var totalCount = orderedResults.Count; |
| | | 246 | | |
| | 0 | 247 | | if (query.StartIndex.HasValue) |
| | | 248 | | { |
| | 0 | 249 | | orderedResults = orderedResults.Skip(query.StartIndex.Value).ToList(); |
| | | 250 | | } |
| | | 251 | | |
| | 0 | 252 | | if (query.Limit.HasValue) |
| | | 253 | | { |
| | 0 | 254 | | orderedResults = orderedResults.Take(query.Limit.Value).ToList(); |
| | | 255 | | } |
| | | 256 | | |
| | 0 | 257 | | return new QueryResult<SearchHintInfo>(query.StartIndex, totalCount, orderedResults); |
| | 0 | 258 | | } |
| | | 259 | | |
| | | 260 | | private async Task<IReadOnlyList<SearchResult>> CollectFromProvidersAsync( |
| | | 261 | | IEnumerable<ISearchProvider> providers, |
| | | 262 | | SearchProviderQuery providerQuery, |
| | | 263 | | string searchTerm, |
| | | 264 | | CancellationToken cancellationToken) |
| | | 265 | | { |
| | 0 | 266 | | var requestedLimit = providerQuery.Limit ?? 100; |
| | 0 | 267 | | var applicable = providers.Where(p => p.CanSearch(providerQuery)).ToArray(); |
| | 0 | 268 | | if (applicable.Length == 0) |
| | | 269 | | { |
| | 0 | 270 | | return []; |
| | | 271 | | } |
| | | 272 | | |
| | 0 | 273 | | var perProvider = await Task.WhenAll( |
| | 0 | 274 | | applicable.Select(p => CollectFromProviderAsync(p, providerQuery, searchTerm, requestedLimit, cancellationTo |
| | 0 | 275 | | .ConfigureAwait(false); |
| | | 276 | | |
| | 0 | 277 | | var bestScores = new Dictionary<Guid, float>(); |
| | 0 | 278 | | foreach (var providerResults in perProvider) |
| | | 279 | | { |
| | 0 | 280 | | foreach (var result in providerResults) |
| | | 281 | | { |
| | 0 | 282 | | UpdateBestScore(bestScores, result); |
| | | 283 | | } |
| | | 284 | | } |
| | | 285 | | |
| | 0 | 286 | | return bestScores |
| | 0 | 287 | | .Select(kvp => new SearchResult(kvp.Key, kvp.Value)) |
| | 0 | 288 | | .OrderByDescending(r => r.Score) |
| | 0 | 289 | | .Take(requestedLimit) |
| | 0 | 290 | | .ToList(); |
| | 0 | 291 | | } |
| | | 292 | | |
| | | 293 | | private async Task<IReadOnlyList<SearchResult>> CollectFromProviderAsync( |
| | | 294 | | ISearchProvider provider, |
| | | 295 | | SearchProviderQuery providerQuery, |
| | | 296 | | string searchTerm, |
| | | 297 | | int requestedLimit, |
| | | 298 | | CancellationToken cancellationToken) |
| | | 299 | | { |
| | | 300 | | try |
| | | 301 | | { |
| | 0 | 302 | | var results = provider is IExternalSearchProvider externalProvider |
| | 0 | 303 | | ? await CollectFromExternalProviderAsync(externalProvider, providerQuery, requestedLimit, cancellationTo |
| | 0 | 304 | | : await provider.SearchAsync(providerQuery, cancellationToken).ConfigureAwait(false); |
| | | 305 | | |
| | 0 | 306 | | _logger.LogDebug( |
| | 0 | 307 | | "Provider {Provider} returned {Count} candidates for search term '{SearchTerm}'", |
| | 0 | 308 | | provider.Name, |
| | 0 | 309 | | results.Count, |
| | 0 | 310 | | searchTerm); |
| | 0 | 311 | | return results; |
| | | 312 | | } |
| | 0 | 313 | | catch (Exception ex) |
| | | 314 | | { |
| | 0 | 315 | | _logger.LogWarning(ex, "Search provider {Provider} failed for term '{SearchTerm}'", provider.Name, searchTer |
| | 0 | 316 | | return []; |
| | | 317 | | } |
| | 0 | 318 | | } |
| | | 319 | | |
| | | 320 | | private static async Task<IReadOnlyList<SearchResult>> CollectFromExternalProviderAsync( |
| | | 321 | | IExternalSearchProvider provider, |
| | | 322 | | SearchProviderQuery providerQuery, |
| | | 323 | | int requestedLimit, |
| | | 324 | | CancellationToken cancellationToken) |
| | | 325 | | { |
| | 0 | 326 | | var results = new List<SearchResult>(); |
| | 0 | 327 | | await foreach (var result in provider.SearchAsync(providerQuery, cancellationToken).ConfigureAwait(false)) |
| | | 328 | | { |
| | 0 | 329 | | results.Add(result); |
| | 0 | 330 | | if (results.Count >= requestedLimit) |
| | | 331 | | { |
| | | 332 | | break; |
| | | 333 | | } |
| | | 334 | | } |
| | | 335 | | |
| | 0 | 336 | | return results; |
| | 0 | 337 | | } |
| | | 338 | | |
| | | 339 | | private static void UpdateBestScore(Dictionary<Guid, float> bestScores, SearchResult result) |
| | | 340 | | { |
| | 0 | 341 | | if (!bestScores.TryGetValue(result.ItemId, out var existingScore) || result.Score > existingScore) |
| | | 342 | | { |
| | 0 | 343 | | bestScores[result.ItemId] = result.Score; |
| | | 344 | | } |
| | 0 | 345 | | } |
| | | 346 | | |
| | | 347 | | private static Dictionary<Guid, float> BuildScoreLookup(IReadOnlyList<SearchResult> results) |
| | | 348 | | { |
| | 0 | 349 | | var lookup = new Dictionary<Guid, float>(results.Count); |
| | 0 | 350 | | foreach (var result in results) |
| | | 351 | | { |
| | 0 | 352 | | lookup[result.ItemId] = result.Score; |
| | | 353 | | } |
| | | 354 | | |
| | 0 | 355 | | return lookup; |
| | | 356 | | } |
| | | 357 | | |
| | | 358 | | private static SearchProviderQuery BuildProviderQuery(SearchQuery query) |
| | | 359 | | { |
| | 0 | 360 | | var excludeItemTypes = BuildExcludeItemTypes(query); |
| | 0 | 361 | | var includeItemTypes = BuildIncludeItemTypes(query); |
| | | 362 | | |
| | | 363 | | // Remove any excluded types from includes |
| | 0 | 364 | | if (includeItemTypes.Count > 0 && excludeItemTypes.Count > 0) |
| | | 365 | | { |
| | 0 | 366 | | includeItemTypes.RemoveAll(excludeItemTypes.Contains); |
| | | 367 | | } |
| | | 368 | | |
| | 0 | 369 | | return new SearchProviderQuery |
| | 0 | 370 | | { |
| | 0 | 371 | | SearchTerm = query.SearchTerm, |
| | 0 | 372 | | UserId = query.UserId.IsEmpty() ? null : query.UserId, |
| | 0 | 373 | | IncludeItemTypes = includeItemTypes.ToArray(), |
| | 0 | 374 | | ExcludeItemTypes = excludeItemTypes.ToArray(), |
| | 0 | 375 | | MediaTypes = query.MediaTypes.ToArray(), |
| | 0 | 376 | | Limit = query.Limit, |
| | 0 | 377 | | ParentId = query.ParentId |
| | 0 | 378 | | }; |
| | | 379 | | } |
| | | 380 | | |
| | | 381 | | private static List<BaseItemKind> BuildExcludeItemTypes(SearchQuery query) |
| | | 382 | | { |
| | 0 | 383 | | var excludeItemTypes = query.ExcludeItemTypes.ToList(); |
| | | 384 | | |
| | 0 | 385 | | excludeItemTypes.Add(BaseItemKind.Year); |
| | 0 | 386 | | excludeItemTypes.Add(BaseItemKind.Folder); |
| | 0 | 387 | | excludeItemTypes.Add(BaseItemKind.CollectionFolder); |
| | | 388 | | |
| | 0 | 389 | | if (!query.IncludeGenres) |
| | | 390 | | { |
| | 0 | 391 | | AddIfMissing(excludeItemTypes, BaseItemKind.Genre); |
| | 0 | 392 | | AddIfMissing(excludeItemTypes, BaseItemKind.MusicGenre); |
| | | 393 | | } |
| | | 394 | | |
| | 0 | 395 | | if (!query.IncludePeople) |
| | | 396 | | { |
| | 0 | 397 | | AddIfMissing(excludeItemTypes, BaseItemKind.Person); |
| | | 398 | | } |
| | | 399 | | |
| | 0 | 400 | | if (!query.IncludeStudios) |
| | | 401 | | { |
| | 0 | 402 | | AddIfMissing(excludeItemTypes, BaseItemKind.Studio); |
| | | 403 | | } |
| | | 404 | | |
| | 0 | 405 | | if (!query.IncludeArtists) |
| | | 406 | | { |
| | 0 | 407 | | AddIfMissing(excludeItemTypes, BaseItemKind.MusicArtist); |
| | | 408 | | } |
| | | 409 | | |
| | 0 | 410 | | return excludeItemTypes; |
| | | 411 | | } |
| | | 412 | | |
| | | 413 | | private static List<BaseItemKind> BuildIncludeItemTypes(SearchQuery query) |
| | | 414 | | { |
| | 0 | 415 | | var includeItemTypes = query.IncludeItemTypes.ToList(); |
| | 0 | 416 | | if (query.IncludeMedia) |
| | | 417 | | { |
| | 0 | 418 | | return includeItemTypes; |
| | | 419 | | } |
| | | 420 | | |
| | 0 | 421 | | if (query.IncludeGenres && IsEmptyOrContains(includeItemTypes, BaseItemKind.Genre)) |
| | | 422 | | { |
| | 0 | 423 | | AddIfMissing(includeItemTypes, BaseItemKind.Genre); |
| | 0 | 424 | | AddIfMissing(includeItemTypes, BaseItemKind.MusicGenre); |
| | | 425 | | } |
| | | 426 | | |
| | 0 | 427 | | if (query.IncludePeople && IsEmptyOrContains(includeItemTypes, BaseItemKind.Person)) |
| | | 428 | | { |
| | 0 | 429 | | AddIfMissing(includeItemTypes, BaseItemKind.Person); |
| | | 430 | | } |
| | | 431 | | |
| | 0 | 432 | | if (query.IncludeStudios && IsEmptyOrContains(includeItemTypes, BaseItemKind.Studio)) |
| | | 433 | | { |
| | 0 | 434 | | AddIfMissing(includeItemTypes, BaseItemKind.Studio); |
| | | 435 | | } |
| | | 436 | | |
| | 0 | 437 | | if (query.IncludeArtists && IsEmptyOrContains(includeItemTypes, BaseItemKind.MusicArtist)) |
| | | 438 | | { |
| | 0 | 439 | | AddIfMissing(includeItemTypes, BaseItemKind.MusicArtist); |
| | | 440 | | } |
| | | 441 | | |
| | 0 | 442 | | return includeItemTypes; |
| | | 443 | | } |
| | | 444 | | |
| | | 445 | | private static bool IsEmptyOrContains(List<BaseItemKind> list, BaseItemKind value) |
| | 0 | 446 | | => list.Count == 0 || list.Contains(value); |
| | | 447 | | |
| | | 448 | | private static void AddIfMissing(List<BaseItemKind> list, BaseItemKind value) |
| | | 449 | | { |
| | 0 | 450 | | if (!list.Contains(value)) |
| | | 451 | | { |
| | 0 | 452 | | list.Add(value); |
| | | 453 | | } |
| | 0 | 454 | | } |
| | | 455 | | } |