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

Merge pull request #10154 from goremykin/multiple-enumerations

Browse Source
This commit is contained in:
Bond-009 2023-08-27 10:17:30 +02:00 committed by GitHub
commit 3b07d73d40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -358,7 +358,7 @@ namespace Emby.Server.Implementations.Library
var children = item.IsFolder var children = item.IsFolder
? ((Folder)item).GetRecursiveChildren(false) ? ((Folder)item).GetRecursiveChildren(false)
: Enumerable.Empty<BaseItem>(); : Array.Empty<BaseItem>();
foreach (var metadataPath in GetMetadataPaths(item, children)) foreach (var metadataPath in GetMetadataPaths(item, children))
{ {

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

@ -765,10 +765,12 @@ namespace MediaBrowser.Providers.Manager
{ {
try try
{ {
var results = await GetSearchResults(provider, searchInfo.SearchInfo, cancellationToken).ConfigureAwait(false); var results = await provider.GetSearchResults(searchInfo.SearchInfo, cancellationToken).ConfigureAwait(false);
foreach (var result in results) foreach (var result in results)
{ {
result.SearchProviderName = provider.Name;
var existingMatch = resultList.FirstOrDefault(i => i.ProviderIds.Any(p => string.Equals(result.GetProviderId(p.Key), p.Value, StringComparison.OrdinalIgnoreCase))); var existingMatch = resultList.FirstOrDefault(i => i.ProviderIds.Any(p => string.Equals(result.GetProviderId(p.Key), p.Value, StringComparison.OrdinalIgnoreCase)));
if (existingMatch is null) if (existingMatch is null)
@ -800,22 +802,6 @@ namespace MediaBrowser.Providers.Manager
return resultList; return resultList;
} }
private async Task<IEnumerable<RemoteSearchResult>> GetSearchResults<TLookupType>(
IRemoteSearchProvider<TLookupType> provider,
TLookupType searchInfo,
CancellationToken cancellationToken)
where TLookupType : ItemLookupInfo
{
var results = await provider.GetSearchResults(searchInfo, cancellationToken).ConfigureAwait(false);
foreach (var item in results)
{
item.SearchProviderName = provider.Name;
}
return results;
}
private IEnumerable<IExternalId> GetExternalIds(IHasProviderIds item) private IEnumerable<IExternalId> GetExternalIds(IHasProviderIds item)
{ {
return _externalIds.Where(i => return _externalIds.Where(i =>