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(); + 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 @@ -184,6 +184,14 @@ namespace MediaBrowser.Controller.Library /// Task. Task CreateItem(BaseItem item, CancellationToken cancellationToken); + /// + /// Creates the items. + /// + /// The items. + /// The cancellation token. + /// Task. + Task CreateItems(IEnumerable items, CancellationToken cancellationToken); + /// /// Updates the item. /// 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 /// The critic reviews. /// Task. Task SaveCriticReviews(Guid itemId, IEnumerable criticReviews); + + /// + /// Saves the items. + /// + /// The items. + /// The cancellation token. + /// Task. + Task SaveItems(IEnumerable 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 /// /// The remove /// - const string remove = "\"'!`?"; + const string Remove = "\"'!`?"; // "Face/Off" support. /// /// The spacers /// - 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) /// /// The replace start numbers /// @@ -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); /// /// 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 /// /// The tv db /// - internal readonly SemaphoreSlim TvDbResourcePool = new SemaphoreSlim(1, 1); + internal readonly SemaphoreSlim TvDbResourcePool = new SemaphoreSlim(2, 2); /// /// Gets the current. diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 72cf42c14c..fbf2dfc70b 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -1036,21 +1036,40 @@ namespace MediaBrowser.Server.Implementations.Library /// The item. /// The cancellation token. /// Task. - 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); + /// + /// Creates the items. + /// + /// The items. + /// The cancellation token. + /// Task. + public async Task CreateItems(IEnumerable 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 /// Task. public async Task UpdateItem(BaseItem item, CancellationToken cancellationToken) { - await SaveItem(item, cancellationToken).ConfigureAwait(false); + await ItemRepository.SaveItem(item, cancellationToken).ConfigureAwait(false); UpdateItemInLibraryCache(item); @@ -1099,17 +1118,6 @@ namespace MediaBrowser.Server.Implementations.Library } } - /// - /// Saves the item. - /// - /// The item. - /// The cancellation token. - /// Task. - private Task SaveItem(BaseItem item, CancellationToken cancellationToken) - { - return ItemRepository.SaveItem(item, cancellationToken); - } - /// /// Retrieves the item. /// diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs index 23ab104998..0ca4dda776 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs @@ -135,7 +135,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// /// The _write lock /// - private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1,1); + private readonly SemaphoreSlim _writeLock = new SemaphoreSlim(1, 1); /// /// Prepares the statements. @@ -172,13 +172,34 @@ namespace MediaBrowser.Server.Implementations.Sqlite /// The cancellation token. /// Task. /// item - 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); + } + + /// + /// Saves the items. + /// + /// The items. + /// The cancellation token. + /// Task. + /// + /// items + /// or + /// cancellationToken + /// + public async Task SaveItems(IEnumerable 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 bd60c834fe..ee2fcc10cf 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 06fe8b439b..ca35b353c6 100644 --- a/MediaBrowser.ServerApplication/App.config +++ b/MediaBrowser.ServerApplication/App.config @@ -10,7 +10,7 @@ - + diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 11745acd08..72e602d2e3 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -114,9 +114,15 @@ PreserveNewest + + PreserveNewest + PreserveNewest + + PreserveNewest + PreserveNewest