diff options
| author | KGT1 <kilian.gamn@gmx.de> | 2026-05-03 22:35:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-03 22:35:57 +0200 |
| commit | 4464b2e2ed9d8cc3f4c520ee76dfedac3557cf0d (patch) | |
| tree | 4fdf6dc5fff74c21b3b2cd74c1d3d5fd695b0638 /MediaBrowser.Providers/Manager | |
| parent | 950c6525d1ab456115c4ee80b8fed86c5a81eaf5 (diff) | |
| parent | 622947e37425f3620432995cde5d4a0809d91694 (diff) | |
Merge branch 'jellyfin:master' into removeGenericConfigurationEndpoint
Diffstat (limited to 'MediaBrowser.Providers/Manager')
| -rw-r--r-- | MediaBrowser.Providers/Manager/ItemImageProvider.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Manager/MetadataService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Manager/ProviderManager.cs | 144 |
3 files changed, 140 insertions, 14 deletions
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs index e0354dbdfa..727f481b65 100644 --- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs +++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs @@ -255,7 +255,7 @@ namespace MediaBrowser.Providers.Manager catch (Exception ex) { result.ErrorMessage = ex.Message; - _logger.LogError(ex, "Error in {Provider}", provider.Name); + _logger.LogError(ex, "Error in {Provider} for {Item}", provider.Name, item.Path ?? item.Name); } } @@ -339,7 +339,7 @@ namespace MediaBrowser.Providers.Manager catch (Exception ex) { result.ErrorMessage = ex.Message; - _logger.LogError(ex, "Error in {Provider}", provider.Name); + _logger.LogError(ex, "Error in {Provider} for {Item}", provider.Name, item.Path ?? item.Name); } } diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index e9cb46eab5..abdfb1e3b7 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -820,7 +820,7 @@ namespace MediaBrowser.Providers.Manager } catch (Exception ex) { - Logger.LogError(ex, "Error in {Provider}", provider.Name); + Logger.LogError(ex, "Error in {Provider} for {Item}", provider.Name, logName); // If a local provider fails, consider that a failure refreshResult.ErrorMessage = ex.Message; @@ -886,7 +886,7 @@ namespace MediaBrowser.Providers.Manager catch (Exception ex) { refreshResult.ErrorMessage = ex.Message; - Logger.LogError(ex, "Error in {Provider}", provider.Name); + Logger.LogError(ex, "Error in {Provider} for {Item}", provider.Name, logName); } } @@ -935,7 +935,7 @@ namespace MediaBrowser.Providers.Manager { refreshResult.Failures++; refreshResult.ErrorMessage = ex.Message; - Logger.LogError(ex, "Error in {Provider}", provider.Name); + Logger.LogError(ex, "Error in {Provider} for {Item}", provider.Name, logName); } } diff --git a/MediaBrowser.Providers/Manager/ProviderManager.cs b/MediaBrowser.Providers/Manager/ProviderManager.cs index 0bab73180f..d57e85c62f 100644 --- a/MediaBrowser.Providers/Manager/ProviderManager.cs +++ b/MediaBrowser.Providers/Manager/ProviderManager.cs @@ -31,6 +31,7 @@ using MediaBrowser.Model.Extensions; using MediaBrowser.Model.IO; using MediaBrowser.Model.Net; using MediaBrowser.Model.Providers; +using MediaBrowser.Model.Querying; using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Logging; using Book = MediaBrowser.Controller.Entities.Book; @@ -69,6 +70,13 @@ namespace MediaBrowser.Providers.Manager o.PoolInitialFill = 1; }); + /// <summary> + /// Cache for ordered metadata providers per library/item type combination. + /// Key: (LibraryPath, ItemTypeName, IncludeDisabled, ForceEnableInternetMetadata). + /// Value: Array of ordered metadata providers (before per-item filtering). + /// </summary> + private readonly ConcurrentDictionary<MetadataProviderCacheKey, IMetadataProvider[]> _metadataProviderCache = new(); + private IImageProvider[] _imageProviders = []; private IMetadataService[] _metadataServices = []; private IMetadataProvider[] _metadataProviders = []; @@ -119,6 +127,8 @@ namespace MediaBrowser.Providers.Manager _lyricManager = lyricManager; _memoryCache = memoryCache; _mediaSegmentManager = mediaSegmentManager; + + CollectionFolder.LibraryOptionsUpdated += OnLibraryOptionsUpdated; } /// <inheritdoc/> @@ -427,8 +437,37 @@ namespace MediaBrowser.Providers.Manager where T : BaseItem { var globalMetadataOptions = GetMetadataOptions(item); + var libraryPath = GetLibraryPathForItem(item); + + return GetMetadataProvidersInternal<T>(item, libraryOptions, globalMetadataOptions, false, false, libraryPath); + } + + /// <summary> + /// Gets metadata providers for the specified item. + /// </summary> + /// <typeparam name="T">The item type.</typeparam> + /// <param name="item">The item.</param> + /// <param name="libraryOptions">The library options.</param> + /// <param name="includeDisabled">Whether to include disabled providers.</param> + /// <returns>The metadata providers.</returns> + public IEnumerable<IMetadataProvider<T>> GetMetadataProviders<T>(BaseItem item, LibraryOptions libraryOptions, bool includeDisabled) + where T : BaseItem + { + var globalMetadataOptions = GetMetadataOptions(item); + var libraryPath = GetLibraryPathForItem(item); - return GetMetadataProvidersInternal<T>(item, libraryOptions, globalMetadataOptions, false, false); + return GetMetadataProvidersInternal<T>(item, libraryOptions, globalMetadataOptions, includeDisabled, false, libraryPath); + } + + private static string GetLibraryPathForItem(BaseItem item) + { + if (item is CollectionFolder collectionFolder) + { + return collectionFolder.Path ?? string.Empty; + } + + var topParent = item.GetTopParent(); + return topParent?.Path ?? string.Empty; } /// <inheritdoc /> @@ -437,15 +476,37 @@ namespace MediaBrowser.Providers.Manager return _savers.Where(i => IsSaverEnabledForItem(i, item, libraryOptions, ItemUpdateType.MetadataEdit, false)); } - private IEnumerable<IMetadataProvider<T>> GetMetadataProvidersInternal<T>(BaseItem item, LibraryOptions libraryOptions, MetadataOptions globalMetadataOptions, bool includeDisabled, bool forceEnableInternetMetadata) + private IEnumerable<IMetadataProvider<T>> GetMetadataProvidersInternal<T>(BaseItem item, LibraryOptions libraryOptions, MetadataOptions globalMetadataOptions, bool includeDisabled, bool forceEnableInternetMetadata, string libraryPath) where T : BaseItem { - var localMetadataReaderOrder = libraryOptions.LocalMetadataReaderOrder ?? globalMetadataOptions.LocalMetadataReaderOrder; var typeOptions = libraryOptions.GetTypeOptions(item.GetType().Name); + + var orderedProviders = GetOrCreateOrderedProviders<T>(item.GetType().Name, libraryOptions, globalMetadataOptions, includeDisabled, forceEnableInternetMetadata, libraryPath); + + return orderedProviders.Where(i => CanRefreshMetadata(i, item, typeOptions, includeDisabled, forceEnableInternetMetadata)); + } + + private IMetadataProvider<T>[] GetOrCreateOrderedProviders<T>( + string itemTypeName, + LibraryOptions libraryOptions, + MetadataOptions globalMetadataOptions, + bool includeDisabled, + bool forceEnableInternetMetadata, + string libraryPath) + where T : BaseItem + { + var cacheKey = new MetadataProviderCacheKey(libraryPath, itemTypeName, includeDisabled, forceEnableInternetMetadata); + if (_metadataProviderCache.TryGetValue(cacheKey, out var cachedProviders)) + { + return cachedProviders.OfType<IMetadataProvider<T>>().ToArray(); + } + + var localMetadataReaderOrder = libraryOptions.LocalMetadataReaderOrder ?? globalMetadataOptions.LocalMetadataReaderOrder; + var typeOptions = libraryOptions.GetTypeOptions(itemTypeName); var metadataFetcherOrder = typeOptions?.MetadataFetcherOrder ?? globalMetadataOptions.MetadataFetcherOrder; - return _metadataProviders.OfType<IMetadataProvider<T>>() - .Where(i => CanRefreshMetadata(i, item, typeOptions, includeDisabled, forceEnableInternetMetadata)) + var orderedProviders = _metadataProviders.OfType<IMetadataProvider<T>>() + .Where(i => CanRefreshMetadataForCache(i, typeOptions, includeDisabled, forceEnableInternetMetadata)) .OrderBy(i => // local and remote providers will be interleaved in the final order // only relative order within a type matters: consumers of the list filter to one or the other @@ -456,7 +517,36 @@ namespace MediaBrowser.Providers.Manager // Default to end _ => int.MaxValue }) - .ThenBy(GetDefaultOrder); + .ThenBy(GetDefaultOrder) + .ToArray(); + + _metadataProviderCache.TryAdd(cacheKey, orderedProviders.Cast<IMetadataProvider>().ToArray()); + + return orderedProviders; + } + + private static bool CanRefreshMetadataForCache( + IMetadataProvider provider, + TypeOptions? libraryTypeOptions, + bool includeDisabled, + bool forceEnableInternetMetadata) + { + if (includeDisabled) + { + return true; + } + + if (forceEnableInternetMetadata || provider is not IRemoteMetadataProvider) + { + return true; + } + + if (libraryTypeOptions?.MetadataFetchers is { Length: > 0 } metadataFetchers) + { + return metadataFetchers.Contains(provider.Name, StringComparer.OrdinalIgnoreCase); + } + + return true; } private bool CanRefreshMetadata( @@ -614,7 +704,8 @@ namespace MediaBrowser.Providers.Manager private void AddMetadataPlugins<T>(List<MetadataPlugin> list, T item, LibraryOptions libraryOptions, MetadataOptions options) where T : BaseItem { - var providers = GetMetadataProvidersInternal<T>(item, libraryOptions, options, true, true).ToList(); + var libraryPath = GetLibraryPathForItem(item); + var providers = GetMetadataProvidersInternal<T>(item, libraryOptions, options, true, true, libraryPath).ToList(); // Locals list.AddRange(providers.Where(i => i is ILocalMetadataProvider).Select(i => new MetadataPlugin @@ -831,8 +922,8 @@ namespace MediaBrowser.Providers.Manager } var options = GetMetadataOptions(referenceItem); - - var providers = GetMetadataProvidersInternal<TItemType>(referenceItem, libraryOptions, options, searchInfo.IncludeDisabledProviders, false) + var libraryPath = GetLibraryPathForItem(referenceItem); + var providers = GetMetadataProvidersInternal<TItemType>(referenceItem, libraryOptions, options, searchInfo.IncludeDisabledProviders, false, libraryPath) .OfType<IRemoteSearchProvider<TLookupType>>(); if (!string.IsNullOrEmpty(searchInfo.SearchProviderName)) @@ -1164,6 +1255,8 @@ namespace MediaBrowser.Providers.Manager if (disposing) { + CollectionFolder.LibraryOptionsUpdated -= OnLibraryOptionsUpdated; + if (!_disposeCancellationTokenSource.IsCancellationRequested) { _disposeCancellationTokenSource.Cancel(); @@ -1175,5 +1268,38 @@ namespace MediaBrowser.Providers.Manager _disposed = true; } + + private void OnLibraryOptionsUpdated(object? sender, LibraryOptionsUpdatedEventArgs e) + { + var keysToRemove = _metadataProviderCache.Keys + .Where(k => string.Equals(k.LibraryPath, e.LibraryPath, StringComparison.Ordinal)) + .ToList(); + + foreach (var key in keysToRemove) + { + _metadataProviderCache.TryRemove(key, out _); + } + + _logger.LogDebug("Invalidated metadata provider cache for library: {LibraryPath}", e.LibraryPath); + } + + internal void ClearMetadataProviderCache() + { + _metadataProviderCache.Clear(); + _logger.LogDebug("Cleared entire metadata provider cache"); + } + + /// <summary> + /// Cache key for metadata provider lookups. + /// </summary> + /// <param name="LibraryPath">The library path for the collection folder.</param> + /// <param name="ItemTypeName">The item type name.</param> + /// <param name="IncludeDisabled">Whether to include disabled providers.</param> + /// <param name="ForceEnableInternetMetadata">Whether internet metadata is force-enabled.</param> + private readonly record struct MetadataProviderCacheKey( + string LibraryPath, + string ItemTypeName, + bool IncludeDisabled, + bool ForceEnableInternetMetadata); } } |
