bulk save items when possible

3 files changed, 17 insertions, 11 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 16bfff564..b32775655 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -691,16 +691,10 @@ namespace MediaBrowser.Controller.Entities
                     }
                 }
 
-                var saveTasks = new List<Task>();
+                await LibraryManager.CreateItems(newItems, cancellationToken).ConfigureAwait(false);
 
                 foreach (var item in newItems)
                 {
-                    if (saveTasks.Count > 50)
-                    {
-                        await Task.WhenAll(saveTasks).ConfigureAwait(false);
-                        saveTasks.Clear();
-                    }
-
                     if (!_children.TryAdd(item.Id, item))
                     {
                         Logger.Error("Failed to add {0}", item.Name);
@@ -709,12 +703,8 @@ namespace MediaBrowser.Controller.Entities
                     {
                         Logger.Debug("** " + item.Name + " Added to library.");
                     }
-
-                    saveTasks.Add(LibraryManager.CreateItem(item, CancellationToken.None));
                 }
 
-                await Task.WhenAll(saveTasks).ConfigureAwait(false);
-
                 await LibraryManager.SaveChildren(Id, newChildren, CancellationToken.None).ConfigureAwait(false);
 
                 //force the indexes to rebuild next time
diff --git a/MediaBrowser.Controller/Library/ILibraryManager.cs b/MediaBrowser.Controller/Library/ILibraryManager.cs
index 0917fa276..90c96c1ee 100644
--- a/MediaBrowser.Controller/Library/ILibraryManager.cs
+++ b/MediaBrowser.Controller/Library/ILibraryManager.cs
@@ -185,6 +185,14 @@ namespace MediaBrowser.Controller.Library
         Task CreateItem(BaseItem item, CancellationToken cancellationToken);
 
         /// <summary>
+        /// Creates the items.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task CreateItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken);
+
+        /// <summary>
         /// Updates the item.
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Persistence/IItemRepository.cs b/MediaBrowser.Controller/Persistence/IItemRepository.cs
index 6f71ee9be..bf3bc626a 100644
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -64,5 +64,13 @@ namespace MediaBrowser.Controller.Persistence
         /// <param name="criticReviews">The critic reviews.</param>
         /// <returns>Task.</returns>
         Task SaveCriticReviews(Guid itemId, IEnumerable<ItemReview> criticReviews);
+
+        /// <summary>
+        /// Saves the items.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SaveItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken);
     }
 }