Moved discovery of loggers and weather providers to MEF. Also added support for third-party image processors, also discovered through MEF.

23 files changed, 362 insertions, 326 deletions

diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs
index f73f783af..73098c71b 100644
--- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Common.Net;

 using MediaBrowser.Common.Net.Handlers;

 using MediaBrowser.Controller;

+using MediaBrowser.Controller.Drawing;

 using MediaBrowser.Controller.Entities;

 using MediaBrowser.Model.Entities;

 using System;

@@ -20,7 +21,7 @@ namespace MediaBrowser.Api.HttpHandlers
         {

             return ApiService.IsApiUrlMatch("image", request);

         }

-        

+

         private string _imagePath;

         private async Task<string> GetImagePath()

         {

@@ -29,49 +30,57 @@ namespace MediaBrowser.Api.HttpHandlers
             return _imagePath;

         }

 

-        private async Task<string> DiscoverImagePath()

+        private BaseEntity _sourceEntity;

+        private async Task<BaseEntity> GetSourceEntity()

         {

-            string personName = QueryString["personname"];

-

-            if (!string.IsNullOrEmpty(personName))

+            if (_sourceEntity == null)

             {

-                return (await Kernel.Instance.ItemController.GetPerson(personName).ConfigureAwait(false)).PrimaryImagePath;

-            }

+                if (!string.IsNullOrEmpty(QueryString["personname"]))

+                {

+                    _sourceEntity = await Kernel.Instance.ItemController.GetPerson(QueryString["personname"]).ConfigureAwait(false);

+                }

 

-            string genreName = QueryString["genre"];

+                else if (!string.IsNullOrEmpty(QueryString["genre"]))

+                {

+                    _sourceEntity = await Kernel.Instance.ItemController.GetGenre(QueryString["genre"]).ConfigureAwait(false);

+                }

 

-            if (!string.IsNullOrEmpty(genreName))

-            {

-                return (await Kernel.Instance.ItemController.GetGenre(genreName).ConfigureAwait(false)).PrimaryImagePath;

-            }

+                else if (!string.IsNullOrEmpty(QueryString["year"]))

+                {

+                    _sourceEntity = await Kernel.Instance.ItemController.GetYear(int.Parse(QueryString["year"])).ConfigureAwait(false);

+                }

 

-            string year = QueryString["year"];

+                else if (!string.IsNullOrEmpty(QueryString["studio"]))

+                {

+                    _sourceEntity = await Kernel.Instance.ItemController.GetStudio(QueryString["studio"]).ConfigureAwait(false);

+                }

 

-            if (!string.IsNullOrEmpty(year))

-            {

-                return (await Kernel.Instance.ItemController.GetYear(int.Parse(year)).ConfigureAwait(false)).PrimaryImagePath;

+                else if (!string.IsNullOrEmpty(QueryString["userid"]))

+                {

+                    _sourceEntity = ApiService.GetUserById(QueryString["userid"], false);

+                }

+

+                else

+                {

+                    _sourceEntity = ApiService.GetItemById(QueryString["id"]);

+                }

             }

 

-            string studio = QueryString["studio"];

+            return _sourceEntity;

+        }

 

-            if (!string.IsNullOrEmpty(studio))

-            {

-                return (await Kernel.Instance.ItemController.GetStudio(studio).ConfigureAwait(false)).PrimaryImagePath;

-            }

+        private async Task<string> DiscoverImagePath()

+        {

+            var entity = await GetSourceEntity().ConfigureAwait(false);

 

-            string userId = QueryString["userid"];

+            var item = entity as BaseItem;

 

-            if (!string.IsNullOrEmpty(userId))

+            if (item != null)

             {

-                return ApiService.GetUserById(userId, false).PrimaryImagePath;

+                return GetImagePathFromTypes(item, ImageType, ImageIndex);

             }

 

-            BaseItem item = ApiService.GetItemById(QueryString["id"]);

-

-            string imageIndex = QueryString["index"];

-            int index = string.IsNullOrEmpty(imageIndex) ? 0 : int.Parse(imageIndex);

-

-            return GetImagePathFromTypes(item, ImageType, index);

+            return entity.PrimaryImagePath;

         }

 

         private Stream _sourceStream;

@@ -114,8 +123,6 @@ namespace MediaBrowser.Api.HttpHandlers
 

         public async override Task<string> GetContentType()

         {

-            await EnsureSourceStream().ConfigureAwait(false);

-

             if (await GetSourceStream().ConfigureAwait(false) == null)

             {

                 return null;

@@ -134,8 +141,6 @@ namespace MediaBrowser.Api.HttpHandlers
 

         protected async override Task<DateTime?> GetLastDateModified()

         {

-            await EnsureSourceStream().ConfigureAwait(false);

-

             if (await GetSourceStream().ConfigureAwait(false) == null)

             {

                 return null;

@@ -144,6 +149,21 @@ namespace MediaBrowser.Api.HttpHandlers
             return File.GetLastWriteTimeUtc(await GetImagePath().ConfigureAwait(false));

         }

 

+        private int ImageIndex

+        {

+            get

+            {

+                string val = QueryString["index"];

+

+                if (string.IsNullOrEmpty(val))

+                {

+                    return 0;

+                }

+

+                return int.Parse(val);

+            }

+        }

+

         private int? Height

         {

             get

@@ -236,7 +256,11 @@ namespace MediaBrowser.Api.HttpHandlers
 

         protected override async Task WriteResponseToOutputStream(Stream stream)

         {

-            ImageProcessor.ProcessImage(await GetSourceStream().ConfigureAwait(false), stream, Width, Height, MaxWidth, MaxHeight, Quality);

+            Stream sourceStream = await GetSourceStream().ConfigureAwait(false);

+

+            var entity = await GetSourceEntity().ConfigureAwait(false);

+

+            ImageProcessor.ProcessImage(sourceStream, stream, Width, Height, MaxWidth, MaxHeight, Quality, entity, ImageType, ImageIndex);

         }

 

         private string GetImagePathFromTypes(BaseItem item, ImageType imageType, int imageIndex)

diff --git a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs
index 9d52136f0..e34a1b41f 100644
--- a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Common.Drawing;

-using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Common.Net.Handlers;

+using MediaBrowser.Controller.Drawing;

 using MediaBrowser.Controller.Entities;

 using MediaBrowser.Model.DTO;

 using MediaBrowser.Model.Entities;

@@ -7,7 +7,6 @@ using System;
 using System.Collections.Generic;

 using System.ComponentModel.Composition;

 using System.Drawing;

-using System.IO;

 using System.Linq;

 using System.Net;

 

diff --git a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs
index 93d4c8877..90ecae122 100644
--- a/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs
+++ b/MediaBrowser.Api/HttpHandlers/WeatherHandler.cs
@@ -3,6 +3,7 @@ using MediaBrowser.Controller;
 using MediaBrowser.Model.Weather;

 using System;

 using System.ComponentModel.Composition;

+using System.Linq;

 using System.Net;

 using System.Threading.Tasks;

 

@@ -27,7 +28,7 @@ namespace MediaBrowser.Api.HttpHandlers
                 zipCode = Kernel.Instance.Configuration.WeatherZipCode;

             }

 

-            return Kernel.Instance.WeatherClient.GetWeatherInfoAsync(zipCode);

+            return Kernel.Instance.WeatherProviders.First().GetWeatherInfoAsync(zipCode);

         }

 

         /// <summary>

diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 858717e6e..44b58852b 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -83,7 +83,6 @@
     <Compile Include="HttpHandlers\WeatherHandler.cs" />

     <Compile Include="HttpHandlers\YearHandler.cs" />

     <Compile Include="HttpHandlers\YearsHandler.cs" />

-    <Compile Include="ImageProcessor.cs" />

     <Compile Include="Plugin.cs" />

     <Compile Include="Properties\AssemblyInfo.cs" />

   </ItemGroup>

diff --git a/MediaBrowser.Api/Plugin.cs b/MediaBrowser.Api/Plugin.cs
index b2bcefd1f..8def96da8 100644
--- a/MediaBrowser.Api/Plugin.cs
+++ b/MediaBrowser.Api/Plugin.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Plugins;

-using MediaBrowser.Model.Plugins;

 using System.ComponentModel.Composition;

 

 namespace MediaBrowser.Api

diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 0eebc863c..5a0e1c5e5 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -10,7 +10,6 @@ using System;
 using System.Collections.Generic;

 using System.ComponentModel.Composition;

 using System.ComponentModel.Composition.Hosting;

-using System.Diagnostics;

 using System.IO;

 using System.Linq;

 using System.Reflection;

@@ -73,6 +72,12 @@ namespace MediaBrowser.Common.Kernel
         private IEnumerable<BaseHandler> HttpHandlers { get; set; }

 

         /// <summary>

+        /// Gets the list of currently registered Loggers

+        /// </summary>

+        [ImportMany(typeof(BaseLogger))]

+        public IEnumerable<BaseLogger> Loggers { get; set; }

+

+        /// <summary>

         /// Both the Ui and server will have a built-in HttpServer.

         /// People will inevitably want remote control apps so it's needed in the Ui too.

         /// </summary>

@@ -83,6 +88,8 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         private IDisposable HttpListener { get; set; }

 

+        private CompositionContainer CompositionContainer { get; set; }

+

         protected virtual string HttpServerUrlPrefix

         {

             get

@@ -101,13 +108,13 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         public async Task Init(IProgress<TaskProgress> progress)

         {

+            Logger.Kernel = this;

+

             // Performs initializations that only occur once

             InitializeInternal(progress);

 

             // Performs initializations that can be reloaded at anytime

             await Reload(progress).ConfigureAwait(false);

-

-            ReportProgress(progress, "Loading Complete");

         }

 

         /// <summary>

@@ -117,8 +124,6 @@ namespace MediaBrowser.Common.Kernel
         {

             ApplicationPaths = new TApplicationPathsType();

 

-            ReloadLogger();

-

             ReportProgress(progress, "Loading Configuration");

             ReloadConfiguration();

 

@@ -136,6 +141,8 @@ namespace MediaBrowser.Common.Kernel
             await ReloadInternal(progress).ConfigureAwait(false);

 

             OnReloadCompleted(progress);

+

+            ReportProgress(progress, "Kernel.Reload Complete");

         }

 

         /// <summary>

@@ -152,23 +159,6 @@ namespace MediaBrowser.Common.Kernel
         }

 

         /// <summary>

-        /// Disposes the current logger and creates a new one

-        /// </summary>

-        private void ReloadLogger()

-        {

-            DisposeLogger();

-

-            DateTime now = DateTime.Now;

-

-            string logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");

-

-            Trace.Listeners.Add(new TextWriterTraceListener(logFilePath));

-            Trace.AutoFlush = true;

-

-            Logger.LoggerInstance = new TraceLogger();

-        }

-

-        /// <summary>

         /// Uses MEF to locate plugins

         /// Subclasses can use this to locate types within plugins

         /// </summary>

@@ -176,14 +166,13 @@ namespace MediaBrowser.Common.Kernel
         {

             DisposeComposableParts();

 

-            var container = GetCompositionContainer(includeCurrentAssembly: true);

+            CompositionContainer = GetCompositionContainer(includeCurrentAssembly: true);

 

-            container.ComposeParts(this);

+            CompositionContainer.ComposeParts(this);

 

             OnComposablePartsLoaded();

 

-            container.Catalog.Dispose();

-            container.Dispose();

+            CompositionContainer.Catalog.Dispose();

         }

 

         /// <summary>

@@ -198,8 +187,7 @@ namespace MediaBrowser.Common.Kernel
             var catalog = new AggregateCatalog(pluginAssemblies.Select(a => new AssemblyCatalog(a)));

 

             // Include composable parts in the Common assembly 

-            // Uncomment this if it's ever needed

-            //catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));

+            catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));

 

             if (includeCurrentAssembly)

             {

@@ -215,8 +203,13 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         protected virtual void OnComposablePartsLoaded()

         {

+            foreach (var logger in Loggers)

+            {

+                logger.Initialize(this);

+            }

+

             // Start-up each plugin

-            foreach (BasePlugin plugin in Plugins)

+            foreach (var plugin in Plugins)

             {

                 plugin.Initialize(this);

             }

@@ -230,17 +223,16 @@ namespace MediaBrowser.Common.Kernel
             //Configuration information for anything other than server-specific configuration will have to come via the API... -ebr

 

             // Deserialize config

-            if (!File.Exists(ApplicationPaths.SystemConfigurationFilePath))

+            // Use try/catch to avoid the extra file system lookup using File.Exists

+            try

             {

-                Configuration = new TConfigurationType();

-                XmlSerializer.SerializeToFile(Configuration, ApplicationPaths.SystemConfigurationFilePath);

+                Configuration = XmlSerializer.DeserializeFromFile<TConfigurationType>(ApplicationPaths.SystemConfigurationFilePath);

             }

-            else

+            catch (FileNotFoundException)

             {

-                Configuration = XmlSerializer.DeserializeFromFile<TConfigurationType>(ApplicationPaths.SystemConfigurationFilePath);

+                Configuration = new TConfigurationType();

+                XmlSerializer.SerializeToFile(Configuration, ApplicationPaths.SystemConfigurationFilePath);

             }

-

-            Logger.LoggerInstance.LogSeverity = Configuration.EnableDebugLevelLogging ? LogSeverity.Debug : LogSeverity.Info;

         }

 

         /// <summary>

@@ -275,11 +267,9 @@ namespace MediaBrowser.Common.Kernel
         {

             Logger.LogInfo("Beginning Kernel.Dispose");

 

-            DisposeComposableParts();

-

             DisposeHttpServer();

 

-            DisposeLogger();

+            DisposeComposableParts();

         }

 

         /// <summary>

@@ -287,22 +277,9 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         protected virtual void DisposeComposableParts()

         {

-            DisposePlugins();

-        }

-

-        /// <summary>

-        /// Disposes all plugins

-        /// </summary>

-        private void DisposePlugins()

-        {

-            if (Plugins != null)

+            if (CompositionContainer != null)

             {

-                Logger.LogInfo("Disposing Plugins");

-

-                foreach (BasePlugin plugin in Plugins)

-                {

-                    plugin.Dispose();

-                }

+                CompositionContainer.Dispose();

             }

         }

 

@@ -325,21 +302,6 @@ namespace MediaBrowser.Common.Kernel
         }

 

         /// <summary>

-        /// Disposes the current Logger instance

-        /// </summary>

-        private void DisposeLogger()

-        {

-            Trace.Listeners.Clear();

-

-            if (Logger.LoggerInstance != null)

-            {

-                Logger.LogInfo("Disposing Logger");

-

-                Logger.LoggerInstance.Dispose();

-            }

-        }

-

-        /// <summary>

         /// Gets the current application version

         /// </summary>

         public Version ApplicationVersion

@@ -354,10 +316,7 @@ namespace MediaBrowser.Common.Kernel
         {

             progress.Report(new TaskProgress { Description = message });

 

-            if (Logger.LoggerInstance != null)

-            {

-                Logger.LogInfo(message);

-            }

+            Logger.LogInfo(message);

         }

 

         BaseApplicationPaths IKernel.ApplicationPaths

@@ -373,6 +332,7 @@ namespace MediaBrowser.Common.Kernel
 

         Task Init(IProgress<TaskProgress> progress);

         Task Reload(IProgress<TaskProgress> progress);

+        IEnumerable<BaseLogger> Loggers { get; }

         void Dispose();

     }

 }

diff --git a/MediaBrowser.Common/Logging/BaseLogger.cs b/MediaBrowser.Common/Logging/BaseLogger.cs
index 572ce36b2..a97bc201f 100644
--- a/MediaBrowser.Common/Logging/BaseLogger.cs
+++ b/MediaBrowser.Common/Logging/BaseLogger.cs
@@ -1,92 +1,16 @@
-using System;

-using System.Text;

-using System.Threading;

+using MediaBrowser.Common.Kernel;

+using System;

 

 namespace MediaBrowser.Common.Logging

 {

     public abstract class BaseLogger : IDisposable

     {

-        public LogSeverity LogSeverity { get; set; }

-

-        public void LogInfo(string message, params object[] paramList)

-        {

-            LogEntry(message, LogSeverity.Info, paramList);

-        }

-

-        public void LogDebugInfo(string message, params object[] paramList)

-        {

-            LogEntry(message, LogSeverity.Debug, paramList);

-        }

-

-        public void LogError(string message, params object[] paramList)

-        {

-            LogEntry(message, LogSeverity.Error, paramList);

-        }

-

-        public void LogException(string message, Exception exception, params object[] paramList)

-        {

-            var builder = new StringBuilder();

-

-            if (exception != null)

-            {

-                builder.AppendFormat("Exception.  Type={0} Msg={1} StackTrace={3}{2}",

-                    exception.GetType().FullName,

-                    exception.Message,

-                    exception.StackTrace,

-                    Environment.NewLine);

-            }

-

-            message = FormatMessage(message, paramList);

-

-            LogError(string.Format("{0} ( {1} )", message, builder));

-        }

-

-        public void LogWarning(string message, params object[] paramList)

-        {

-            LogEntry(message, LogSeverity.Warning, paramList);

-        }

-

-        private string FormatMessage(string message, params object[] paramList)

-        {

-            if (paramList != null)

-            {

-                for (int i = 0; i < paramList.Length; i++)

-                {

-                    message = message.Replace("{" + i + "}", paramList[i].ToString());

-                }

-            }

-

-            return message;

-        }

-

-        private void LogEntry(string message, LogSeverity severity, params object[] paramList)

-        {

-            if (severity < LogSeverity) return;

-

-            message = FormatMessage(message, paramList);

-

-            Thread currentThread = Thread.CurrentThread;

-

-            var row = new LogRow

-            {

-                Severity = severity,

-                Message = message,

-                ThreadId = currentThread.ManagedThreadId,

-                ThreadName = currentThread.Name,

-                Time = DateTime.Now

-            };

-

-            LogEntry(row);

-        }

-

-        protected virtual void Flush()

-        {

-        }

+        public abstract void Initialize(IKernel kernel);

+        public abstract void LogEntry(LogRow row);

 

         public virtual void Dispose()

         {

+            Logger.LogInfo("Disposing " + GetType().Name);

         }

-

-        protected abstract void LogEntry(LogRow row);

     }

 }

diff --git a/MediaBrowser.Common/Logging/LogSeverity.cs b/MediaBrowser.Common/Logging/LogSeverity.cs
index 2abab1a44..97abfe7b5 100644
--- a/MediaBrowser.Common/Logging/LogSeverity.cs
+++ b/MediaBrowser.Common/Logging/LogSeverity.cs
@@ -1,4 +1,4 @@
-using System;

+using System;

 

 namespace MediaBrowser.Common.Logging

 {

@@ -11,4 +11,4 @@ namespace MediaBrowser.Common.Logging
         Warning = 4,

         Error = 8

     }

-}

+}
\ No newline at end of file
diff --git a/MediaBrowser.Common/Logging/Logger.cs b/MediaBrowser.Common/Logging/Logger.cs
index e66c1d844..9ac02fe3e 100644
--- a/MediaBrowser.Common/Logging/Logger.cs
+++ b/MediaBrowser.Common/Logging/Logger.cs
@@ -1,24 +1,28 @@
 using System;

+using System.Diagnostics;

+using System.Text;

+using System.Threading;

+using MediaBrowser.Common.Kernel;

 

 namespace MediaBrowser.Common.Logging

 {

     public static class Logger

     {

-        public static BaseLogger LoggerInstance { get; set; }

+        internal static IKernel Kernel { get; set; }

 

         public static void LogInfo(string message, params object[] paramList)

         {

-            LoggerInstance.LogInfo(message, paramList);

+            LogEntry(message, LogSeverity.Info, paramList);

         }

 

         public static void LogDebugInfo(string message, params object[] paramList)

         {

-            LoggerInstance.LogDebugInfo(message, paramList);

+            LogEntry(message, LogSeverity.Debug, paramList);

         }

 

         public static void LogError(string message, params object[] paramList)

         {

-            LoggerInstance.LogError(message, paramList);

+            LogEntry(message, LogSeverity.Error, paramList);

         }

 

         public static void LogException(Exception ex, params object[] paramList)

@@ -28,12 +32,62 @@ namespace MediaBrowser.Common.Logging
 

         public static void LogException(string message, Exception ex, params object[] paramList)

         {

-            LoggerInstance.LogException(message, ex, paramList);

+            var builder = new StringBuilder();

+

+            if (ex != null)

+            {

+                builder.AppendFormat("Exception.  Type={0} Msg={1} StackTrace={3}{2}",

+                    ex.GetType().FullName,

+                    ex.Message,

+                    ex.StackTrace,

+                    Environment.NewLine);

+            }

+

+            message = FormatMessage(message, paramList);

+

+            LogError(string.Format("{0} ( {1} )", message, builder));

         }

 

         public static void LogWarning(string message, params object[] paramList)

         {

-            LoggerInstance.LogWarning(message, paramList);

+            LogEntry(message, LogSeverity.Warning, paramList);

+        }

+

+        private static void LogEntry(string message, LogSeverity severity, params object[] paramList)

+        {

+            message = FormatMessage(message, paramList);

+

+            Thread currentThread = Thread.CurrentThread;

+

+            var row = new LogRow

+            {

+                Severity = severity,

+                Message = message,

+                ThreadId = currentThread.ManagedThreadId,

+                ThreadName = currentThread.Name,

+                Time = DateTime.Now

+            };

+

+            if (Kernel.Loggers != null)

+            {

+                foreach (var logger in Kernel.Loggers)

+                {

+                    logger.LogEntry(row);

+                }

+            }

+        }

+

+        private static string FormatMessage(string message, params object[] paramList)

+        {

+            if (paramList != null)

+            {

+                for (int i = 0; i < paramList.Length; i++)

+                {

+                    message = message.Replace("{" + i + "}", paramList[i].ToString());

+                }

+            }

+

+            return message;

         }

     }

 }

diff --git a/MediaBrowser.Common/Logging/StreamLogger.cs b/MediaBrowser.Common/Logging/StreamLogger.cs
deleted file mode 100644
index 03b9bd6d2..000000000
--- a/MediaBrowser.Common/Logging/StreamLogger.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;

-using System.IO;

-using System.Text;

-

-namespace MediaBrowser.Common.Logging

-{

-    /// <summary>

-    /// Provides a Logger that can write to any Stream

-    /// </summary>

-    public class StreamLogger : BaseLogger

-    {

-        private Stream Stream { get; set; }

-

-        public StreamLogger(Stream stream)

-            : base()

-        {

-            Stream = stream;

-        }

-

-        protected override void LogEntry(LogRow row)

-        {

-            byte[] bytes = new UTF8Encoding().GetBytes(row.ToString() + Environment.NewLine);

-

-            lock (Stream)

-            {

-                Stream.Write(bytes, 0, bytes.Length);

-                Stream.Flush();

-            }

-        }

-

-        public override void Dispose()

-        {

-            base.Dispose();

-            Stream.Dispose();

-        }

-    }

-}

diff --git a/MediaBrowser.Common/Logging/TraceFileLogger.cs b/MediaBrowser.Common/Logging/TraceFileLogger.cs
new file mode 100644
index 000000000..7ab67a137
--- /dev/null
+++ b/MediaBrowser.Common/Logging/TraceFileLogger.cs
@@ -0,0 +1,38 @@
+using MediaBrowser.Common.Kernel;

+using System;

+using System.ComponentModel.Composition;

+using System.Diagnostics;

+using System.IO;

+

+namespace MediaBrowser.Common.Logging

+{

+    [Export(typeof(BaseLogger))]

+    public class TraceFileLogger : BaseLogger

+    {

+        private TraceListener Listener { get; set; }

+

+        public override void Initialize(IKernel kernel)

+        {

+            DateTime now = DateTime.Now;

+

+            string logFilePath = Path.Combine(kernel.ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log");

+

+            Listener = new TextWriterTraceListener(logFilePath);

+            Trace.Listeners.Add(Listener);

+            Trace.AutoFlush = true;

+        }

+

+        public override void Dispose()

+        {

+            base.Dispose();

+

+            Trace.Listeners.Remove(Listener);

+            Listener.Dispose();

+        }

+

+        public override void LogEntry(LogRow row)

+        {

+            Trace.WriteLine(row.ToString());

+        }

+    }

+}

diff --git a/MediaBrowser.Common/Logging/TraceLogger.cs b/MediaBrowser.Common/Logging/TraceLogger.cs
deleted file mode 100644
index d152f9780..000000000
--- a/MediaBrowser.Common/Logging/TraceLogger.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Diagnostics;

-

-namespace MediaBrowser.Common.Logging

-{

-    public class TraceLogger : BaseLogger

-    {

-        protected override void LogEntry(LogRow row)

-        {

-            Trace.WriteLine(row.ToString());

-        }

-    }

-}

diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 16b4f236c..ce5f4e34e 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -83,8 +83,9 @@
   <ItemGroup>

     <Compile Include="Events\GenericEventArgs.cs" />

     <Compile Include="Kernel\BaseApplicationPaths.cs" />

-    <Compile Include="Drawing\DrawingUtils.cs" />

-    <Compile Include="Logging\TraceLogger.cs" />

+    <Compile Include="Logging\BaseLogger.cs" />

+    <Compile Include="Logging\LogSeverity.cs" />

+    <Compile Include="Logging\TraceFileLogger.cs" />

     <Compile Include="Net\Handlers\StaticFileHandler.cs" />

     <Compile Include="Net\MimeTypes.cs" />

     <Compile Include="Plugins\BaseTheme.cs" />

@@ -96,11 +97,8 @@
     <Compile Include="Serialization\JsonSerializer.cs" />

     <Compile Include="Kernel\BaseKernel.cs" />

     <Compile Include="Kernel\KernelContext.cs" />

-    <Compile Include="Logging\BaseLogger.cs" />

     <Compile Include="Logging\Logger.cs" />

     <Compile Include="Logging\LogRow.cs" />

-    <Compile Include="Logging\LogSeverity.cs" />

-    <Compile Include="Logging\StreamLogger.cs" />

     <Compile Include="Net\Handlers\BaseEmbeddedResourceHandler.cs" />

     <Compile Include="Net\Handlers\BaseHandler.cs" />

     <Compile Include="Net\Handlers\BaseSerializationHandler.cs" />

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 23825db04..a764c5eab 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Kernel;

+using MediaBrowser.Common.Logging;

 using MediaBrowser.Common.Serialization;

 using MediaBrowser.Model.Plugins;

 using System;

@@ -200,6 +201,8 @@ namespace MediaBrowser.Common.Plugins
         /// </summary>

         public void Dispose()

         {

+            Logger.LogInfo("Disposing {0} Plugin", Name);

+

             if (Context == KernelContext.Server)

             {

                 DisposeOnServer();

diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs
index 90583da4d..c3792c714 100644
--- a/MediaBrowser.Common/UI/BaseApplication.cs
+++ b/MediaBrowser.Common/UI/BaseApplication.cs
@@ -64,10 +64,7 @@ namespace MediaBrowser.Common.UI
             }

             catch (Exception ex)

             {

-                if (Logger.LoggerInstance != null)

-                {

-                    Logger.LogException(ex);

-                }

+                Logger.LogException(ex);

 

                 MessageBox.Show("There was an error launching Media Browser: " + ex.Message);

                 splash.Close();

diff --git a/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs
new file mode 100644
index 000000000..a2b223a70
--- /dev/null
+++ b/MediaBrowser.Controller/Drawing/BaseImageProcessor.cs
@@ -0,0 +1,33 @@
+using MediaBrowser.Controller.Entities;

+using MediaBrowser.Model.Entities;

+using System.Drawing;

+

+namespace MediaBrowser.Controller.Drawing

+{

+    /// <summary>

+    /// Provides a base image processor class that plugins can use to process images as they are being writen to http responses

+    /// Since this is completely modular with MEF, a plugin only needs to have a subclass in their assembly with the following attribute on the class:

+    /// [Export(typeof(BaseImageProcessor))]

+    /// This will require a reference to System.ComponentModel.Composition

+    /// </summary>

+    public abstract class BaseImageProcessor

+    {

+        /// <summary>

+        /// Processes the primary image for a BaseEntity (Person, Studio, User, etc)

+        /// </summary>

+        /// <param name="bitmap">The bitmap holding the original image, after re-sizing</param>

+        /// <param name="graphics">The graphics surface on which the output is drawn</param>

+        /// <param name="entity">The entity that owns the image</param>

+        public abstract void ProcessImage(Bitmap bitmap, Graphics graphics, BaseEntity entity);

+

+        /// <summary>

+        /// Processes an image for a BaseItem

+        /// </summary>

+        /// <param name="bitmap">The bitmap holding the original image, after re-sizing</param>

+        /// <param name="graphics">The graphics surface on which the output is drawn</param>

+        /// <param name="entity">The entity that owns the image</param>

+        /// <param name="imageType">The image type</param>

+        /// <param name="imageIndex">The image index (currently only used with backdrops)</param>

+        public abstract void ProcessImage(Bitmap bitmap, Graphics graphics, BaseItem entity, ImageType imageType, int imageIndex);

+    }

+}

diff --git a/MediaBrowser.Common/Drawing/DrawingUtils.cs b/MediaBrowser.Controller/Drawing/DrawingUtils.cs
index 4c0b5c207..8e2f829b9 100644
--- a/MediaBrowser.Common/Drawing/DrawingUtils.cs
+++ b/MediaBrowser.Controller/Drawing/DrawingUtils.cs
@@ -1,7 +1,7 @@
 using System;

 using System.Drawing;

 

-namespace MediaBrowser.Common.Drawing

+namespace MediaBrowser.Controller.Drawing

 {

     public static class DrawingUtils

     {

diff --git a/MediaBrowser.Api/ImageProcessor.cs b/MediaBrowser.Controller/Drawing/ImageProcessor.cs
index f02b90c22..b7815750b 100644
--- a/MediaBrowser.Api/ImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/ImageProcessor.cs
@@ -1,26 +1,34 @@
-using MediaBrowser.Common.Drawing;

+using MediaBrowser.Controller.Entities;

+using MediaBrowser.Model.Entities;

 using System;

 using System.Drawing;

 using System.Drawing.Drawing2D;

 using System.Drawing.Imaging;

 using System.IO;

+using System.Linq;

 

-namespace MediaBrowser.Api

+namespace MediaBrowser.Controller.Drawing

 {

     public static class ImageProcessor

     {

         /// <summary>

-        /// Resizes an image from a source stream and saves the result to an output stream

+        /// Processes an image by resizing to target dimensions

         /// </summary>

+        /// <param name="sourceImageStream">The stream containing the source image</param>

+        /// <param name="toStream">The stream to save the new image to</param>

         /// <param name="width">Use if a fixed width is required. Aspect ratio will be preserved.</param>

         /// <param name="height">Use if a fixed height is required. Aspect ratio will be preserved.</param>

         /// <param name="maxWidth">Use if a max width is required. Aspect ratio will be preserved.</param>

         /// <param name="maxHeight">Use if a max height is required. Aspect ratio will be preserved.</param>

         /// <param name="quality">Quality level, from 0-100. Currently only applies to JPG. The default value should suffice.</param>

-        public static void ProcessImage(Stream sourceImageStream, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality)

+        /// <param name="entity">The entity that owns the image</param>

+        /// <param name="imageType">The image type</param>

+        /// <param name="imageIndex">The image index (currently only used with backdrops)</param>

+        public static void ProcessImage(Stream sourceImageStream, Stream toStream, int? width, int? height, int? maxWidth, int? maxHeight, int? quality, BaseEntity entity, ImageType imageType, int imageIndex)

         {

             Image originalImage = Image.FromStream(sourceImageStream);

 

+            // Determine the output size based on incoming parameters

             Size newSize = DrawingUtils.Resize(originalImage.Size, width, height, maxWidth, maxHeight);

 

             Bitmap thumbnail;

@@ -35,6 +43,7 @@ namespace MediaBrowser.Api
                 thumbnail = new Bitmap(newSize.Width, newSize.Height, originalImage.PixelFormat);

             }

 

+            // Preserve the original resolution

             thumbnail.SetResolution(originalImage.HorizontalResolution, originalImage.VerticalResolution);

 

             Graphics thumbnailGraph = Graphics.FromImage(thumbnail);

@@ -47,32 +56,67 @@ namespace MediaBrowser.Api
 

             thumbnailGraph.DrawImage(originalImage, 0, 0, newSize.Width, newSize.Height);

 

-            Write(originalImage, thumbnail, toStream, quality);

+            // Run Kernel image processors

+            if (Kernel.Instance.ImageProcessors.Any())

+            {

+                ExecuteAdditionalImageProcessors(thumbnail, thumbnailGraph, entity, imageType, imageIndex);

+            }

+

+            // Write to the output stream

+            SaveImage(originalImage.RawFormat, thumbnail, toStream, quality);

 

             thumbnailGraph.Dispose();

             thumbnail.Dispose();

             originalImage.Dispose();

         }

 

-        private static void Write(Image originalImage, Image newImage, Stream toStream, int? quality)

+        /// <summary>

+        /// Executes additional image processors that are registered with the Kernel

+        /// </summary>

+        /// <param name="bitmap">The bitmap holding the original image, after re-sizing</param>

+        /// <param name="graphics">The graphics surface on which the output is drawn</param>

+        /// <param name="entity">The entity that owns the image</param>

+        /// <param name="imageType">The image type</param>

+        /// <param name="imageIndex">The image index (currently only used with backdrops)</param>

+        private static void ExecuteAdditionalImageProcessors(Bitmap bitmap, Graphics graphics, BaseEntity entity, ImageType imageType, int imageIndex)

+        {

+            var baseItem = entity as BaseItem;

+

+            if (baseItem != null)

+            {

+                foreach (var processor in Kernel.Instance.ImageProcessors)

+                {

+                    processor.ProcessImage(bitmap, graphics, baseItem, imageType, imageIndex);

+                }

+            }

+            else

+            {

+                foreach (var processor in Kernel.Instance.ImageProcessors)

+                {

+                    processor.ProcessImage(bitmap, graphics, entity);

+                }

+            }

+        }

+

+        public static void SaveImage(ImageFormat originalImageRawFormat, Image newImage, Stream toStream, int? quality)

         {

             // Use special save methods for jpeg and png that will result in a much higher quality image

             // All other formats use the generic Image.Save

-            if (ImageFormat.Jpeg.Equals(originalImage.RawFormat))

+            if (ImageFormat.Jpeg.Equals(originalImageRawFormat))

             {

                 SaveJpeg(newImage, toStream, quality);

             }

-            else if (ImageFormat.Png.Equals(originalImage.RawFormat))

+            else if (ImageFormat.Png.Equals(originalImageRawFormat))

             {

                 newImage.Save(toStream, ImageFormat.Png);

             }

             else

             {

-                newImage.Save(toStream, originalImage.RawFormat);

+                newImage.Save(toStream, originalImageRawFormat);

             }

         }

 

-        private static void SaveJpeg(Image newImage, Stream target, int? quality)

+        public static void SaveJpeg(Image image, Stream target, int? quality)

         {

             if (!quality.HasValue)

             {

@@ -82,11 +126,11 @@ namespace MediaBrowser.Api
             using (var encoderParameters = new EncoderParameters(1))

             {

                 encoderParameters.Param[0] = new EncoderParameter(Encoder.Quality, quality.Value);

-                newImage.Save(target, GetImageCodeInfo("image/jpeg"), encoderParameters);

+                image.Save(target, GetImageCodecInfo("image/jpeg"), encoderParameters);

             }

         }

 

-        private static ImageCodecInfo GetImageCodeInfo(string mimeType)

+        public static ImageCodecInfo GetImageCodecInfo(string mimeType)

         {

             ImageCodecInfo[] info = ImageCodecInfo.GetImageEncoders();

 

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 682abb632..4c0dc6965 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -1,5 +1,6 @@
 using MediaBrowser.Common.Kernel;

 using MediaBrowser.Common.Logging;

+using MediaBrowser.Controller.Drawing;

 using MediaBrowser.Controller.Entities;

 using MediaBrowser.Controller.Entities.TV;

 using MediaBrowser.Controller.IO;

@@ -27,7 +28,6 @@ namespace MediaBrowser.Controller
         public static Kernel Instance { get; private set; }

 

         public ItemController ItemController { get; private set; }

-        public WeatherClient WeatherClient { get; private set; }

 

         public IEnumerable<User> Users { get; private set; }

         public Folder RootFolder { get; private set; }

@@ -48,6 +48,12 @@ namespace MediaBrowser.Controller
         }

 

         /// <summary>

+        /// Gets the list of currently registered weather prvoiders

+        /// </summary>

+        [ImportMany(typeof(BaseWeatherProvider))]

+        public IEnumerable<BaseWeatherProvider> WeatherProviders { get; private set; }

+

+        /// <summary>

         /// Gets the list of currently registered metadata prvoiders

         /// </summary>

         [ImportMany(typeof(BaseMetadataProvider))]

@@ -72,6 +78,12 @@ namespace MediaBrowser.Controller
         internal IBaseItemResolver[] EntityResolvers { get; private set; }

 

         /// <summary>

+        /// Gets the list of currently registered entity resolvers

+        /// </summary>

+        [ImportMany(typeof(BaseImageProcessor))]

+        internal IEnumerable<BaseImageProcessor> ImageProcessors { get; private set; }

+

+        /// <summary>

         /// Creates a kernel based on a Data path, which is akin to our current programdata path

         /// </summary>

         public Kernel()

@@ -85,13 +97,15 @@ namespace MediaBrowser.Controller
         /// </summary>

         protected override void InitializeInternal(IProgress<TaskProgress> progress)

         {

+            base.InitializeInternal(progress);

+

             ItemController = new ItemController();

             DirectoryWatchers = new DirectoryWatchers();

 

             ItemController.PreBeginResolvePath += ItemController_PreBeginResolvePath;

             ItemController.BeginResolvePath += ItemController_BeginResolvePath;

 

-            base.InitializeInternal(progress);

+            ExtractFFMpeg();

         }

 

         /// <summary>

@@ -101,14 +115,11 @@ namespace MediaBrowser.Controller
         {

             await base.ReloadInternal(progress).ConfigureAwait(false);

 

-            ReloadWeatherClient();

-

-            ExtractFFMpeg();

-

             ReportProgress(progress, "Loading Users");

             ReloadUsers();

 

             ReportProgress(progress, "Loading Media Library");

+

             await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false);

         }

 

@@ -121,8 +132,6 @@ namespace MediaBrowser.Controller
 

             DirectoryWatchers.Stop();

 

-            DisposeWeatherClient();

-

             ItemController.PreBeginResolvePath -= ItemController_PreBeginResolvePath;

             ItemController.BeginResolvePath -= ItemController_BeginResolvePath;

         }

@@ -413,26 +422,5 @@ namespace MediaBrowser.Controller
                 }

             }

         }

-

-        /// <summary>

-        /// Disposes the current WeatherClient

-        /// </summary>

-        private void DisposeWeatherClient()

-        {

-            if (WeatherClient != null)

-            {

-                WeatherClient.Dispose();

-            }

-        }

-

-        /// <summary>

-        /// Disposes the current WeatherClient and creates a new one

-        /// </summary>

-        private void ReloadWeatherClient()

-        {

-            DisposeWeatherClient();

-

-            WeatherClient = new WeatherClient();

-        }

     }

 }

diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 8d1f4965a..131825af3 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -36,6 +36,7 @@
     <Reference Include="System" />

     <Reference Include="System.ComponentModel.Composition" />

     <Reference Include="System.Core" />

+    <Reference Include="System.Drawing" />

     <Reference Include="System.Net.Http" />

     <Reference Include="System.Net.Http.WebRequest" />

     <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">

@@ -58,6 +59,9 @@
     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="Drawing\BaseImageProcessor.cs" />

+    <Compile Include="Drawing\DrawingUtils.cs" />

+    <Compile Include="Drawing\ImageProcessor.cs" />

     <Compile Include="Entities\Audio.cs" />

     <Compile Include="Entities\BaseEntity.cs" />

     <Compile Include="Entities\BaseItem.cs" />

@@ -107,7 +111,8 @@
     <Compile Include="Resolvers\BaseItemResolver.cs" />

     <Compile Include="Resolvers\FolderResolver.cs" />

     <Compile Include="Resolvers\VideoResolver.cs" />

-    <Compile Include="Weather\WeatherClient.cs" />

+    <Compile Include="Weather\BaseWeatherProvider.cs" />

+    <Compile Include="Weather\WeatherProvider.cs" />

     <Compile Include="Providers\BaseItemXmlParser.cs" />

     <Compile Include="Xml\XmlExtensions.cs" />

   </ItemGroup>

diff --git a/MediaBrowser.Controller/Weather/BaseWeatherProvider.cs b/MediaBrowser.Controller/Weather/BaseWeatherProvider.cs
new file mode 100644
index 000000000..c3d436e66
--- /dev/null
+++ b/MediaBrowser.Controller/Weather/BaseWeatherProvider.cs
@@ -0,0 +1,34 @@
+using MediaBrowser.Common.Logging;

+using MediaBrowser.Model.Weather;

+using System;

+using System.Net;

+using System.Net.Cache;

+using System.Net.Http;

+using System.Threading.Tasks;

+

+namespace MediaBrowser.Controller.Weather

+{

+    public abstract class BaseWeatherProvider : IDisposable

+    {

+        protected HttpClient HttpClient { get; private set; }

+

+        protected BaseWeatherProvider()

+        {

+            var handler = new WebRequestHandler { };

+

+            handler.AutomaticDecompression = DecompressionMethods.Deflate;

+            handler.CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate);

+

+            HttpClient = new HttpClient(handler);

+        }

+

+        public virtual void Dispose()

+        {

+            Logger.LogInfo("Disposing " + GetType().Name);

+

+            HttpClient.Dispose();

+        }

+

+        public abstract Task<WeatherInfo> GetWeatherInfoAsync(string zipCode);

+    }

+}

diff --git a/MediaBrowser.Controller/Weather/WeatherClient.cs b/MediaBrowser.Controller/Weather/WeatherProvider.cs
index 7226dccf0..0fc728879 100644
--- a/MediaBrowser.Controller/Weather/WeatherClient.cs
+++ b/MediaBrowser.Controller/Weather/WeatherProvider.cs
@@ -2,11 +2,9 @@
 using MediaBrowser.Common.Serialization;

 using MediaBrowser.Model.Weather;

 using System;

+using System.ComponentModel.Composition;

 using System.IO;

 using System.Linq;

-using System.Net;

-using System.Net.Cache;

-using System.Net.Http;

 using System.Threading.Tasks;

 

 namespace MediaBrowser.Controller.Weather

@@ -15,21 +13,10 @@ namespace MediaBrowser.Controller.Weather
     /// Based on http://www.worldweatheronline.com/free-weather-feed.aspx

     /// The classes in this file are a reproduction of the json output, which will then be converted to our weather model classes

     /// </summary>

-    public class WeatherClient : IDisposable

+    [Export(typeof(BaseWeatherProvider))]

+    public class WeatherProvider : BaseWeatherProvider

     {

-        private HttpClient HttpClient { get; set; }

-

-        public WeatherClient()

-        {

-            var handler = new WebRequestHandler { };

-

-            handler.AutomaticDecompression = DecompressionMethods.Deflate;

-            handler.CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate);

-

-            HttpClient = new HttpClient(handler);

-        }

-

-        public async Task<WeatherInfo> GetWeatherInfoAsync(string zipCode)

+        public override async Task<WeatherInfo> GetWeatherInfoAsync(string zipCode)

         {

             if (string.IsNullOrWhiteSpace(zipCode))

             {

@@ -73,11 +60,6 @@ namespace MediaBrowser.Controller.Weather
 

             return info;

         }

-

-        public void Dispose()

-        {

-            HttpClient.Dispose();

-        }

     }

 

     class WeatherResult

diff --git a/MediaBrowser.sln b/MediaBrowser.sln
index 17b3a6290..b3f1b7835 100644
--- a/MediaBrowser.sln
+++ b/MediaBrowser.sln
@@ -52,4 +52,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

 	EndGlobalSection

+	GlobalSection(Performance) = preSolution

+		HasPerformanceSessions = true

+	EndGlobalSection

 EndGlobal