lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1205 from softworkz/AggregateRemoteSearch

Browse Source 
Remote-Search: Allow result aggregation of multiple providers
This commit is contained in:
Luke 2015-09-30 22:06:13 -04:00
commit ec7e90bcb7
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Providers/Manager/ProviderManager.cs
View File

@ -727,6 +727,8 @@ namespace MediaBrowser.Providers.Manager
where TItemType : BaseItem, new() where TItemType : BaseItem, new()
where TLookupType : ItemLookupInfo where TLookupType : ItemLookupInfo
{ {
const int maxResults = 10;
// Give it a dummy path just so that it looks like a file system item // Give it a dummy path just so that it looks like a file system item
var dummy = new TItemType var dummy = new TItemType
{ {
@ -755,6 +757,8 @@ namespace MediaBrowser.Providers.Manager
searchInfo.SearchInfo.MetadataCountryCode = ConfigurationManager.Configuration.MetadataCountryCode; searchInfo.SearchInfo.MetadataCountryCode = ConfigurationManager.Configuration.MetadataCountryCode;
} }
var resultList = new List<RemoteSearchResult>();
foreach (var provider in providers) foreach (var provider in providers)
{ {
try try
@ -765,7 +769,12 @@ namespace MediaBrowser.Providers.Manager
if (list.Count > 0) if (list.Count > 0)
{ {
return list.Take(10); resultList.AddRange(list.Take(maxResults - resultList.Count));
}
if (resultList.Count >= maxResults)
{
return resultList;
} }
} }
catch (Exception ex) catch (Exception ex)
@ -774,8 +783,7 @@ namespace MediaBrowser.Providers.Manager
} }
} }
// Nothing found return resultList;
return new List<RemoteSearchResult>();
} }
private async Task<IEnumerable<RemoteSearchResult>> GetSearchResults<TLookupType>(IRemoteSearchProvider<TLookupType> provider, TLookupType searchInfo, private async Task<IEnumerable<RemoteSearchResult>> GetSearchResults<TLookupType>(IRemoteSearchProvider<TLookupType> provider, TLookupType searchInfo,