call metadata savers after items are updated

3 files changed, 49 insertions, 64 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 7d6abc70b..0ba149940 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -74,6 +74,12 @@ namespace MediaBrowser.Server.Implementations.Library
         private IEnumerable<IBaseItemComparer> Comparers { get; set; }
 
         /// <summary>
+        /// Gets or sets the savers.
+        /// </summary>
+        /// <value>The savers.</value>
+        private IEnumerable<IMetadataSaver> Savers { get; set; }
+        
+        /// <summary>
         /// Gets the active item repository
         /// </summary>
         /// <value>The item repository.</value>
@@ -191,13 +197,15 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <param name="itemComparers">The item comparers.</param>
         /// <param name="prescanTasks">The prescan tasks.</param>
         /// <param name="postscanTasks">The postscan tasks.</param>
+        /// <param name="savers">The savers.</param>
         public void AddParts(IEnumerable<IResolverIgnoreRule> rules,
             IEnumerable<IVirtualFolderCreator> pluginFolders,
             IEnumerable<IItemResolver> resolvers,
             IEnumerable<IIntroProvider> introProviders,
             IEnumerable<IBaseItemComparer> itemComparers,
             IEnumerable<ILibraryPrescanTask> prescanTasks,
-            IEnumerable<ILibraryPostScanTask> postscanTasks)
+            IEnumerable<ILibraryPostScanTask> postscanTasks,
+            IEnumerable<IMetadataSaver> savers)
         {
             EntityResolutionIgnoreRules = rules;
             PluginFolderCreators = pluginFolders;
@@ -206,6 +214,7 @@ namespace MediaBrowser.Server.Implementations.Library
             Comparers = itemComparers;
             PrescanTasks = prescanTasks;
             PostscanTasks = postscanTasks;
+            Savers = savers;
         }
 
         /// <summary>
@@ -1259,7 +1268,7 @@ namespace MediaBrowser.Server.Implementations.Library
                     }
                     catch (Exception ex)
                     {
-                        _logger.ErrorException("Error in ItemUpdated event handler", ex);
+                        _logger.ErrorException("Error in ItemAdded event handler", ex);
                     }
                 }
             }
@@ -1282,19 +1291,9 @@ namespace MediaBrowser.Server.Implementations.Library
                 UpdateItemInLibraryCache(item);
             }
 
-            if (ItemUpdated != null)
+            foreach (var item in list)
             {
-                foreach (var item in list)
-                {
-                    try
-                    {
-                        ItemUpdated(this, new ItemChangeEventArgs { Item = item });
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.ErrorException("Error in ItemUpdated event handler", ex);
-                    }
-                }
+                await OnItemUpdated(item, CancellationToken.None).ConfigureAwait(false);
             }
         }
 
@@ -1366,5 +1365,41 @@ namespace MediaBrowser.Server.Implementations.Library
 
             return children;
         }
+
+        /// <summary>
+        /// Called when [item updated].
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        private async Task OnItemUpdated(BaseItem item, CancellationToken cancellationToken)
+        {
+            if (ConfigurationManager.Configuration.SaveLocalMeta)
+            {
+                foreach (var saver in Savers.Where(i => i.Supports(item)))
+                {
+                    try
+                    {
+                        await saver.Save(item, cancellationToken).ConfigureAwait(false);
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error in metadata saver", ex);
+                    }
+                }
+            }
+
+            if (ItemUpdated != null)
+            {
+                try
+                {
+                    ItemUpdated(this, new ItemChangeEventArgs { Item = item });
+                }
+                catch (Exception ex)
+                {
+                    _logger.ErrorException("Error in ItemUpdated event handler", ex);
+                }
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 1f215dde0..60afc8413 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -143,7 +143,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Providers\ProviderManager.cs" />
     <Compile Include="Reflection\TypeMapper.cs" />
-    <Compile Include="Savers\MovieXmlSaver.cs" />
     <Compile Include="ScheduledTasks\ArtistValidationTask.cs" />
     <Compile Include="ScheduledTasks\PeopleValidationTask.cs" />
     <Compile Include="ScheduledTasks\ChapterImagesTask.cs" />
diff --git a/MediaBrowser.Server.Implementations/Savers/MovieXmlSaver.cs b/MediaBrowser.Server.Implementations/Savers/MovieXmlSaver.cs
deleted file mode 100644
index f536f9496..000000000
--- a/MediaBrowser.Server.Implementations/Savers/MovieXmlSaver.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Model.Entities;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Server.Implementations.Savers
-{
-    /// <summary>
-    /// Saves movie.xml for movies, trailers and music videos
-    /// </summary>
-    public class MovieXmlSaver : IMetadataSaver
-    {
-        /// <summary>
-        /// Supportses the specified item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        public bool Supports(BaseItem item)
-        {
-            if (item.LocationType != LocationType.FileSystem)
-            {
-                return false;
-            }
-
-            var trailer = item as Trailer;
-
-            if (trailer != null)
-            {
-                return !trailer.IsLocalTrailer;
-            }
-
-            // Don't support local trailers
-            return item is Movie || item is MusicVideo;
-        }
-
-        /// <summary>
-        /// Saves the specified item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task Save(BaseItem item, CancellationToken cancellationToken)
-        {
-            return Task.Run(() => { });
-        }
-    }
-}