From 92cd71143daa2d49abb0421a9cb641e9bf4489ae Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 24 Jun 2013 21:22:21 -0400 Subject: Only fire metadata savers when appropriate --- .../Library/LibraryManager.cs | 89 +++++++++++++------- .../Providers/ProviderManager.cs | 97 ++++++---------------- .../ScheduledTasks/VideoImagesTask.cs | 2 +- 3 files changed, 89 insertions(+), 99 deletions(-) (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index d1b7634fb..0465cb5c3 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -128,6 +128,10 @@ namespace MediaBrowser.Server.Implementations.Library /// The by reference items. private ConcurrentDictionary ByReferenceItems { get; set; } + private IEnumerable _savers; + + private readonly Func _directoryWatchersFactory; + /// /// The _library items cache /// @@ -167,13 +171,14 @@ namespace MediaBrowser.Server.Implementations.Library /// The user manager. /// The configuration manager. /// The user data repository. - public LibraryManager(ILogger logger, ITaskManager taskManager, IUserManager userManager, IServerConfigurationManager configurationManager, IUserDataRepository userDataRepository) + public LibraryManager(ILogger logger, ITaskManager taskManager, IUserManager userManager, IServerConfigurationManager configurationManager, IUserDataRepository userDataRepository, Func directoryWatchersFactory) { _logger = logger; _taskManager = taskManager; _userManager = userManager; ConfigurationManager = configurationManager; _userDataRepository = userDataRepository; + _directoryWatchersFactory = directoryWatchersFactory; ByReferenceItems = new ConcurrentDictionary(); ConfigurationManager.ConfigurationUpdated += ConfigurationUpdated; @@ -191,13 +196,15 @@ namespace MediaBrowser.Server.Implementations.Library /// The item comparers. /// The prescan tasks. /// The postscan tasks. + /// The savers. public void AddParts(IEnumerable rules, IEnumerable pluginFolders, IEnumerable resolvers, IEnumerable introProviders, IEnumerable itemComparers, IEnumerable prescanTasks, - IEnumerable postscanTasks) + IEnumerable postscanTasks, + IEnumerable savers) { EntityResolutionIgnoreRules = rules; PluginFolderCreators = pluginFolders; @@ -206,6 +213,7 @@ namespace MediaBrowser.Server.Implementations.Library Comparers = itemComparers; PrescanTasks = prescanTasks; PostscanTasks = postscanTasks; + _savers = savers; } /// @@ -326,7 +334,7 @@ namespace MediaBrowser.Server.Implementations.Library /// The new name. /// The cancellation token. /// Task. - private Task UpdateSeasonZeroNames(string newName, CancellationToken cancellationToken) + private async Task UpdateSeasonZeroNames(string newName, CancellationToken cancellationToken) { var seasons = RootFolder.RecursiveChildren .OfType() @@ -336,9 +344,16 @@ namespace MediaBrowser.Server.Implementations.Library foreach (var season in seasons) { season.Name = newName; - } - return UpdateItems(seasons, cancellationToken); + try + { + await UpdateItem(season, ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false); + } + catch (Exception ex) + { + _logger.ErrorException("Error saving {0}", ex, season.Path); + } + } } /// @@ -1278,33 +1293,35 @@ namespace MediaBrowser.Server.Implementations.Library } /// - /// Updates the items. + /// Updates the item. /// - /// The items. + /// The item. + /// The update reason. /// The cancellation token. /// Task. - private async Task UpdateItems(IEnumerable items, CancellationToken cancellationToken) + public async Task UpdateItem(BaseItem item, ItemUpdateType updateReason, CancellationToken cancellationToken) { - var list = items.ToList(); + await ItemRepository.SaveItem(item, cancellationToken).ConfigureAwait(false); - await ItemRepository.SaveItems(list, cancellationToken).ConfigureAwait(false); + UpdateItemInLibraryCache(item); - foreach (var item in list) + // If metadata was downloaded or edited, save external metadata + if ((updateReason & ItemUpdateType.MetadataEdit) == ItemUpdateType.MetadataEdit) { - UpdateItemInLibraryCache(item); - OnItemUpdated(item); + await SaveMetadata(item).ConfigureAwait(false); } - } - /// - /// Updates the item. - /// - /// The item. - /// The cancellation token. - /// Task. - public Task UpdateItem(BaseItem item, CancellationToken cancellationToken) - { - return UpdateItems(new[] { item }, cancellationToken); + if (ItemUpdated != null) + { + try + { + ItemUpdated(this, new ItemChangeEventArgs { Item = item }); + } + catch (Exception ex) + { + _logger.ErrorException("Error in ItemUpdated event handler", ex); + } + } } /// @@ -1337,22 +1354,38 @@ namespace MediaBrowser.Server.Implementations.Library return ItemRepository.RetrieveItem(id, type); } + private readonly ConcurrentDictionary _fileLocks = new ConcurrentDictionary(); + /// - /// Called when [item updated]. + /// Saves the metadata. /// /// The item. /// Task. - private void OnItemUpdated(BaseItem item) + private async Task SaveMetadata(BaseItem item) { - if (ItemUpdated != null) + foreach (var saver in _savers.Where(i => i.Supports(item))) { + var path = saver.GetSavePath(item); + + var semaphore = _fileLocks.GetOrAdd(path, key => new SemaphoreSlim(1, 1)); + + var directoryWatchers = _directoryWatchersFactory(); + + await semaphore.WaitAsync().ConfigureAwait(false); + try { - ItemUpdated(this, new ItemChangeEventArgs { Item = item }); + directoryWatchers.TemporarilyIgnore(path); + saver.Save(item, CancellationToken.None); } catch (Exception ex) { - _logger.ErrorException("Error in ItemUpdated event handler", ex); + _logger.ErrorException("Error in metadata saver", ex); + } + finally + { + directoryWatchers.RemoveTempIgnore(path); + semaphore.Release(); } } } diff --git a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs index 01c0659b6..ee8bb4c09 100644 --- a/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs +++ b/MediaBrowser.Server.Implementations/Providers/ProviderManager.cs @@ -60,8 +60,6 @@ namespace MediaBrowser.Server.Implementations.Providers /// The metadata providers enumerable. private BaseMetadataProvider[] MetadataProviders { get; set; } - private IEnumerable _savers; - /// /// Initializes a new instance of the class. /// @@ -79,44 +77,6 @@ namespace MediaBrowser.Server.Implementations.Providers _remoteImageCache = new FileSystemRepository(configurationManager.ApplicationPaths.DownloadedImagesDataPath); configurationManager.ConfigurationUpdated += configurationManager_ConfigurationUpdated; - - libraryManager.ItemUpdated += libraryManager_ItemUpdated; - } - - private readonly ConcurrentDictionary _fileLocks = new ConcurrentDictionary(); - - /// - /// Handles the ItemUpdated event of the libraryManager control. - /// - /// The source of the event. - /// The instance containing the event data. - async void libraryManager_ItemUpdated(object sender, ItemChangeEventArgs e) - { - var item = e.Item; - - foreach (var saver in _savers.Where(i => i.Supports(item))) - { - var path = saver.GetSavePath(item); - - var semaphore = _fileLocks.GetOrAdd(path, key => new SemaphoreSlim(1, 1)); - - await semaphore.WaitAsync().ConfigureAwait(false); - - try - { - _directoryWatchers.TemporarilyIgnore(path); - saver.Save(item, CancellationToken.None); - } - catch (Exception ex) - { - _logger.ErrorException("Error in metadata saver", ex); - } - finally - { - _directoryWatchers.RemoveTempIgnore(path); - semaphore.Release(); - } - } } /// @@ -134,12 +94,9 @@ namespace MediaBrowser.Server.Implementations.Providers /// Adds the metadata providers. /// /// The providers. - /// The savers. - public void AddParts(IEnumerable providers, - IEnumerable savers) + public void AddParts(IEnumerable providers) { MetadataProviders = providers.OrderBy(e => e.Priority).ToArray(); - _savers = savers; } /// @@ -150,18 +107,14 @@ namespace MediaBrowser.Server.Implementations.Providers /// if set to true [force]. /// if set to true [allow slow providers]. /// Task{System.Boolean}. - public async Task ExecuteMetadataProviders(BaseItem item, CancellationToken cancellationToken, bool force = false, bool allowSlowProviders = true) + public async Task ExecuteMetadataProviders(BaseItem item, CancellationToken cancellationToken, bool force = false, bool allowSlowProviders = true) { if (item == null) { throw new ArgumentNullException("item"); } - // Allow providers of the same priority to execute in parallel - MetadataProviderPriority? currentPriority = null; - var currentTasks = new List>(); - - var result = false; + ItemUpdateType? result = null; cancellationToken.ThrowIfCancellationRequested(); @@ -188,15 +141,6 @@ namespace MediaBrowser.Server.Implementations.Providers continue; } - // When a new priority is reached, await the ones that are currently running and clear the list - if (currentPriority.HasValue && currentPriority.Value != provider.Priority && currentTasks.Count > 0) - { - var results = await Task.WhenAll(currentTasks).ConfigureAwait(false); - result |= results.Contains(true); - - currentTasks.Clear(); - } - // Put this check below the await because the needs refresh of the next tier of providers may depend on the previous ones running // This is the case for the fan art provider which depends on the movie and tv providers having run before them if (provider.RequiresInternet && item.DontFetchMeta) @@ -216,14 +160,19 @@ namespace MediaBrowser.Server.Implementations.Providers _logger.Error("Error determining NeedsRefresh for {0}", ex, item.Path); } - currentTasks.Add(FetchAsync(provider, item, force, cancellationToken)); - currentPriority = provider.Priority; - } + var updateType = await FetchAsync(provider, item, force, cancellationToken).ConfigureAwait(false); - if (currentTasks.Count > 0) - { - var results = await Task.WhenAll(currentTasks).ConfigureAwait(false); - result |= results.Contains(true); + if (updateType.HasValue) + { + if (result.HasValue) + { + result = result.Value | updateType.Value; + } + else + { + result = updateType; + } + } } return result; @@ -238,7 +187,7 @@ namespace MediaBrowser.Server.Implementations.Providers /// The cancellation token. /// Task{System.Boolean}. /// - private async Task FetchAsync(BaseMetadataProvider provider, BaseItem item, bool force, CancellationToken cancellationToken) + private async Task FetchAsync(BaseMetadataProvider provider, BaseItem item, bool force, CancellationToken cancellationToken) { if (item == null) { @@ -256,7 +205,14 @@ namespace MediaBrowser.Server.Implementations.Providers try { - return await provider.FetchAsync(item, force, CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, innerCancellationTokenSource.Token).Token).ConfigureAwait(false); + var changed = await provider.FetchAsync(item, force, CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, innerCancellationTokenSource.Token).Token).ConfigureAwait(false); + + if (changed) + { + return provider.ItemUpdateType; + } + + return null; } catch (OperationCanceledException ex) { @@ -268,14 +224,15 @@ namespace MediaBrowser.Server.Implementations.Providers throw; } - return false; + return null; } catch (Exception ex) { _logger.ErrorException("{0} failed refreshing {1}", ex, provider.GetType().Name, item.Name); provider.SetLastRefreshed(item, DateTime.UtcNow, ProviderRefreshStatus.Failure); - return true; + + return ItemUpdateType.Unspecified; } finally { diff --git a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs index d63494c1e..dc8425ac8 100644 --- a/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs +++ b/MediaBrowser.Server.Implementations/ScheduledTasks/VideoImagesTask.cs @@ -294,7 +294,7 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks // Image is already in the cache item.PrimaryImagePath = path; - await _libraryManager.UpdateItem(item, cancellationToken).ConfigureAwait(false); + await _libraryManager.UpdateItem(item, ItemUpdateType.ImageUpdate, cancellationToken).ConfigureAwait(false); } else { -- cgit v1.2.3