From fdafa596832eae13cebcf5bbe5fa867f7ba068f0 Mon Sep 17 00:00:00 2001 From: LukePulverenti Date: Thu, 21 Feb 2013 20:26:35 -0500 Subject: Removed System.Windows.Forms dependancy from Common. Almost done removing NLog dependancy. --- .../Providers/BaseImageEnhancer.cs | 25 +++------------------- .../Providers/BaseMetadataProvider.cs | 4 +--- .../MediaInfo/FFProbeAudioInfoProvider.cs | 1 - .../Providers/TV/RemoteSeasonProvider.cs | 3 +-- 4 files changed, 5 insertions(+), 28 deletions(-) (limited to 'MediaBrowser.Controller/Providers') diff --git a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs index 0bcfff183d..aeceeaf5fc 100644 --- a/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs +++ b/MediaBrowser.Controller/Providers/BaseImageEnhancer.cs @@ -1,8 +1,6 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Controller.Entities; +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,10 +12,6 @@ namespace MediaBrowser.Controller.Providers /// public abstract class BaseImageEnhancer : IDisposable { - /// - /// The logger - /// - private static readonly ILogger Logger = LogManager.GetLogger("ImageEnhancer"); /// /// Return true only if the given image for the given item will be enhanced by this enhancer. /// @@ -92,27 +86,14 @@ namespace MediaBrowser.Controller.Providers /// Index of the image. /// Task{Image}. /// - public async Task EnhanceImageAsync(BaseItem item, Image originalImage, ImageType imageType, int imageIndex) + public Task EnhanceImageAsync(BaseItem item, Image originalImage, ImageType imageType, int imageIndex) { if (item == null || originalImage == null) { throw new ArgumentNullException(); } - var typeName = GetType().Name; - - Logger.Debug("Running {0} for {1}", typeName, item.Path ?? item.Name ?? "--Unknown--"); - - try - { - return await EnhanceImageAsyncInternal(item, originalImage, imageType, imageIndex).ConfigureAwait(false); - } - catch (Exception ex) - { - Logger.ErrorException("{0} failed enhancing {1}", ex, typeName, item.Name); - - throw; - } + return EnhanceImageAsyncInternal(item, originalImage, imageType, imageIndex); } } } diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 3916c0f541..e16519864e 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Extensions; -using MediaBrowser.Common.Logging; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Logging; using System; @@ -17,7 +16,7 @@ namespace MediaBrowser.Controller.Providers /// Gets the logger. /// /// The logger. - protected ILogger Logger { get; private set; } + protected static internal ILogger Logger { get; internal set; } // Cache these since they will be used a lot /// @@ -113,7 +112,6 @@ namespace MediaBrowser.Controller.Providers /// protected virtual void Initialize() { - Logger = LogManager.GetLogger(GetType().Name); } /// diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs index d8fd76805b..49c829fffe 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.IO; -using MediaBrowser.Common.Logging; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.MediaInfo; diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs index 0d6cc41b8d..277b6d891f 100644 --- a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.Logging; -using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Resolvers.TV; using MediaBrowser.Model.Entities; -- cgit v1.2.3