From 931c0ea455161b8ee00005a0ffd1f8afab41f7bb Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 21 Feb 2013 16:39:53 -0500 Subject: more dependancy injection --- MediaBrowser.Controller/Library/LibraryManager.cs | 24 ++++++++++++++-------- MediaBrowser.Controller/Library/UserDataManager.cs | 17 ++++++++++----- MediaBrowser.Controller/Library/UserManager.cs | 16 +++++++++++---- 3 files changed, 40 insertions(+), 17 deletions(-) (limited to 'MediaBrowser.Controller/Library') diff --git a/MediaBrowser.Controller/Library/LibraryManager.cs b/MediaBrowser.Controller/Library/LibraryManager.cs index d5b45e211..95a11e8fe 100644 --- a/MediaBrowser.Controller/Library/LibraryManager.cs +++ b/MediaBrowser.Controller/Library/LibraryManager.cs @@ -7,6 +7,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Resolvers; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; using MediaBrowser.Model.Tasks; using MoreLinq; using System; @@ -38,7 +39,7 @@ namespace MediaBrowser.Controller.Library /// The instance containing the event data. internal void OnLibraryChanged(ChildrenChangedEventArgs args) { - EventHelper.QueueEventIfNotNull(LibraryChanged, this, args, Logger); + EventHelper.QueueEventIfNotNull(LibraryChanged, this, args, _logger); // Had to put this in a separate method to avoid an implicitly captured closure SendLibraryChangedWebSocketMessage(args); @@ -55,13 +56,20 @@ namespace MediaBrowser.Controller.Library } #endregion + /// + /// The _logger + /// + private readonly ILogger _logger; + /// /// Initializes a new instance of the class. /// /// The kernel. - public LibraryManager(Kernel kernel) + /// The logger. + public LibraryManager(Kernel kernel, ILogger logger) : base(kernel) { + _logger = logger; } /// @@ -115,7 +123,7 @@ namespace MediaBrowser.Controller.Library // When resolving the root, we need it's grandchildren (children of user views) var flattenFolderDepth = args.IsPhysicalRoot ? 2 : 0; - args.FileSystemDictionary = FileData.GetFilteredFileSystemEntries(args.Path, Logger, flattenFolderDepth: flattenFolderDepth, args: args); + args.FileSystemDictionary = FileData.GetFilteredFileSystemEntries(args.Path, _logger, flattenFolderDepth: flattenFolderDepth, args: args); } // Check to see if we should resolve based on our contents @@ -155,7 +163,7 @@ namespace MediaBrowser.Controller.Library } catch (Exception ex) { - Logger.ErrorException("Error resolving path {0}", ex, f.Path); + _logger.ErrorException("Error resolving path {0}", ex, f.Path); } }); @@ -303,7 +311,7 @@ namespace MediaBrowser.Controller.Library { cancellationToken.ThrowIfCancellationRequested(); - Logger.Debug("Creating {0}: {1}", typeof(T).Name, name); + _logger.Debug("Creating {0}: {1}", typeof(T).Name, name); path = Path.Combine(path, FileSystem.GetValidFilename(name)); @@ -404,7 +412,7 @@ namespace MediaBrowser.Controller.Library } catch (IOException ex) { - Logger.ErrorException("Error validating IBN entry {0}", ex, currentPerson.Name); + _logger.ErrorException("Error validating IBN entry {0}", ex, currentPerson.Name); } // Update progress @@ -423,7 +431,7 @@ namespace MediaBrowser.Controller.Library progress.Report(new TaskProgress { PercentComplete = 100 }); - Logger.Info("People validation complete"); + _logger.Info("People validation complete"); } /// @@ -434,7 +442,7 @@ namespace MediaBrowser.Controller.Library /// Task. internal async Task ValidateMediaLibrary(IProgress progress, CancellationToken cancellationToken) { - Logger.Info("Validating media library"); + _logger.Info("Validating media library"); await Kernel.RootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false); diff --git a/MediaBrowser.Controller/Library/UserDataManager.cs b/MediaBrowser.Controller/Library/UserDataManager.cs index c4a012ece..bda5d0383 100644 --- a/MediaBrowser.Controller/Library/UserDataManager.cs +++ b/MediaBrowser.Controller/Library/UserDataManager.cs @@ -2,6 +2,7 @@ using MediaBrowser.Common.Kernel; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Connectivity; +using MediaBrowser.Model.Logging; using System; using System.Threading; using System.Threading.Tasks; @@ -28,14 +29,20 @@ namespace MediaBrowser.Controller.Library public event EventHandler PlaybackStopped; #endregion + /// + /// The _logger + /// + private readonly ILogger _logger; + /// /// Initializes a new instance of the class. /// /// The kernel. - public UserDataManager(Kernel kernel) + /// The logger. + public UserDataManager(Kernel kernel, ILogger logger) : base(kernel) { - + _logger = logger; } /// @@ -65,7 +72,7 @@ namespace MediaBrowser.Controller.Library { Argument = item, User = user - }, Logger); + }, _logger); } /// @@ -104,7 +111,7 @@ namespace MediaBrowser.Controller.Library Argument = item, User = user, PlaybackPositionTicks = positionTicks - }, Logger); + }, _logger); } /// @@ -150,7 +157,7 @@ namespace MediaBrowser.Controller.Library Argument = item, User = user, PlaybackPositionTicks = positionTicks - }, Logger); + }, _logger); } /// diff --git a/MediaBrowser.Controller/Library/UserManager.cs b/MediaBrowser.Controller/Library/UserManager.cs index 1a9236b42..f9593db0c 100644 --- a/MediaBrowser.Controller/Library/UserManager.cs +++ b/MediaBrowser.Controller/Library/UserManager.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.Logging; namespace MediaBrowser.Controller.Library { @@ -41,13 +42,20 @@ namespace MediaBrowser.Controller.Library get { return AllConnections.Where(c => (DateTime.UtcNow - c.LastActivityDate).TotalMinutes <= 10); } } + /// + /// The _logger + /// + private readonly ILogger _logger; + /// /// Initializes a new instance of the class. /// /// The kernel. - public UserManager(Kernel kernel) + /// The logger. + public UserManager(Kernel kernel, ILogger logger) : base(kernel) { + _logger = logger; } #region UserUpdated Event @@ -62,7 +70,7 @@ namespace MediaBrowser.Controller.Library /// The user. internal void OnUserUpdated(User user) { - EventHelper.QueueEventIfNotNull(UserUpdated, this, new GenericEventArgs { Argument = user }, Logger); + EventHelper.QueueEventIfNotNull(UserUpdated, this, new GenericEventArgs { Argument = user }, _logger); // Notify connected ui's Kernel.TcpManager.SendWebSocketMessage("UserUpdated", DtoBuilder.GetDtoUser(user)); @@ -80,7 +88,7 @@ namespace MediaBrowser.Controller.Library /// The user. internal void OnUserDeleted(User user) { - EventHelper.QueueEventIfNotNull(UserDeleted, this, new GenericEventArgs { Argument = user }, Logger); + EventHelper.QueueEventIfNotNull(UserDeleted, this, new GenericEventArgs { Argument = user }, _logger); // Notify connected ui's Kernel.TcpManager.SendWebSocketMessage("UserDeleted", user.Id.ToString()); @@ -113,7 +121,7 @@ namespace MediaBrowser.Controller.Library await UpdateUser(user).ConfigureAwait(false); } - Logger.Info("Authentication request for {0} {1}.", user.Name, (success ? "has succeeded" : "has been denied")); + _logger.Info("Authentication request for {0} {1}.", user.Name, (success ? "has succeeded" : "has been denied")); return success; } -- cgit v1.2.3