From 804115bf8d526477756828ff4ca632c351e03b90 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 8 Apr 2013 11:55:53 -0400 Subject: remove and/or delay unnecessary startup work --- .../Library/LibraryManager.cs | 86 +++++++++++++++++----- .../Library/UserManager.cs | 41 ++++++----- 2 files changed, 89 insertions(+), 38 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Library') diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index 9bc47a025..a21b3e93e 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -7,6 +7,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Persistence; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Sorting; using MediaBrowser.Model.Configuration; @@ -61,6 +62,12 @@ namespace MediaBrowser.Server.Implementations.Library /// The comparers. private IEnumerable Comparers { get; set; } + /// + /// Gets the active item repository + /// + /// The item repository. + public IItemRepository ItemRepository { get; set; } + #region LibraryChanged Event /// /// Fires whenever any validation routine adds or removes items. The added and removed items are properties of the args. @@ -95,12 +102,6 @@ namespace MediaBrowser.Server.Implementations.Library /// private readonly IUserManager _userManager; - /// - /// Gets or sets the kernel. - /// - /// The kernel. - private Kernel Kernel { get; set; } - /// /// Gets or sets the configuration manager. /// @@ -126,27 +127,25 @@ namespace MediaBrowser.Server.Implementations.Library } } - private ConcurrentDictionary _userRootFolders = + private readonly ConcurrentDictionary _userRootFolders = new ConcurrentDictionary(); - + /// /// Initializes a new instance of the class. /// - /// The kernel. /// The logger. /// The task manager. /// The user manager. /// The configuration manager. - public LibraryManager(Kernel kernel, ILogger logger, ITaskManager taskManager, IUserManager userManager, IServerConfigurationManager configurationManager) + public LibraryManager(ILogger logger, ITaskManager taskManager, IUserManager userManager, IServerConfigurationManager configurationManager) { - Kernel = kernel; _logger = logger; _taskManager = taskManager; _userManager = userManager; ConfigurationManager = configurationManager; ByReferenceItems = new ConcurrentDictionary(); - ConfigurationManager.ConfigurationUpdated += kernel_ConfigurationUpdated; + ConfigurationManager.ConfigurationUpdated += ConfigurationUpdated; RecordConfigurationValues(configurationManager.Configuration); } @@ -159,7 +158,11 @@ namespace MediaBrowser.Server.Implementations.Library /// The resolvers. /// The intro providers. /// The item comparers. - public void AddParts(IEnumerable rules, IEnumerable pluginFolders, IEnumerable resolvers, IEnumerable introProviders, IEnumerable itemComparers) + public void AddParts(IEnumerable rules, + IEnumerable pluginFolders, + IEnumerable resolvers, + IEnumerable introProviders, + IEnumerable itemComparers) { EntityResolutionIgnoreRules = rules; PluginFolderCreators = pluginFolders; @@ -212,11 +215,11 @@ namespace MediaBrowser.Server.Implementations.Library } /// - /// Handles the ConfigurationUpdated event of the kernel control. + /// Configurations the updated. /// - /// The source of the event. - /// The instance containing the event data. - void kernel_ConfigurationUpdated(object sender, EventArgs e) + /// The sender. + /// The instance containing the event data. + void ConfigurationUpdated(object sender, EventArgs e) { var config = ConfigurationManager.Configuration; @@ -476,7 +479,7 @@ namespace MediaBrowser.Server.Implementations.Library public AggregateFolder CreateRootFolder() { var rootFolderPath = ConfigurationManager.ApplicationPaths.RootFolderPath; - var rootFolder = Kernel.ItemRepository.RetrieveItem(rootFolderPath.GetMBId(typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(rootFolderPath); + var rootFolder = RetrieveItem(rootFolderPath.GetMBId(typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(rootFolderPath); // Add in the plug-in folders foreach (var child in PluginFolderCreators) @@ -494,7 +497,7 @@ namespace MediaBrowser.Server.Implementations.Library /// UserRootFolder. public UserRootFolder GetUserRootFolder(string userRootPath) { - return _userRootFolders.GetOrAdd(userRootPath, key => Kernel.ItemRepository.RetrieveItem(userRootPath.GetMBId(typeof(UserRootFolder))) as UserRootFolder ?? (UserRootFolder)ResolvePath(userRootPath)); + return _userRootFolders.GetOrAdd(userRootPath, key => RetrieveItem(userRootPath.GetMBId(typeof(UserRootFolder))) as UserRootFolder ?? (UserRootFolder)ResolvePath(userRootPath)); } /// @@ -639,7 +642,7 @@ namespace MediaBrowser.Server.Implementations.Library var id = path.GetMBId(typeof(T)); - var item = Kernel.ItemRepository.RetrieveItem(id) as T; + var item = RetrieveItem(id) as T; if (item == null) { item = new T @@ -899,5 +902,48 @@ namespace MediaBrowser.Server.Implementations.Library return comparer; } + + /// + /// Saves the item. + /// + /// The item. + /// The cancellation token. + /// Task. + public Task SaveItem(BaseItem item, CancellationToken cancellationToken) + { + return ItemRepository.SaveItem(item, cancellationToken); + } + + /// + /// Retrieves the item. + /// + /// The id. + /// Task{BaseItem}. + public BaseItem RetrieveItem(Guid id) + { + return ItemRepository.RetrieveItem(id); + } + + /// + /// Saves the children. + /// + /// The id. + /// The children. + /// The cancellation token. + /// Task. + public Task SaveChildren(Guid id, IEnumerable children, CancellationToken cancellationToken) + { + return ItemRepository.SaveChildren(id, children, cancellationToken); + } + + /// + /// Retrieves the children. + /// + /// The parent. + /// IEnumerable{BaseItem}. + public IEnumerable RetrieveChildren(Folder parent) + { + return ItemRepository.RetrieveChildren(parent); + } } } diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs index 9293d8199..f6d20aa53 100644 --- a/MediaBrowser.Server.Implementations/Library/UserManager.cs +++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs @@ -4,6 +4,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.Connectivity; using MediaBrowser.Model.Logging; using System; @@ -86,12 +87,6 @@ namespace MediaBrowser.Server.Implementations.Library /// private readonly ILogger _logger; - /// - /// Gets or sets the kernel. - /// - /// The kernel. - private Kernel Kernel { get; set; } - /// /// Gets or sets the configuration manager. /// @@ -99,17 +94,27 @@ namespace MediaBrowser.Server.Implementations.Library private IServerConfigurationManager ConfigurationManager { get; set; } private readonly ConcurrentDictionary> _userData = new ConcurrentDictionary>(); - + + /// + /// Gets the active user data repository + /// + /// The user data repository. + public IUserDataRepository UserDataRepository { get; set; } + + /// + /// Gets the active user repository + /// + /// The user repository. + public IUserRepository UserRepository { get; set; } + /// /// Initializes a new instance of the class. /// - /// The kernel. /// The logger. /// The configuration manager. - public UserManager(Kernel kernel, ILogger logger, IServerConfigurationManager configurationManager) + public UserManager(ILogger logger, IServerConfigurationManager configurationManager) { _logger = logger; - Kernel = kernel; ConfigurationManager = configurationManager; } @@ -250,7 +255,7 @@ namespace MediaBrowser.Server.Implementations.Library } // Save this directly. No need to fire off all the events for this. - return Kernel.UserRepository.SaveUser(user, CancellationToken.None); + return UserRepository.SaveUser(user, CancellationToken.None); } /// @@ -334,7 +339,7 @@ namespace MediaBrowser.Server.Implementations.Library /// IEnumerable{User}. private IEnumerable LoadUsers() { - var users = Kernel.UserRepository.RetrieveAllUsers().ToList(); + var users = UserRepository.RetrieveAllUsers().ToList(); // There always has to be at least one user. if (users.Count == 0) @@ -343,7 +348,7 @@ namespace MediaBrowser.Server.Implementations.Library var user = InstantiateNewUser(name); - var task = Kernel.UserRepository.SaveUser(user, CancellationToken.None); + var task = UserRepository.SaveUser(user, CancellationToken.None); // Hate having to block threads Task.WaitAll(task); @@ -422,7 +427,7 @@ namespace MediaBrowser.Server.Implementations.Library user.DateModified = DateTime.UtcNow; - await Kernel.UserRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false); + await UserRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false); OnUserUpdated(user); } @@ -452,7 +457,7 @@ namespace MediaBrowser.Server.Implementations.Library list.Add(user); Users = list; - await Kernel.UserRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false); + await UserRepository.SaveUser(user, CancellationToken.None).ConfigureAwait(false); return user; } @@ -481,7 +486,7 @@ namespace MediaBrowser.Server.Implementations.Library throw new ArgumentException(string.Format("The user '{0}' be deleted because there must be at least one user in the system.", user.Name)); } - await Kernel.UserRepository.DeleteUser(user, CancellationToken.None).ConfigureAwait(false); + await UserRepository.DeleteUser(user, CancellationToken.None).ConfigureAwait(false); OnUserDeleted(user); @@ -713,7 +718,7 @@ namespace MediaBrowser.Server.Implementations.Library var key = userId + userDataId.ToString(); try { - await Kernel.Instance.UserDataRepository.SaveUserData(userId, userDataId, userData, cancellationToken).ConfigureAwait(false); + await UserDataRepository.SaveUserData(userId, userDataId, userData, cancellationToken).ConfigureAwait(false); var newValue = Task.FromResult(userData); @@ -749,7 +754,7 @@ namespace MediaBrowser.Server.Implementations.Library /// Task{UserItemData}. private async Task RetrieveUserData(Guid userId, Guid userDataId) { - var userdata = await Kernel.Instance.UserDataRepository.GetUserData(userId, userDataId).ConfigureAwait(false); + var userdata = await UserDataRepository.GetUserData(userId, userDataId).ConfigureAwait(false); return userdata ?? new UserItemData(); } -- cgit v1.2.3