The Free Software Media System - Server Backend & API
Fix artist metadata not being fetched on initial library scan (#16606)
theguymadmax5bad7b8ae324
diff --git a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.csindex 7cc851b73b..ef20ae9bca 100644--- a/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs+++ b/Emby.Server.Implementations/Library/Validators/ArtistsValidator.cs@@ -50,6 +50,10 @@ public class ArtistsValidatorpublic async Task Run(IProgress<double> progress, CancellationToken cancellationToken){var names = _itemRepo.GetAllArtistNames();+ var existingArtistIds = _libraryManager.GetItemIds(new InternalItemsQuery+ {+ IncludeItemTypes = [BaseItemKind.MusicArtist]+ }).ToHashSet();var numComplete = 0;var count = names.Count;@@ -59,8 +63,13 @@ public class ArtistsValidatortry{var item = _libraryManager.GetArtist(name);+ var isNew = !existingArtistIds.Contains(item.Id);+ var neverRefreshed = item.DateLastRefreshed == default;- await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);+ if (isNew || neverRefreshed)+ {+ await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);+ }}catch (OperationCanceledException){diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.csindex f8e2aece1f..0bab73180f 100644--- a/MediaBrowser.Providers/Manager/ProviderManager.cs+++ b/MediaBrowser.Providers/Manager/ProviderManager.cs@@ -487,6 +487,13 @@ namespace MediaBrowser.Providers.Managerreturn true;}+ // Artists without a folder structure that are derived from metadata have no real path in the library,+ // so GetLibraryOptions returns null. Allow all providers through rather than blocking them.+ if (item is MusicArtist && libraryTypeOptions is null)+ {+ return true;+ }+return _baseItemManager.IsMetadataFetcherEnabled(item, libraryTypeOptions, provider.Name);}diff --git a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.csindex 00bd96282c..d8cb6b4b24 100644--- a/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs+++ b/MediaBrowser.Providers/Plugins/AudioDb/AudioDbArtistProvider.cs@@ -125,7 +125,9 @@ namespace MediaBrowser.Providers.Plugins.AudioDbif (string.IsNullOrWhiteSpace(overview)){- overview = result.strBiographyEN;+ overview = string.IsNullOrWhiteSpace(result.strBiographyEN)+ ? result.strBiography+ : result.strBiographyEN;}item.Overview = (overview ?? string.Empty).StripHtml();@@ -224,6 +226,8 @@ namespace MediaBrowser.Providers.Plugins.AudioDbpublic string strTwitter { get; set; }+ public string strBiography { get; set; }+public string strBiographyEN { get; set; }public string strBiographyDE { get; set; }diff --git a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistProvider.cs b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistProvider.csindex 1323d2604a..9df21596c5 100644--- a/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistProvider.cs+++ b/MediaBrowser.Providers/Plugins/MusicBrainz/MusicBrainzArtistProvider.cs@@ -22,7 +22,7 @@ namespace MediaBrowser.Providers.Plugins.MusicBrainz;/// <summary>/// MusicBrainz artist provider./// </summary>-public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>, IDisposable+public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>, IDisposable, IHasOrder{private readonly ILogger<MusicBrainzArtistProvider> _logger;private Query _musicBrainzQuery;@@ -42,6 +42,10 @@ public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, Ar/// <inheritdoc />public string Name => "MusicBrainz";+ /// <inheritdoc />+ /// Runs first to populate the MusicBrainz artist ID used by downstream providers.+ public int Order => 0;+private void ReloadConfig(object? sender, BasePluginConfiguration e){var configuration = (PluginConfiguration)e;