Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

6 files changed, 23 insertions, 17 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 284994657a..2033130937 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -706,16 +706,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);
@@ -724,12 +718,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 0917fa276f..90c96c1ee5 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 6f71ee9be8..bf3bc626af 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);
     }
 }
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index fac7dfb0c8..318890725c 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -911,12 +911,12 @@ namespace MediaBrowser.Controller.Providers.Movies
         /// <summary>
         /// The remove
         /// </summary>
-        const string remove = "\"'!`?";
+        const string Remove = "\"'!`?";
         // "Face/Off" support.
         /// <summary>
         /// The spacers
         /// </summary>
-        const string spacers = "/,.:;\\(){}[]+-_=–*";  // (there are not actually two - in the they are different char codes)
+        const string Spacers = "/,.:;\\(){}[]+-_=–*";  // (there are not actually two - in the they are different char codes)
         /// <summary>
         /// The replace start numbers
         /// </summary>
@@ -996,11 +996,11 @@ namespace MediaBrowser.Controller.Providers.Movies
                 {
                     // skip char modifier and diacritics 
                 }
-                else if (remove.IndexOf(c) > -1)
+                else if (Remove.IndexOf(c) > -1)
                 {
                     // skip chars we are removing
                 }
-                else if (spacers.IndexOf(c) > -1)
+                else if (Spacers.IndexOf(c) > -1)
                 {
                     sb.Append(" ");
                 }
diff --git a/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs b/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs
index da870e77d8..28f56d64f8 100644
--- a/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/OpenMovieDatabaseProvider.cs
@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 {
     public class OpenMovieDatabaseProvider : BaseMetadataProvider
     {
-        private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(1, 1);
+        private readonly SemaphoreSlim _resourcePool = new SemaphoreSlim(2, 2);
 
         /// <summary>
         /// Gets the json serializer.
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
index a50dda066b..62cc21510a 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Providers.TV
         /// <summary>
         /// The tv db
         /// </summary>
-        internal readonly SemaphoreSlim TvDbResourcePool = new SemaphoreSlim(1, 1);
+        internal readonly SemaphoreSlim TvDbResourcePool = new SemaphoreSlim(2, 2);
 
         /// <summary>
         /// Gets the current.