cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move MetadataRefreshThrottler to BaseItemManager

Browse Source
This commit is contained in:
Gary Wilber 2020-12-02 18:51:53 -08:00
parent e8cb9cea7d
commit f4edca7c27
5 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Controller/BaseItemManager/BaseItemManager.cs
View File

@ -1,5 +1,6 @@
using System;
using System;
using System.Linq;
using System.Threading;
using MediaBrowser.Controller.Channels;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
@ -19,8 +20,22 @@ namespace MediaBrowser.Controller.BaseItemManager
public BaseItemManager(IServerConfigurationManager serverConfigurationManager)
{
_serverConfigurationManager = serverConfigurationManager;
MetadataRefreshThrottler = new Lazy<SemaphoreSlim>(() => {
var concurrency = _serverConfigurationManager.Configuration.LibraryMetadataRefreshConcurrency;
if (concurrency <= 0)
{
concurrency = Environment.ProcessorCount;
}
return new SemaphoreSlim(concurrency);
});
}
/// <inheritdoc />
public Lazy<SemaphoreSlim> MetadataRefreshThrottler { get; private set; }
/// <inheritdoc />
public bool IsMetadataFetcherEnabled(BaseItem baseItem, LibraryOptions libraryOptions, string name)
{

9
MediaBrowser.Controller/BaseItemManager/IBaseItemManager.cs
View File

@ -1,4 +1,6 @@
using MediaBrowser.Controller.Entities;
using System;
using System.Threading;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Model.Configuration;
namespace MediaBrowser.Controller.BaseItemManager
@ -8,6 +10,11 @@ namespace MediaBrowser.Controller.BaseItemManager
/// </summary>
public interface IBaseItemManager
{
/// <summary>
/// Gets the semaphore used to limit the amount of concurrent metadata refreshes.
/// </summary>
Lazy<SemaphoreSlim> MetadataRefreshThrottler { get; }
/// <summary>
/// Is metadata fetcher enabled.
/// </summary>

35
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -36,17 +36,6 @@ namespace MediaBrowser.Controller.Entities
/// </summary>
public class Folder : BaseItem
{
private static Lazy<SemaphoreSlim> _metadataRefreshThrottler = new Lazy<SemaphoreSlim>(() => {
var concurrency = ConfigurationManager.Configuration.LibraryMetadataRefreshConcurrency;
if (concurrency <= 0)
{
concurrency = Environment.ProcessorCount;
}
return new SemaphoreSlim(concurrency);
});
public static IUserViewManager UserViewManager { get; set; }
/// <summary>
@ -491,7 +480,7 @@ namespace MediaBrowser.Controller.Entities
private async Task RefreshAllMetadataForContainer(IMetadataContainer container, MetadataRefreshOptions refreshOptions, IProgress<double> progress, CancellationToken cancellationToken)
{
// limit the amount of concurrent metadata refreshes
await RunMetadataRefresh(
await ProviderManager.RunMetadataRefresh(
async () =>
{
var series = container as Series;
@ -518,7 +507,7 @@ namespace MediaBrowser.Controller.Entities
if (refreshOptions.RefreshItem(child))
{
// limit the amount of concurrent metadata refreshes
await RunMetadataRefresh(
await ProviderManager.RunMetadataRefresh(
async () => await child.RefreshMetadata(refreshOptions, cancellationToken).ConfigureAwait(false),
cancellationToken).ConfigureAwait(false);
}
@ -1252,26 +1241,6 @@ namespace MediaBrowser.Controller.Entities
return true;
}
/// <summary>
/// Runs multiple metadata refreshes concurrently.
/// </summary>
/// <param name="action">The action to run.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
private static async Task RunMetadataRefresh(Func<Task> action, CancellationToken cancellationToken)
{
await _metadataRefreshThrottler.Value.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
await action().ConfigureAwait(false);
}
finally
{
_metadataRefreshThrottler.Value.Release();
}
}
public List<BaseItem> GetChildren(User user, bool includeLinkedChildren)
{
if (user == null)

8
MediaBrowser.Controller/Providers/IProviderManager.cs
View File

@ -45,6 +45,14 @@ namespace MediaBrowser.Controller.Providers
/// <returns>Task.</returns>
Task<ItemUpdateType> RefreshSingleItem(BaseItem item, MetadataRefreshOptions options, CancellationToken cancellationToken);
/// <summary>
/// Runs multiple metadata refreshes concurrently.
/// </summary>
/// <param name="action">The action to run.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
Task RunMetadataRefresh(Func<Task> action, CancellationToken cancellationToken);
/// <summary>
/// Saves the image.
/// </summary>

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

@ -1167,6 +1167,26 @@ namespace MediaBrowser.Providers.Manager
return RefreshItem(item, options, cancellationToken);
}
/// <summary>
/// Runs multiple metadata refreshes concurrently.
/// </summary>
/// <param name="action">The action to run.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
public async Task RunMetadataRefresh(Func<Task> action, CancellationToken cancellationToken)
{
await _baseItemManager.MetadataRefreshThrottler.Value.WaitAsync(cancellationToken).ConfigureAwait(false);
try
{
await action().ConfigureAwait(false);
}
finally
{
_baseItemManager.MetadataRefreshThrottler.Value.Release();
}
}
/// <inheritdoc/>
public void Dispose()
{