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

11 files changed, 93 insertions, 51 deletions

diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index 284994657..203313093 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 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);
     }
 }
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index fac7dfb0c..318890725 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 da870e77d..28f56d64f 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 a50dda066..62cc21510 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.
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 72cf42c14..fbf2dfc70 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1036,21 +1036,40 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <param name="item">The item.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
-        public async Task CreateItem(BaseItem item, CancellationToken cancellationToken)
+        public Task CreateItem(BaseItem item, CancellationToken cancellationToken)
         {
-            await SaveItem(item, cancellationToken).ConfigureAwait(false);
+            return CreateItems(new[] { item }, cancellationToken);
+        }
 
-            UpdateItemInLibraryCache(item);
+        /// <summary>
+        /// Creates the items.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public async Task CreateItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken)
+        {
+            var list = items.ToList();
+
+            await ItemRepository.SaveItems(list, cancellationToken).ConfigureAwait(false);
+
+            foreach (var item in list)
+            {
+                UpdateItemInLibraryCache(item);
+            }
 
             if (ItemAdded != null)
             {
-                try
-                {
-                    ItemAdded(this, new ItemChangeEventArgs { Item = item });
-                }
-                catch (Exception ex)
+                foreach (var item in list)
                 {
-                    _logger.ErrorException("Error in ItemUpdated event handler", ex);
+                    try
+                    {
+                        ItemAdded(this, new ItemChangeEventArgs { Item = item });
+                    }
+                    catch (Exception ex)
+                    {
+                        _logger.ErrorException("Error in ItemUpdated event handler", ex);
+                    }
                 }
             }
         }
@@ -1063,7 +1082,7 @@ namespace MediaBrowser.Server.Implementations.Library
         /// <returns>Task.</returns>
         public async Task UpdateItem(BaseItem item, CancellationToken cancellationToken)
         {
-            await SaveItem(item, cancellationToken).ConfigureAwait(false);
+            await ItemRepository.SaveItem(item, cancellationToken).ConfigureAwait(false);
 
             UpdateItemInLibraryCache(item);
 
@@ -1100,17 +1119,6 @@ namespace MediaBrowser.Server.Implementations.Library
         }
 
         /// <summary>
-        /// Saves the item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        private Task SaveItem(BaseItem item, CancellationToken cancellationToken)
-        {
-            return ItemRepository.SaveItem(item, cancellationToken);
-        }
-
-        /// <summary>
         /// Retrieves the item.
         /// </summary>
         /// <param name="id">The id.</param>
diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
index 23ab10499..0ca4dda77 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
@@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         /// <summary>
         /// The _write lock
         /// </summary>
-        private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1,1);
+        private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1);
 
         /// <summary>
         /// Prepares the statements.
@@ -172,13 +172,34 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public async Task SaveItem(BaseItem item, CancellationToken cancellationToken)
+        public Task SaveItem(BaseItem item, CancellationToken cancellationToken)
         {
             if (item == null)
             {
                 throw new ArgumentNullException("item");
             }
 
+            return SaveItems(new[] { item }, cancellationToken);
+        }
+
+        /// <summary>
+        /// Saves the items.
+        /// </summary>
+        /// <param name="items">The items.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        /// <exception cref="System.ArgumentNullException">
+        /// items
+        /// or
+        /// cancellationToken
+        /// </exception>
+        public async Task SaveItems(IEnumerable<BaseItem> items, CancellationToken cancellationToken)
+        {
+            if (items == null)
+            {
+                throw new ArgumentNullException("items");
+            }
+
             if (cancellationToken == null)
             {
                 throw new ArgumentNullException("cancellationToken");
@@ -186,8 +207,6 @@ namespace MediaBrowser.Server.Implementations.Sqlite
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var serialized = _jsonSerializer.SerializeToBytes(item);
-
             await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             SQLiteTransaction transaction = null;
@@ -196,13 +215,18 @@ namespace MediaBrowser.Server.Implementations.Sqlite
             {
                 transaction = Connection.BeginTransaction();
 
-                _saveItemCommand.Parameters[0].Value = item.Id;
-                _saveItemCommand.Parameters[1].Value = item.GetType().FullName;
-                _saveItemCommand.Parameters[2].Value = serialized;
+                foreach (var item in items)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    
+                    _saveItemCommand.Parameters[0].Value = item.Id;
+                    _saveItemCommand.Parameters[1].Value = item.GetType().FullName;
+                    _saveItemCommand.Parameters[2].Value = _jsonSerializer.SerializeToBytes(item);
 
-                _saveItemCommand.Transaction = transaction;
+                    _saveItemCommand.Transaction = transaction;
 
-                await _saveItemCommand.ExecuteNonQueryAsync(cancellationToken);
+                    await _saveItemCommand.ExecuteNonQueryAsync(cancellationToken);
+                }
 
                 transaction.Commit();
             }
@@ -400,7 +424,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
                 foreach (var child in children)
                 {
                     _saveChildrenCommand.Transaction = transaction;
-                    
+
                     _saveChildrenCommand.Parameters[0].Value = id;
                     _saveChildrenCommand.Parameters[1].Value = child.Id;
 
diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
index bd60c834f..ee2fcc10c 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteRepository.cs
@@ -1,11 +1,9 @@
 using MediaBrowser.Model.Logging;
 using System;
-using System.Collections.Concurrent;
 using System.Data;
 using System.Data.Common;
 using System.Data.SQLite;
 using System.IO;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.Sqlite
diff --git a/MediaBrowser.ServerApplication/App.config b/MediaBrowser.ServerApplication/App.config
index 06fe8b439..ca35b353c 100644
--- a/MediaBrowser.ServerApplication/App.config
+++ b/MediaBrowser.ServerApplication/App.config
@@ -10,7 +10,7 @@
     <targets async="true"></targets>
   </nlog>
   <appSettings>
-    <add key="DebugProgramDataPath" value="%ApplicationData%\MediaBrowser-Server" />
+    <add key="DebugProgramDataPath" value="..\..\..\..\ProgramData-Server" />
     <add key="ReleaseProgramDataPath" value="%ApplicationData%" />
     <add key="ProgramDataFolderName" value="MediaBrowser-Server" />
     <add key="ClientSettingsProvider.ServiceUri" value="" />
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 11745acd0..72e602d2e 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -114,9 +114,15 @@
     <Content Include="dashboard-ui\css\images\items\searchhints\tv.png">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\css\images\media\mute.png">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\css\images\media\settings.png">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\css\images\media\volume.png">

+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\css\images\rotten.png">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>