removed static logger

8 files changed, 50 insertions, 11 deletions

diff --git a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs
index bd60003be..0bcfff183 100644
--- a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs
+++ b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Drawing;
 using System.Threading.Tasks;
@@ -14,6 +15,10 @@ namespace MediaBrowser.Controller.Providers
     public abstract class BaseImageEnhancer : IDisposable
     {
         /// <summary>
+        /// The logger
+        /// </summary>
+        private static readonly ILogger Logger = LogManager.GetLogger("ImageEnhancer");
+        /// <summary>
         /// Return true only if the given image for the given item will be enhanced by this enhancer.
         /// </summary>
         /// <param name="item">The item.</param>
@@ -96,7 +101,7 @@ namespace MediaBrowser.Controller.Providers
 
             var typeName = GetType().Name;
 
-            Logger.LogDebugInfo("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--");
+            Logger.Debug("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--");
 
             try
             {
@@ -104,7 +109,7 @@ namespace MediaBrowser.Controller.Providers
             }
             catch (Exception ex)
             {
-                Logger.LogException("{0} failed enhancing {1}", ex, typeName, item.Name);
+                Logger.ErrorException("{0} failed enhancing {1}", ex, typeName, item.Name);
 
                 throw;
             }
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 0869b25bc..e54e6bfc2 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,6 +18,20 @@ namespace MediaBrowser.Controller.Providers
         where T : BaseItem, new()
     {
         /// <summary>
+        /// The logger
+        /// </summary>
+        protected ILogger Logger { get; private set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseItemXmlParser{T}" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public BaseItemXmlParser(ILogger logger)
+        {
+            Logger = logger;
+        }
+
+        /// <summary>
         /// Fetches metadata for an item from one xml file
         /// </summary>
         /// <param name="item">The item.</param>
diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
index 110502bc1..ab0f37b96 100644
--- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs
@@ -66,13 +66,13 @@ namespace MediaBrowser.Controller.Providers
         private bool Fetch(BaseItem item, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            
+
             var metadataFile = item.ResolveArgs.GetMetaFileByPath(Path.Combine(item.MetaLocation, "folder.xml"));
 
             if (metadataFile.HasValue)
             {
                 var path = metadataFile.Value.Path;
-                new BaseItemXmlParser<Folder>().Fetch((Folder)item, path, cancellationToken);
+                new BaseItemXmlParser<Folder>(Logger).Fetch((Folder)item, path, cancellationToken);
                 SetLastRefreshed(item, DateTime.UtcNow);
                 return true;
             }
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
index b87c71df3..b180fa580 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs
@@ -75,11 +75,11 @@ namespace MediaBrowser.Controller.Providers.Movies
                 var boxset = item as BoxSet;
                 if (boxset != null)
                 {
-                    new BaseItemXmlParser<BoxSet>().Fetch(boxset, path, cancellationToken);
+                    new BaseItemXmlParser<BoxSet>(Logger).Fetch(boxset, path, cancellationToken);
                 }
                 else
                 {
-                    new BaseItemXmlParser<Movie>().Fetch((Movie)item, path, cancellationToken);
+                    new BaseItemXmlParser<Movie>(Logger).Fetch((Movie)item, path, cancellationToken);
                 }
                 SetLastRefreshed(item, DateTime.UtcNow);
                 return true;
diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
index df46b7167..08d0988eb 100644
--- a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs
@@ -115,7 +115,7 @@ namespace MediaBrowser.Controller.Providers.TV
                 return false;
             }
 
-            new EpisodeXmlParser().Fetch(item, metadataFile, cancellationToken);
+            new EpisodeXmlParser(Logger).Fetch(item, metadataFile, cancellationToken);
             return true;
         }
     }
diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs b/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs
index 7133d8745..4b8219e00 100644
--- a/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Model.Logging;
 using System.IO;
 using System.Xml;
 
@@ -10,6 +11,15 @@ namespace MediaBrowser.Controller.Providers.TV
     public class EpisodeXmlParser : BaseItemXmlParser<Episode>
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="EpisodeXmlParser" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public EpisodeXmlParser(ILogger logger)
+            : base(logger)
+        {
+        }
+
+        /// <summary>
         /// Fetches the data from XML node.
         /// </summary>
         /// <param name="reader">The reader.</param>
diff --git a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
index 728ac0549..c92841fb6 100644
--- a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
+++ b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs
@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Providers.TV
             {
                 var path = metadataFile.Value.Path;
 
-                new SeriesXmlParser().Fetch((Series)item, path, cancellationToken);
+                new SeriesXmlParser(Logger).Fetch((Series)item, path, cancellationToken);
                 SetLastRefreshed(item, DateTime.UtcNow);
 
                 return true;
diff --git a/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs b/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs
index 751690425..2822a43b2 100644
--- a/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs
@@ -1,7 +1,7 @@
-using MediaBrowser.Common.Logging;
-using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Resolvers.TV;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
 using System;
 using System.Xml;
 
@@ -13,6 +13,15 @@ namespace MediaBrowser.Controller.Providers.TV
     public class SeriesXmlParser : BaseItemXmlParser<Series>
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="BaseItemXmlParser{T}" /> class.
+        /// </summary>
+        /// <param name="logger">The logger.</param>
+        public SeriesXmlParser(ILogger logger)
+            : base(logger)
+        {
+        }
+
+        /// <summary>
         /// Fetches the data from XML node.
         /// </summary>
         /// <param name="reader">The reader.</param>
@@ -74,7 +83,7 @@ namespace MediaBrowser.Controller.Providers.TV
                             }
                             else
                             {
-                                Logger.LogInfo("Unrecognized series status: " + status);
+                                Logger.Info("Unrecognized series status: " + status);
                             }
                         }