The Free Software Media System - Server Backend & API
Pass cancellation token to GetReleaseGroupResultAsync
Bond_00982b2e7773f2c
diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.csindex c35324746a..c9cba61b72 100644--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzAlbumProvider.cs@@ -2,6 +2,7 @@ using System;using System.Collections.Generic;using System.Linq;using System.Net.Http;+using System.Runtime.CompilerServices;using System.Threading;using System.Threading.Tasks;using Jellyfin.Extensions;@@ -83,7 +84,9 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albuif (!string.IsNullOrEmpty(releaseGroupId)){var releaseGroupResult = await _musicBrainzQuery.LookupReleaseGroupAsync(new Guid(releaseGroupId), Include.Releases, null, cancellationToken).ConfigureAwait(false);- return GetReleaseGroupResult(releaseGroupResult.Releases);++ // No need to pass the cancellation token to GetReleaseGroupResultAsync as we're already passing it to ToBlockingEnumerable+ return GetReleaseGroupResult(releaseGroupResult.Releases, CancellationToken.None);}var artistMusicBrainzId = searchInfo.GetMusicBrainzArtistId();@@ -128,7 +131,7 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu}}- private IEnumerable<RemoteSearchResult> GetReleaseGroupResult(IEnumerable<IRelease>? releaseSearchResults)+ private IEnumerable<RemoteSearchResult> GetReleaseGroupResult(IEnumerable<IRelease>? releaseSearchResults, [EnumeratorCancellation] CancellationToken cancellationToken = default){if (releaseSearchResults is null){@@ -138,7 +141,7 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albuforeach (var result in releaseSearchResults){// Fetch full release info, otherwise artists are missing- var fullResult = _musicBrainzQuery.LookupRelease(result.Id, Include.Artists | Include.ReleaseGroups);+ var fullResult = _musicBrainzQuery.LookupRelease(result.Id, Include.Artists | Include.ReleaseGroups, cancellationToken);yield return GetReleaseResult(fullResult);}}