more dependancy injection

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
         /// <param name="args">The <see cref="ChildrenChangedEventArgs" /> instance containing the event data.</param>
         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
 
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="LibraryManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
-        public LibraryManager(Kernel kernel)
+        /// <param name="logger">The logger.</param>
+        public LibraryManager(Kernel kernel, ILogger logger)
             : base(kernel)
         {
+            _logger = logger;
         }
 
         /// <summary>
@@ -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");
         }
 
         /// <summary>
@@ -434,7 +442,7 @@ namespace MediaBrowser.Controller.Library
         /// <returns>Task.</returns>
         internal async Task ValidateMediaLibrary(IProgress<TaskProgress> progress, CancellationToken cancellationToken)
         {
-            Logger.Info("Validating media library");
+            _logger.Info("Validating media library");
 
             await Kernel.RootFolder.RefreshMetadata(cancellationToken).ConfigureAwait(false);
 

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<PlaybackProgressEventArgs> PlaybackStopped;
         #endregion
 
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="UserDataManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
-        public UserDataManager(Kernel kernel)
+        /// <param name="logger">The logger.</param>
+        public UserDataManager(Kernel kernel, ILogger logger)
             : base(kernel)
         {
-
+            _logger = logger;
         }
 
         /// <summary>
@@ -65,7 +72,7 @@ namespace MediaBrowser.Controller.Library
             {
                 Argument = item,
                 User = user
-            }, Logger);
+            }, _logger);
         }
 
         /// <summary>
@@ -104,7 +111,7 @@ namespace MediaBrowser.Controller.Library
                 Argument = item,
                 User = user,
                 PlaybackPositionTicks = positionTicks
-            }, Logger);
+            }, _logger);
         }
 
         /// <summary>
@@ -150,7 +157,7 @@ namespace MediaBrowser.Controller.Library
                 Argument = item,
                 User = user,
                 PlaybackPositionTicks = positionTicks
-            }, Logger);
+            }, _logger);
         }
 
         /// <summary>

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); }
         }
 
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
-        public UserManager(Kernel kernel)
+        /// <param name="logger">The logger.</param>
+        public UserManager(Kernel kernel, ILogger logger)
             : base(kernel)
         {
+            _logger = logger;
         }
 
         #region UserUpdated Event
@@ -62,7 +70,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         internal void OnUserUpdated(User user)
         {
-            EventHelper.QueueEventIfNotNull(UserUpdated, this, new GenericEventArgs<User> { Argument = user }, Logger);
+            EventHelper.QueueEventIfNotNull(UserUpdated, this, new GenericEventArgs<User> { Argument = user }, _logger);
 
             // Notify connected ui's
             Kernel.TcpManager.SendWebSocketMessage("UserUpdated", DtoBuilder.GetDtoUser(user));
@@ -80,7 +88,7 @@ namespace MediaBrowser.Controller.Library
         /// <param name="user">The user.</param>
         internal void OnUserDeleted(User user)
         {
-            EventHelper.QueueEventIfNotNull(UserDeleted, this, new GenericEventArgs<User> { Argument = user }, Logger);
+            EventHelper.QueueEventIfNotNull(UserDeleted, this, new GenericEventArgs<User> { 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;
         }