From f98b611debd757dcf2b2862fa04f28d514a7fa3d Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Jul 2013 20:11:11 -0400 Subject: moved dependencies for mono --- .../EntryPoints/LibraryChangedNotifier.cs | 339 +++++++++++++++++++++ .../EntryPoints/LoadRegistrations.cs | 57 ++++ .../EntryPoints/RefreshUsersMetadata.cs | 41 +++ .../EntryPoints/WebSocketEvents.cs | 207 +++++++++++++ .../MediaBrowser.Server.Implementations.csproj | 10 +- .../Persistence/SqliteChapterRepository.cs | 63 ++-- .../Persistence/SqliteExtensions.cs | 31 +- .../packages.config | 1 - 8 files changed, 707 insertions(+), 42 deletions(-) create mode 100644 MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs create mode 100644 MediaBrowser.Server.Implementations/EntryPoints/LoadRegistrations.cs create mode 100644 MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs create mode 100644 MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs (limited to 'MediaBrowser.Server.Implementations') diff --git a/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs new file mode 100644 index 000000000..71d014468 --- /dev/null +++ b/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs @@ -0,0 +1,339 @@ +using MediaBrowser.Common.Net; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Plugins; +using MediaBrowser.Controller.Session; +using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; +using MoreLinq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; + +namespace MediaBrowser.Server.Implementations.EntryPoints +{ + public class LibraryChangedNotifier : IServerEntryPoint + { + /// + /// The _library manager + /// + private readonly ILibraryManager _libraryManager; + + private readonly ISessionManager _sessionManager; + private readonly IServerManager _serverManager; + private readonly IUserManager _userManager; + private readonly ILogger _logger; + + /// + /// The _library changed sync lock + /// + private readonly object _libraryChangedSyncLock = new object(); + + private readonly List _foldersAddedTo = new List(); + private readonly List _foldersRemovedFrom = new List(); + + private readonly List _itemsAdded = new List(); + private readonly List _itemsRemoved = new List(); + private readonly List _itemsUpdated = new List(); + + /// + /// Gets or sets the library update timer. + /// + /// The library update timer. + private Timer LibraryUpdateTimer { get; set; } + + /// + /// The library update duration + /// + private const int LibraryUpdateDuration = 60000; + + public LibraryChangedNotifier(ILibraryManager libraryManager, ISessionManager sessionManager, IServerManager serverManager, IUserManager userManager, ILogger logger) + { + _libraryManager = libraryManager; + _sessionManager = sessionManager; + _serverManager = serverManager; + _userManager = userManager; + _logger = logger; + } + + public void Run() + { + _libraryManager.ItemAdded += libraryManager_ItemAdded; + _libraryManager.ItemUpdated += libraryManager_ItemUpdated; + _libraryManager.ItemRemoved += libraryManager_ItemRemoved; + + } + + /// + /// Handles the ItemAdded event of the libraryManager control. + /// + /// The source of the event. + /// The instance containing the event data. + void libraryManager_ItemAdded(object sender, ItemChangeEventArgs e) + { + lock (_libraryChangedSyncLock) + { + if (LibraryUpdateTimer == null) + { + LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration, + Timeout.Infinite); + } + else + { + LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite); + } + + if (e.Item.Parent != null) + { + _foldersAddedTo.Add(e.Item.Parent); + } + + _itemsAdded.Add(e.Item); + } + } + + /// + /// Handles the ItemUpdated event of the libraryManager control. + /// + /// The source of the event. + /// The instance containing the event data. + void libraryManager_ItemUpdated(object sender, ItemChangeEventArgs e) + { + lock (_libraryChangedSyncLock) + { + if (LibraryUpdateTimer == null) + { + LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration, + Timeout.Infinite); + } + else + { + LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite); + } + + _itemsUpdated.Add(e.Item); + } + } + + /// + /// Handles the ItemRemoved event of the libraryManager control. + /// + /// The source of the event. + /// The instance containing the event data. + void libraryManager_ItemRemoved(object sender, ItemChangeEventArgs e) + { + lock (_libraryChangedSyncLock) + { + if (LibraryUpdateTimer == null) + { + LibraryUpdateTimer = new Timer(LibraryUpdateTimerCallback, null, LibraryUpdateDuration, + Timeout.Infinite); + } + else + { + LibraryUpdateTimer.Change(LibraryUpdateDuration, Timeout.Infinite); + } + + if (e.Item.Parent != null) + { + _foldersRemovedFrom.Add(e.Item.Parent); + } + + _itemsRemoved.Add(e.Item); + } + } + + /// + /// Libraries the update timer callback. + /// + /// The state. + private void LibraryUpdateTimerCallback(object state) + { + lock (_libraryChangedSyncLock) + { + // Remove dupes in case some were saved multiple times + var foldersAddedTo = _foldersAddedTo.DistinctBy(i => i.Id).ToList(); + + var foldersRemovedFrom = _foldersRemovedFrom.DistinctBy(i => i.Id).ToList(); + + var itemsUpdated = _itemsUpdated + .Where(i => !_itemsAdded.Contains(i)) + .DistinctBy(i => i.Id) + .ToList(); + + SendChangeNotifications(_itemsAdded.ToList(), itemsUpdated, _itemsRemoved.ToList(), foldersAddedTo, foldersRemovedFrom, CancellationToken.None); + + if (LibraryUpdateTimer != null) + { + LibraryUpdateTimer.Dispose(); + LibraryUpdateTimer = null; + } + + _itemsAdded.Clear(); + _itemsRemoved.Clear(); + _itemsUpdated.Clear(); + _foldersAddedTo.Clear(); + _foldersRemovedFrom.Clear(); + } + } + + /// + /// Sends the change notifications. + /// + /// The items added. + /// The items updated. + /// The items removed. + /// The folders added to. + /// The folders removed from. + /// The cancellation token. + private async void SendChangeNotifications(IEnumerable itemsAdded, IEnumerable itemsUpdated, IEnumerable itemsRemoved, IEnumerable foldersAddedTo, IEnumerable foldersRemovedFrom, CancellationToken cancellationToken) + { + var currentSessions = _sessionManager.Sessions.ToList(); + + var users = currentSessions.Select(i => i.User) + .Where(i => i != null) + .Select(i => i.Id) + .Distinct() + .ToList(); + + foreach (var userId in users) + { + var id = userId; + var webSockets = currentSessions.Where(u => u.User != null && u.User.Id == id) + .SelectMany(i => i.WebSockets) + .ToList(); + + try + { + await _serverManager.SendWebSocketMessageAsync("LibraryChanged", () => GetLibraryUpdateInfo(itemsAdded, itemsUpdated, itemsRemoved, foldersAddedTo, foldersRemovedFrom, id), webSockets, cancellationToken).ConfigureAwait(false); + } + catch (Exception ex) + { + _logger.ErrorException("Error sending LibraryChanged message", ex); + } + } + } + + /// + /// Gets the library update info. + /// + /// The items added. + /// The items updated. + /// The items removed. + /// The folders added to. + /// The folders removed from. + /// The user id. + /// LibraryUpdateInfo. + private LibraryUpdateInfo GetLibraryUpdateInfo(IEnumerable itemsAdded, IEnumerable itemsUpdated, IEnumerable itemsRemoved, IEnumerable foldersAddedTo, IEnumerable foldersRemovedFrom, Guid userId) + { + var user = _userManager.GetUserById(userId); + + var collections = user.RootFolder.GetChildren(user).ToList(); + + var allRecursiveChildren = user.RootFolder.GetRecursiveChildren(user).ToDictionary(i => i.Id); + + return new LibraryUpdateInfo + { + ItemsAdded = itemsAdded.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), + + ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), + + ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), + + FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(), + + FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList() + }; + } + + /// + /// Translates the physical item to user library. + /// + /// + /// The item. + /// The user. + /// The collections. + /// All recursive children. + /// IEnumerable{``0}. + private IEnumerable TranslatePhysicalItemToUserLibrary(T item, User user, IEnumerable collections, Dictionary allRecursiveChildren) + where T : BaseItem + { + // If the physical root changed, return the user root + if (item is AggregateFolder) + { + return new T[] { user.RootFolder as T }; + } + + // Need to find what user collection folder this belongs to + if (item.Parent is AggregateFolder) + { + if (item.LocationType == LocationType.FileSystem) + { + return collections.Where(i => + { + + try + { + return i.LocationType == LocationType.FileSystem && + i.ResolveArgs.PhysicalLocations.Contains(item.Path); + } + catch (Exception ex) + { + _logger.ErrorException("Error getting ResolveArgs for {0}", ex, i.Path); + return false; + } + + }).Cast(); + } + } + + // If it's a user root, return it only if it's the right one + if (item is UserRootFolder) + { + if (item.Id == user.RootFolder.Id) + { + return new T[] { item }; + } + + return new T[] { }; + } + + // Return it only if it's in the user's library + if (allRecursiveChildren.ContainsKey(item.Id)) + { + return new T[] { item }; + } + + return new T[] { }; + } + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + public void Dispose() + { + Dispose(true); + } + + /// + /// Releases unmanaged and - optionally - managed resources. + /// + /// true to release both managed and unmanaged resources; false to release only unmanaged resources. + protected virtual void Dispose(bool dispose) + { + if (dispose) + { + if (LibraryUpdateTimer != null) + { + LibraryUpdateTimer.Dispose(); + LibraryUpdateTimer = null; + } + + _libraryManager.ItemAdded -= libraryManager_ItemAdded; + _libraryManager.ItemUpdated -= libraryManager_ItemUpdated; + _libraryManager.ItemRemoved -= libraryManager_ItemRemoved; + } + } + } +} diff --git a/MediaBrowser.Server.Implementations/EntryPoints/LoadRegistrations.cs b/MediaBrowser.Server.Implementations/EntryPoints/LoadRegistrations.cs new file mode 100644 index 000000000..c2c4056f5 --- /dev/null +++ b/MediaBrowser.Server.Implementations/EntryPoints/LoadRegistrations.cs @@ -0,0 +1,57 @@ +using MediaBrowser.Common.Security; +using MediaBrowser.Controller.Plugins; +using MediaBrowser.Model.Logging; +using System; + +namespace MediaBrowser.Server.Implementations.EntryPoints +{ + /// + /// Class LoadRegistrations + /// + public class LoadRegistrations : IServerEntryPoint + { + /// + /// The _security manager + /// + private readonly ISecurityManager _securityManager; + + /// + /// The _logger + /// + private readonly ILogger _logger; + + /// + /// Initializes a new instance of the class. + /// + /// The security manager. + /// The log manager. + public LoadRegistrations(ISecurityManager securityManager, ILogManager logManager) + { + _securityManager = securityManager; + + _logger = logManager.GetLogger("Registration Loader"); + } + + /// + /// Runs this instance. + /// + public async void Run() + { + try + { + await _securityManager.LoadAllRegistrationInfo().ConfigureAwait(false); + } + catch (Exception ex) + { + _logger.ErrorException("Error loading registration info", ex); + } + } + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + public void Dispose() + { + } + } +} diff --git a/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs b/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs new file mode 100644 index 000000000..a0b7ff515 --- /dev/null +++ b/MediaBrowser.Server.Implementations/EntryPoints/RefreshUsersMetadata.cs @@ -0,0 +1,41 @@ +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Plugins; +using System.Threading; + +namespace MediaBrowser.Server.Implementations.EntryPoints +{ + /// + /// Class RefreshUsersMetadata + /// + public class RefreshUsersMetadata : IServerEntryPoint + { + /// + /// The _user manager + /// + private readonly IUserManager _userManager; + + /// + /// Initializes a new instance of the class. + /// + /// The user manager. + public RefreshUsersMetadata(IUserManager userManager) + { + _userManager = userManager; + } + + /// + /// Runs this instance. + /// + public async void Run() + { + await _userManager.RefreshUsersMetadata(CancellationToken.None).ConfigureAwait(false); + } + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + public void Dispose() + { + } + } +} diff --git a/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs b/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs new file mode 100644 index 000000000..b4bffc077 --- /dev/null +++ b/MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs @@ -0,0 +1,207 @@ +using MediaBrowser.Common.Events; +using MediaBrowser.Common.Net; +using MediaBrowser.Common.Plugins; +using MediaBrowser.Common.ScheduledTasks; +using MediaBrowser.Common.Updates; +using MediaBrowser.Controller; +using MediaBrowser.Controller.Dto; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Plugins; +using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Tasks; +using MediaBrowser.Model.Updates; +using System; + +namespace MediaBrowser.Server.Implementations.EntryPoints +{ + /// + /// Class WebSocketEvents + /// + public class WebSocketEvents : IServerEntryPoint + { + /// + /// The _server manager + /// + private readonly IServerManager _serverManager; + /// + /// The _logger + /// + private readonly ILogger _logger; + + /// + /// The _user manager + /// + private readonly IUserManager _userManager; + + /// + /// The _installation manager + /// + private readonly IInstallationManager _installationManager; + + /// + /// The _kernel + /// + private readonly IServerApplicationHost _appHost; + + /// + /// The _task manager + /// + private readonly ITaskManager _taskManager; + + /// + /// Initializes a new instance of the class. + /// + /// The server manager. + /// The logger. + /// The user manager. + public WebSocketEvents(IServerManager serverManager, IServerApplicationHost appHost, ILogger logger, IUserManager userManager, IInstallationManager installationManager, ITaskManager taskManager) + { + _serverManager = serverManager; + _logger = logger; + _userManager = userManager; + _installationManager = installationManager; + _appHost = appHost; + _taskManager = taskManager; + } + + public void Run() + { + _userManager.UserDeleted += userManager_UserDeleted; + _userManager.UserUpdated += userManager_UserUpdated; + + _appHost.HasPendingRestartChanged += kernel_HasPendingRestartChanged; + + _installationManager.PluginUninstalled += InstallationManager_PluginUninstalled; + _installationManager.PackageInstalling += installationManager_PackageInstalling; + _installationManager.PackageInstallationCancelled += installationManager_PackageInstallationCancelled; + _installationManager.PackageInstallationCompleted += installationManager_PackageInstallationCompleted; + _installationManager.PackageInstallationFailed += installationManager_PackageInstallationFailed; + + _taskManager.TaskExecuting += _taskManager_TaskExecuting; + _taskManager.TaskCompleted += _taskManager_TaskCompleted; + } + + void _taskManager_TaskCompleted(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("ScheduledTaskEnded", e.Argument); + } + + void _taskManager_TaskExecuting(object sender, EventArgs e) + { + var task = (IScheduledTask)sender; + _serverManager.SendWebSocketMessage("ScheduledTaskStarted", task.Name); + } + + /// + /// Installations the manager_ package installation failed. + /// + /// The sender. + /// The e. + void installationManager_PackageInstallationFailed(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstallationFailed", e.Argument); + } + + /// + /// Installations the manager_ package installation completed. + /// + /// The sender. + /// The e. + void installationManager_PackageInstallationCompleted(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstallationCompleted", e.Argument); + } + + /// + /// Installations the manager_ package installation cancelled. + /// + /// The sender. + /// The e. + void installationManager_PackageInstallationCancelled(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstallationCancelled", e.Argument); + } + + /// + /// Installations the manager_ package installing. + /// + /// The sender. + /// The e. + void installationManager_PackageInstalling(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PackageInstalling", e.Argument); + } + + /// + /// Installations the manager_ plugin uninstalled. + /// + /// The sender. + /// The e. + void InstallationManager_PluginUninstalled(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("PluginUninstalled", e.Argument.GetPluginInfo()); + } + + /// + /// Handles the HasPendingRestartChanged event of the kernel control. + /// + /// The source of the event. + /// The instance containing the event data. + void kernel_HasPendingRestartChanged(object sender, EventArgs e) + { + _serverManager.SendWebSocketMessage("RestartRequired", _appHost.GetSystemInfo()); + } + + /// + /// Users the manager_ user updated. + /// + /// The sender. + /// The e. + async void userManager_UserUpdated(object sender, GenericEventArgs e) + { + var dto = await new UserDtoBuilder(_logger).GetUserDto(e.Argument).ConfigureAwait(false); + + _serverManager.SendWebSocketMessage("UserUpdated", dto); + } + + /// + /// Users the manager_ user deleted. + /// + /// The sender. + /// The e. + void userManager_UserDeleted(object sender, GenericEventArgs e) + { + _serverManager.SendWebSocketMessage("UserDeleted", e.Argument.Id.ToString("N")); + } + + /// + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. + /// + public void Dispose() + { + Dispose(true); + } + + /// + /// Releases unmanaged and - optionally - managed resources. + /// + /// true to release both managed and unmanaged resources; false to release only unmanaged resources. + protected virtual void Dispose(bool dispose) + { + if (dispose) + { + _userManager.UserDeleted -= userManager_UserDeleted; + _userManager.UserUpdated -= userManager_UserUpdated; + + _installationManager.PluginUninstalled -= InstallationManager_PluginUninstalled; + _installationManager.PackageInstalling -= installationManager_PackageInstalling; + _installationManager.PackageInstallationCancelled -= installationManager_PackageInstallationCancelled; + _installationManager.PackageInstallationCompleted -= installationManager_PackageInstallationCompleted; + _installationManager.PackageInstallationFailed -= installationManager_PackageInstallationFailed; + + _appHost.HasPendingRestartChanged -= kernel_HasPendingRestartChanged; + } + } + } +} diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index b2e60a401..34dc8ff52 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -64,12 +64,6 @@ False ..\packages\ServiceStack.Common.3.9.54\lib\net35\ServiceStack.Interfaces.dll - - ..\packages\ServiceStack.OrmLite.Sqlite32.3.9.54\lib\net40\ServiceStack.OrmLite.dll - - - ..\packages\ServiceStack.OrmLite.Sqlite32.3.9.54\lib\net40\ServiceStack.OrmLite.SqliteNET.dll - False ..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.SqlServer.dll @@ -115,6 +109,10 @@ + + + + diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs index cac612fc8..c472241e3 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteChapterRepository.cs @@ -1,11 +1,9 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; -using MediaBrowser.Model.Serialization; using System; using System.Collections.Generic; using System.Data; -using System.Data.SQLite; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -14,7 +12,7 @@ namespace MediaBrowser.Server.Implementations.Persistence { public class SqliteChapterRepository { - private SQLiteConnection _connection; + private IDbConnection _connection; private readonly ILogger _logger; @@ -23,8 +21,8 @@ namespace MediaBrowser.Server.Implementations.Persistence /// private readonly IApplicationPaths _appPaths; - private SQLiteCommand _deleteChaptersCommand; - private SQLiteCommand _saveChapterCommand; + private IDbCommand _deleteChaptersCommand; + private IDbCommand _saveChapterCommand; /// /// Initializes a new instance of the class. @@ -80,23 +78,18 @@ namespace MediaBrowser.Server.Implementations.Persistence /// private void PrepareStatements() { - _deleteChaptersCommand = new SQLiteCommand - { - CommandText = "delete from chapters where ItemId=@ItemId" - }; - - _deleteChaptersCommand.Parameters.Add(new SQLiteParameter("@ItemId")); - - _saveChapterCommand = new SQLiteCommand - { - CommandText = "replace into chapters (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath)" - }; - - _saveChapterCommand.Parameters.Add(new SQLiteParameter("@ItemId")); - _saveChapterCommand.Parameters.Add(new SQLiteParameter("@ChapterIndex")); - _saveChapterCommand.Parameters.Add(new SQLiteParameter("@StartPositionTicks")); - _saveChapterCommand.Parameters.Add(new SQLiteParameter("@Name")); - _saveChapterCommand.Parameters.Add(new SQLiteParameter("@ImagePath")); + _deleteChaptersCommand = _connection.CreateCommand(); + _deleteChaptersCommand.CommandText = "delete from chapters where ItemId=@ItemId"; + _deleteChaptersCommand.Parameters.Add(_deleteChaptersCommand, "@ItemId"); + + _saveChapterCommand = _connection.CreateCommand(); + _saveChapterCommand.CommandText = "replace into chapters (ItemId, ChapterIndex, StartPositionTicks, Name, ImagePath) values (@ItemId, @ChapterIndex, @StartPositionTicks, @Name, @ImagePath)"; + + _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ItemId"); + _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ChapterIndex"); + _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@StartPositionTicks"); + _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@Name"); + _saveChapterCommand.Parameters.Add(_saveChapterCommand, "@ImagePath"); } /// @@ -116,7 +109,7 @@ namespace MediaBrowser.Server.Implementations.Persistence { cmd.CommandText = "select StartPositionTicks,Name,ImagePath from Chapters where ItemId = @ItemId order by ChapterIndex asc"; - cmd.Parameters.Add("@ItemId", DbType.Guid).Value = id; + cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult)) { @@ -161,8 +154,8 @@ namespace MediaBrowser.Server.Implementations.Persistence { cmd.CommandText = "select StartPositionTicks,Name,ImagePath from Chapters where ItemId = @ItemId and ChapterIndex=@ChapterIndex"; - cmd.Parameters.Add("@ItemId", DbType.Guid).Value = id; - cmd.Parameters.Add("@ChapterIndex", DbType.Int32).Value = index; + cmd.Parameters.Add(cmd, "@ItemId", DbType.Guid).Value = id; + cmd.Parameters.Add(cmd, "@ChapterIndex", DbType.Int32).Value = index; using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult | CommandBehavior.SingleRow)) { @@ -215,16 +208,18 @@ namespace MediaBrowser.Server.Implementations.Persistence await _writeLock.WaitAsync(cancellationToken).ConfigureAwait(false); - SQLiteTransaction transaction = null; + IDbTransaction transaction = null; try { transaction = _connection.BeginTransaction(); // First delete chapters - _deleteChaptersCommand.Parameters[0].Value = id; + _deleteChaptersCommand.GetParameter(0).Value = id; + _deleteChaptersCommand.Transaction = transaction; - await _deleteChaptersCommand.ExecuteNonQueryAsync(cancellationToken); + + _deleteChaptersCommand.ExecuteNonQuery(); var index = 0; @@ -232,15 +227,15 @@ namespace MediaBrowser.Server.Implementations.Persistence { cancellationToken.ThrowIfCancellationRequested(); - _saveChapterCommand.Parameters[0].Value = id; - _saveChapterCommand.Parameters[1].Value = index; - _saveChapterCommand.Parameters[2].Value = chapter.StartPositionTicks; - _saveChapterCommand.Parameters[3].Value = chapter.Name; - _saveChapterCommand.Parameters[4].Value = chapter.ImagePath; + _saveChapterCommand.GetParameter(0).Value = id; + _saveChapterCommand.GetParameter(1).Value = index; + _saveChapterCommand.GetParameter(2).Value = chapter.StartPositionTicks; + _saveChapterCommand.GetParameter(3).Value = chapter.Name; + _saveChapterCommand.GetParameter(4).Value = chapter.ImagePath; _saveChapterCommand.Transaction = transaction; - await _saveChapterCommand.ExecuteNonQueryAsync(cancellationToken); + _saveChapterCommand.ExecuteNonQuery(); index++; } diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs index 2b14e9b24..ead409598 100644 --- a/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs +++ b/MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs @@ -56,11 +56,40 @@ namespace MediaBrowser.Server.Implementations.Persistence /// /// The conn. /// true if the specified conn is open; otherwise, false. - public static bool IsOpen(this SQLiteConnection conn) + public static bool IsOpen(this IDbConnection conn) { return conn.State == ConnectionState.Open; } + public static IDataParameter GetParameter(this IDbCommand cmd, int index) + { + return (IDataParameter)cmd.Parameters[index]; + } + + public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name, DbType type) + { + var param = cmd.CreateParameter(); + + param.ParameterName = name; + param.DbType = type; + + paramCollection.Add(param); + + return param; + } + + public static IDataParameter Add(this IDataParameterCollection paramCollection, IDbCommand cmd, string name) + { + var param = cmd.CreateParameter(); + + param.ParameterName = name; + + paramCollection.Add(param); + + return param; + } + + /// /// Gets a stream from a DataReader at a given ordinal /// diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index e13d18747..b3294492f 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -10,7 +10,6 @@ - -- cgit v1.2.3