The Free Software Media System - Server Backend & API
Merge remote-tracking branch 'upstream/master' into search-rebased
Shadowghostea8f6c51fd10
diff --cc Emby.Server.Implementations/ApplicationHost.csindex 1a745aa799,c81829688f..787eee654a--- a/Emby.Server.Implementations/ApplicationHost.cs+++ b/Emby.Server.Implementations/ApplicationHost.cs@@@ -25,7 -26,7 +26,8 @@@ using Emby.Server.Implementations.Dtousing Emby.Server.Implementations.HttpServer.Security;using Emby.Server.Implementations.IO;using Emby.Server.Implementations.Library;+using Emby.Server.Implementations.Library.Search;+ using Emby.Server.Implementations.Library.SimilarItems;using Emby.Server.Implementations.Localization;using Emby.Server.Implementations.Playlists;using Emby.Server.Implementations.Plugins;@@@ -537,8 -548,9 +549,10 @@@ namespace Emby.Server.ImplementationserviceCollection.AddSingleton<ILibraryMonitor, LibraryMonitor>();serviceCollection.AddSingleton<DotIgnoreIgnoreRule>();+ serviceCollection.AddSingleton<ISimilarItemsManager, SimilarItemsManager>();+- serviceCollection.AddSingleton<ISearchEngine, SearchEngine>();+ serviceCollection.AddSingleton<ISearchManager, SearchManager>();+ serviceCollection.AddSingleton<ISearchProvider, SqlSearchProvider>();serviceCollection.AddSingleton<IWebSocketManager, WebSocketManager>();@@@ -695,7 -707,8 +709,9 @@@GetExports<IExternalUrlProvider>());Resolve<IMediaSourceManager>().AddParts(GetExports<IMediaSourceProvider>());++ Resolve<ISimilarItemsManager>().AddParts(GetExports<ISimilarItemsProvider>());+ Resolve<ISearchManager>().AddParts(GetExports<ISearchProvider>());}/// <summary>diff --cc Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.csindex 93cc79ea9c,624b1b561c..bee1bf3f9d--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs@@@ -938,14 -959,31 +958,25 @@@ public sealed partial class BaseItemRepif (filter.HasAnyProviderId is not null && filter.HasAnyProviderId.Count > 0){- // Allow setting a null or empty value to get all items that have the specified provider set.- var includeAny = filter.HasAnyProviderId.Where(e => string.IsNullOrEmpty(e.Value)).Select(e => e.Key).ToArray();- if (includeAny.Length > 0)- {- baseQuery = baseQuery.Where(e => e.Provider!.Any(f => includeAny.Contains(f.ProviderId)));- }+ baseQuery = baseQuery.WhereHasAnyProviderId(filter.HasAnyProviderId);+ }- var includeSelected = filter.HasAnyProviderId.Where(e => !string.IsNullOrEmpty(e.Value)).Select(e => $"{e.Key}:{e.Value}").ToArray();- if (includeSelected.Length > 0)- {- baseQuery = baseQuery.Where(e => e.Provider!.Select(f => f.ProviderId + ":" + f.ProviderValue)!.Any(f => includeSelected.Contains(f)));- }+ if (filter.HasAnyProviderIds is not null && filter.HasAnyProviderIds.Count > 0)+ {+ baseQuery = baseQuery.WhereHasAnyProviderIds(filter.HasAnyProviderIds);}+ if (filter.HasAnyProviderIds is not null && filter.HasAnyProviderIds.Count > 0)+ {+ var includeAny = filter.HasAnyProviderIds+ .SelectMany(kvp => kvp.Value.Select(v => $"{kvp.Key}:{v}"))+ .ToArray();+ if (includeAny.Length > 0)+ {+ baseQuery = baseQuery.Where(e => e.Provider!.Select(f => f.ProviderId + ":" + f.ProviderValue)!.Any(f => includeAny.Contains(f)));+ }+ }+if (filter.HasImdbId.HasValue){baseQuery = filter.HasImdbId.Valuediff --cc MediaBrowser.Model/Configuration/MetadataPluginType.csindex d53a924ea0,476060ceef..dd9a599a29--- a/MediaBrowser.Model/Configuration/MetadataPluginType.cs+++ b/MediaBrowser.Model/Configuration/MetadataPluginType.cs@@@ -16,6 -16,7 +16,8 @@@ namespace MediaBrowser.Model.ConfiguratSubtitleFetcher,LyricFetcher,MediaSegmentProvider,+ LocalSimilarityProvider,- SimilarityProvider++ SimilarityProvider,+ SearchProvider}}