From 882e20e9a5b05324ee75bb08ac09caec0034a9b4 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Mon, 30 Jul 2012 00:06:05 -0400
Subject: [PATCH] Added IProgress to Kernel.Init

---
 MediaBrowser.Common/Kernel/BaseKernel.cs      | 21 ++++++++++++++-----
 .../MediaBrowser.Common.csproj                |  1 +
 MediaBrowser.Common/Progress/TaskProgress.cs  | 19 +++++++++++++++++
 MediaBrowser.Program/Program.cs               |  5 ++++-
 4 files changed, 40 insertions(+), 6 deletions(-)
 create mode 100644 MediaBrowser.Common/Progress/TaskProgress.cs

diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 291c67156a..09bb67218f 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -11,13 +11,14 @@ using MediaBrowser.Common.Json;
 using MediaBrowser.Common.Logging;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.Progress;
 
 namespace MediaBrowser.Common.Kernel
 {
     /// <summary>
     /// Represents a shared base kernel for both the UI and server apps
     /// </summary>
-    public abstract class BaseKernel<TConfigurationType>
+    public abstract class BaseKernel<TConfigurationType> : IDisposable
         where TConfigurationType : BaseApplicationConfiguration, new()
     {
         /// <summary>
@@ -76,12 +77,12 @@ namespace MediaBrowser.Common.Kernel
             Logger.LoggerInstance = new FileLogger(Path.Combine(ProgramDataPath, "Logs"));
         }
 
-        public virtual void Init()
+        public virtual void Init(IProgress<TaskProgress> progress)
         {
             ReloadConfiguration();
 
             ReloadHttpServer();
-
+            
             ReloadComposableParts();
         }
 
@@ -206,13 +207,18 @@ namespace MediaBrowser.Common.Kernel
         /// Restarts the Http Server, or starts it if not currently running
         /// </summary>
         private void ReloadHttpServer()
+        {
+            DisposeHttpServer();
+
+            HttpServer = new HttpServer("http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/");
+        }
+
+        private void DisposeHttpServer()
         {
             if (HttpServer != null)
             {
                 HttpServer.Dispose();
             }
-
-            HttpServer = new HttpServer("http://+:" + Configuration.HttpServerPortNumber + "/mediabrowser/");
         }
 
         /// <summary>
@@ -234,5 +240,10 @@ namespace MediaBrowser.Common.Kernel
 
             return null;
         }
+
+        public void Dispose()
+        {
+            DisposeHttpServer();
+        }
     }
 }
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 65c0018894..53a1c71215 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -67,6 +67,7 @@
     <Compile Include="Logging\Logger.cs" />
     <Compile Include="Logging\LogRow.cs" />
     <Compile Include="Plugins\BasePlugin.cs" />
+    <Compile Include="Progress\TaskProgress.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/MediaBrowser.Common/Progress/TaskProgress.cs b/MediaBrowser.Common/Progress/TaskProgress.cs
new file mode 100644
index 0000000000..78e817397a
--- /dev/null
+++ b/MediaBrowser.Common/Progress/TaskProgress.cs
@@ -0,0 +1,19 @@
+
+namespace MediaBrowser.Common.Progress
+{
+    /// <summary>
+    /// Represents a generic progress class that can be used with IProgress
+    /// </summary>
+    public class TaskProgress
+    {
+        /// <summary>
+        /// Gets or sets the current completion percentage
+        /// </summary>
+        public decimal PercentComplete { get; set; }
+
+        /// <summary>
+        /// Gets or sets a description of the actions currently executing
+        /// </summary>
+        public string Description { get; set; }
+    }
+}
diff --git a/MediaBrowser.Program/Program.cs b/MediaBrowser.Program/Program.cs
index ff7ad002f3..a951ec7dba 100644
--- a/MediaBrowser.Program/Program.cs
+++ b/MediaBrowser.Program/Program.cs
@@ -1,5 +1,6 @@
 using System;
 using MediaBrowser.Controller;
+using MediaBrowser.Common.Progress;
 
 namespace MediaBrowser.Program
 {
@@ -18,7 +19,9 @@ namespace MediaBrowser.Program
 
             Kernel kernel = new Kernel();
 
-            kernel.Init();
+            Progress<TaskProgress> progress = new Progress<TaskProgress>();
+
+            kernel.Init(progress);
 
             var time = DateTime.Now - now;
             Console.WriteLine("Done in " + time.TotalSeconds + " seconds");