a little more kernel consolidation

5 files changed, 33 insertions, 50 deletions

diff --git a/MediaBrowser.Controller/Drawing/ImageManager.cs b/MediaBrowser.Controller/Drawing/ImageManager.cs
index 807c2d1e0..b728fe71f 100644
--- a/MediaBrowser.Controller/Drawing/ImageManager.cs
+++ b/MediaBrowser.Controller/Drawing/ImageManager.cs
@@ -26,6 +26,13 @@ namespace MediaBrowser.Controller.Drawing
     public class ImageManager
     {
         /// <summary>
+        /// Gets the list of currently registered image processors
+        /// Image processors are specialized metadata providers that run after the normal ones
+        /// </summary>
+        /// <value>The image enhancers.</value>
+        public IEnumerable<IImageEnhancer> ImageEnhancers { get; set; }
+        
+        /// <summary>
         /// Gets the image size cache.
         /// </summary>
         /// <value>The image size cache.</value>
@@ -120,7 +127,7 @@ namespace MediaBrowser.Controller.Drawing
                 originalImagePath = await GetCroppedImage(originalImagePath, dateModified).ConfigureAwait(false);
             }
 
-            var supportedEnhancers = _kernel.ImageEnhancers.Where(i =>
+            var supportedEnhancers = ImageEnhancers.Where(i =>
             {
                 try
                 {
@@ -621,7 +628,7 @@ namespace MediaBrowser.Controller.Drawing
 
             var dateModified = GetImageDateModified(item, imagePath);
 
-            var supportedEnhancers = _kernel.ImageEnhancers.Where(i =>
+            var supportedEnhancers = ImageEnhancers.Where(i =>
             {
                 try
                 {
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 549248595..412b911f4 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -182,7 +182,7 @@ namespace MediaBrowser.Controller.Dto
                 return;
             }
 
-            var supportedEnhancers = Kernel.Instance.ImageEnhancers.Where(i =>
+            var supportedEnhancers = Kernel.Instance.ImageManager.ImageEnhancers.Where(i =>
             {
                 try
                 {
diff --git a/MediaBrowser.Controller/IServerApplicationHost.cs b/MediaBrowser.Controller/IServerApplicationHost.cs
index 042ef30ec..f96c2536e 100644
--- a/MediaBrowser.Controller/IServerApplicationHost.cs
+++ b/MediaBrowser.Controller/IServerApplicationHost.cs
@@ -13,5 +13,17 @@ namespace MediaBrowser.Controller
         /// </summary>
         /// <returns>SystemInfo.</returns>
         SystemInfo GetSystemInfo();
+
+        /// <summary>
+        /// Gets the name of the web application.
+        /// </summary>
+        /// <value>The name of the web application.</value>
+        string WebApplicationName { get; }
+
+        /// <summary>
+        /// Gets the HTTP server URL prefix.
+        /// </summary>
+        /// <value>The HTTP server URL prefix.</value>
+        string HttpServerUrlPrefix { get; }
     }
 }
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 3e1c21a50..d7b24a0cc 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -1,8 +1,5 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Localization;
+using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.MediaInfo;
-using MediaBrowser.Controller.Providers;
 using MediaBrowser.Controller.Weather;
 using System.Collections.Generic;
 
@@ -32,57 +29,17 @@ namespace MediaBrowser.Controller
         public FFMpegManager FFMpegManager { get; set; }
 
         /// <summary>
-        /// Gets the name of the web application that can be used for url building.
-        /// All api urls will be of the form {protocol}://{host}:{port}/{appname}/...
-        /// </summary>
-        /// <value>The name of the web application.</value>
-        public string WebApplicationName
-        {
-            get { return "mediabrowser"; }
-        }
-
-        /// <summary>
-        /// Gets the HTTP server URL prefix.
-        /// </summary>
-        /// <value>The HTTP server URL prefix.</value>
-        public virtual string HttpServerUrlPrefix
-        {
-            get
-            {
-                return "http://+:" + _configurationManager.Configuration.HttpServerPortNumber + "/" + WebApplicationName + "/";
-            }
-        }
-
-        /// <summary>
-        /// Gets the list of Localized string files
-        /// </summary>
-        /// <value>The string files.</value>
-        public IEnumerable<LocalizedStringData> StringFiles { get; set; }
-
-        /// <summary>
         /// Gets the list of currently registered weather prvoiders
         /// </summary>
         /// <value>The weather providers.</value>
         public IEnumerable<IWeatherProvider> WeatherProviders { get; set; }
 
         /// <summary>
-        /// Gets the list of currently registered image processors
-        /// Image processors are specialized metadata providers that run after the normal ones
-        /// </summary>
-        /// <value>The image enhancers.</value>
-        public IEnumerable<IImageEnhancer> ImageEnhancers { get; set; }
-
-        private readonly IServerConfigurationManager _configurationManager;
-
-        /// <summary>
         /// Creates a kernel based on a Data path, which is akin to our current programdata path
         /// </summary>
-        /// <param name="configurationManager">The configuration manager.</param>
-        public Kernel(IServerConfigurationManager configurationManager)
+        public Kernel()
         {
             Instance = this;
-
-            _configurationManager = configurationManager;
         }
     }
 }
diff --git a/MediaBrowser.Controller/Localization/LocalizedStrings.cs b/MediaBrowser.Controller/Localization/LocalizedStrings.cs
index 31dcb2e9f..bd82d39ea 100644
--- a/MediaBrowser.Controller/Localization/LocalizedStrings.cs
+++ b/MediaBrowser.Controller/Localization/LocalizedStrings.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -13,7 +14,13 @@ namespace MediaBrowser.Controller.Localization
     public class LocalizedStrings
     {
         public static IServerApplicationPaths ApplicationPaths;
-        
+
+        /// <summary>
+        /// Gets the list of Localized string files
+        /// </summary>
+        /// <value>The string files.</value>
+        public static IEnumerable<LocalizedStringData> StringFiles { get; set; }
+
         /// <summary>
         /// The base prefix
         /// </summary>
@@ -42,7 +49,7 @@ namespace MediaBrowser.Controller.Localization
         {
             _appPaths = appPaths;
 
-            foreach (var stringObject in Kernel.Instance.StringFiles)
+            foreach (var stringObject in StringFiles)
             {
                 AddStringData(LoadFromFile(GetFileName(stringObject),stringObject.GetType()));
             }