Added the ability to reload the server and created a Plugins solution

5 files changed, 118 insertions, 51 deletions

diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 266671f4bb..0ac01962b4 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -67,13 +67,27 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         public abstract KernelContext KernelContext { get; }

 

-        protected BaseKernel()

+        /// <summary>

+        /// Initializes the Kernel

+        /// </summary>

+        public async Task Init(IProgress<TaskProgress> progress)

         {

-            ApplicationPaths = new TApplicationPathsType();

+            // Performs initializations that only occur once

+            InitializeInternal(progress);

+

+            // Performs initializations that can be reloaded at anytime

+            await Reload(progress).ConfigureAwait(false);

+

+            progress.Report(new TaskProgress { Description = "Loading Complete", PercentComplete = 100 });

         }

 

-        public virtual async Task Init(IProgress<TaskProgress> progress)

+        /// <summary>

+        /// Performs initializations that only occur once

+        /// </summary>

+        protected virtual void InitializeInternal(IProgress<TaskProgress> progress)

         {

+            ApplicationPaths = new TApplicationPathsType();

+            

             ReloadLogger();

 

             progress.Report(new TaskProgress { Description = "Loading configuration", PercentComplete = 0 });

@@ -81,11 +95,24 @@ namespace MediaBrowser.Common.Kernel
 

             progress.Report(new TaskProgress { Description = "Starting Http server", PercentComplete = 5 });

             ReloadHttpServer();

-

-            progress.Report(new TaskProgress { Description = "Loading Plugins", PercentComplete = 10 });

-            await ReloadComposableParts().ConfigureAwait(false);

         }

 

+        /// <summary>

+        /// Performs initializations that can be reloaded at anytime

+        /// </summary>

+        public virtual async Task Reload(IProgress<TaskProgress> progress)

+        {

+            await Task.Run(() =>

+            {

+                progress.Report(new TaskProgress { Description = "Loading Plugins", PercentComplete = 10 });

+                ReloadComposableParts();

+

+            }).ConfigureAwait(false);

+        }

+        

+        /// <summary>

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

+        /// </summary>

         private void ReloadLogger()

         {

             DisposeLogger();

@@ -104,23 +131,23 @@ namespace MediaBrowser.Common.Kernel
         /// Uses MEF to locate plugins

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

         /// </summary>

-        protected virtual Task ReloadComposableParts()

+        private void ReloadComposableParts()

         {

-            return Task.Run(() =>

-            {

-                DisposeComposableParts();

+            DisposeComposableParts();

 

-                var container = GetCompositionContainer(includeCurrentAssembly: true);

+            var container = GetCompositionContainer(includeCurrentAssembly: true);

 

-                container.ComposeParts(this);

+            container.ComposeParts(this);

 

-                OnComposablePartsLoaded();

+            OnComposablePartsLoaded();

 

-                container.Catalog.Dispose();

-                container.Dispose();

-            });

+            container.Catalog.Dispose();

+            container.Dispose();

         }

 

+        /// <summary>

+        /// Constructs an MEF CompositionContainer based on the current running assembly and all plugin assemblies

+        /// </summary>

         public CompositionContainer GetCompositionContainer(bool includeCurrentAssembly = false)

         {

             // Gets all plugin assemblies by first reading all bytes of the .dll and calling Assembly.Load against that

@@ -147,25 +174,17 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         protected virtual void OnComposablePartsLoaded()

         {

-            StartPlugins();

-        }

-

-        /// <summary>

-        /// Initializes all plugins

-        /// </summary>

-        private void StartPlugins()

-        {

+            // Start-up each plugin

             foreach (BasePlugin plugin in Plugins)

             {

                 plugin.Initialize(this);

             }

         }

 

-

         /// <summary>

         /// Reloads application configuration from the config file

         /// </summary>

-        protected virtual void ReloadConfiguration()

+        private void ReloadConfiguration()

         {

             //Configuration information for anything other than server-specific configuration will have to come via the API... -ebr

 

@@ -213,8 +232,12 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>

         public virtual void Dispose()

         {

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

+            

             DisposeComposableParts();

+

             DisposeHttpServer();

+

             DisposeLogger();

         }

 

@@ -233,6 +256,8 @@ namespace MediaBrowser.Common.Kernel
         {

             if (Plugins != null)

             {

+                Logger.LogInfo("Disposing Plugins");

+                

                 foreach (BasePlugin plugin in Plugins)

                 {

                     plugin.Dispose();

@@ -247,6 +272,8 @@ namespace MediaBrowser.Common.Kernel
         {

             if (HttpServer != null)

             {

+                Logger.LogInfo("Disposing Http Server");

+                

                 HttpServer.Dispose();

             }

 

@@ -265,6 +292,8 @@ namespace MediaBrowser.Common.Kernel
 

             if (Logger.LoggerInstance != null)

             {

+                Logger.LogInfo("Disposing Logger");

+                

                 Logger.LoggerInstance.Dispose();

             }

         }

@@ -292,6 +321,7 @@ namespace MediaBrowser.Common.Kernel
         KernelContext KernelContext { get; }

 

         Task Init(IProgress<TaskProgress> progress);

+        Task Reload(IProgress<TaskProgress> progress);

         void Dispose();

     }

 }

diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index fca71ebd07..6c80c2225b 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -86,6 +86,7 @@
     <Compile Include="Logging\TraceLogger.cs" />

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

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

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

     <Compile Include="Properties\Resources.Designer.cs">

       <AutoGen>True</AutoGen>

       <DesignTime>True</DesignTime>

diff --git a/MediaBrowser.Common/Plugins/BasePlugin.cs b/MediaBrowser.Common/Plugins/BasePlugin.cs
index 5740d04922..23825db045 100644
--- a/MediaBrowser.Common/Plugins/BasePlugin.cs
+++ b/MediaBrowser.Common/Plugins/BasePlugin.cs
@@ -7,30 +7,6 @@ using System.IO;
 namespace MediaBrowser.Common.Plugins

 {

     /// <summary>

-    /// Provides a BasePlugin with generics, allowing for strongly typed configuration access.

-    /// </summary>

-    public abstract class BaseGenericPlugin<TConfigurationType> : BasePlugin

-        where TConfigurationType : BasePluginConfiguration, new()

-    {

-        public new TConfigurationType Configuration

-        {

-            get

-            {

-                return base.Configuration as TConfigurationType;

-            }

-            set

-            {

-                base.Configuration = value;

-            }

-        }

-

-        public override Type ConfigurationType

-        {

-            get { return typeof(TConfigurationType); }

-        }

-    }

-

-    /// <summary>

     /// Provides a common base class for all plugins

     /// </summary>

     public abstract class BasePlugin : IDisposable

@@ -50,7 +26,10 @@ namespace MediaBrowser.Common.Plugins
         /// <summary>

         /// Gets the type of configuration this plugin uses

         /// </summary>

-        public abstract Type ConfigurationType { get; }

+        public virtual Type ConfigurationType

+        {

+            get { return typeof (BasePluginConfiguration); }

+        }

 

         /// <summary>

         /// Gets the plugin version

diff --git a/MediaBrowser.Common/Plugins/BaseTheme.cs b/MediaBrowser.Common/Plugins/BaseTheme.cs
new file mode 100644
index 0000000000..f06825262a
--- /dev/null
+++ b/MediaBrowser.Common/Plugins/BaseTheme.cs
@@ -0,0 +1,14 @@
+

+namespace MediaBrowser.Common.Plugins

+{

+    public abstract class BaseTheme : BasePlugin

+    {

+        public sealed override bool DownloadToUi

+        {

+            get

+            {

+                return true;

+            }

+        }

+    }

+}

diff --git a/MediaBrowser.Common/UI/BaseApplication.cs b/MediaBrowser.Common/UI/BaseApplication.cs
index 12e423f60c..e22eed1583 100644
--- a/MediaBrowser.Common/UI/BaseApplication.cs
+++ b/MediaBrowser.Common/UI/BaseApplication.cs
@@ -5,6 +5,7 @@ using Microsoft.Shell;
 using System;

 using System.Collections.Generic;

 using System.ComponentModel;

+using System.Threading.Tasks;

 using System.Windows;

 

 namespace MediaBrowser.Common.UI

@@ -42,6 +43,9 @@ namespace MediaBrowser.Common.UI
             Kernel = InstantiateKernel();

 

             var progress = new Progress<TaskProgress>();

+

+            progress.ProgressChanged += progress_ProgressChanged;

+            

             var splash = new Splash(progress);

 

             splash.Show();

@@ -52,6 +56,8 @@ namespace MediaBrowser.Common.UI
 

                 await Kernel.Init(progress);

 

+                progress.ProgressChanged -= progress_ProgressChanged;

+                

                 Logger.LogInfo("Kernel.Init completed in {0} seconds.", (DateTime.UtcNow - now).TotalSeconds);

                 splash.Close();

 

@@ -63,6 +69,8 @@ namespace MediaBrowser.Common.UI
             }

             catch (Exception ex)

             {

+                progress.ProgressChanged -= progress_ProgressChanged;

+                

                 if (Logger.LoggerInstance != null)

                 {

                     Logger.LogException(ex);

@@ -76,6 +84,41 @@ namespace MediaBrowser.Common.UI
             }

         }

 

+        public async Task ReloadKernel()

+        {

+            var progress = new Progress<TaskProgress>();

+

+            progress.ProgressChanged += progress_ProgressChanged;

+

+            try

+            {

+                DateTime now = DateTime.UtcNow;

+

+                await Kernel.Reload(progress);

+

+                progress.ProgressChanged -= progress_ProgressChanged;

+

+                Logger.LogInfo("Kernel.Reload completed in {0} seconds.", (DateTime.UtcNow - now).TotalSeconds);

+            }

+            catch (Exception ex)

+            {

+                progress.ProgressChanged -= progress_ProgressChanged;

+

+                Logger.LogException(ex);

+

+                // Shutdown the app with an error code

+                Shutdown(1);

+            }

+        }

+

+        void progress_ProgressChanged(object sender, TaskProgress e)

+        {

+            if (Logger.LoggerInstance != null)

+            {

+                Logger.LogInfo(e.Description);

+            }

+        }

+

         protected virtual void OnKernelLoaded()

         {