Implemented UI plugin downloading

MediaBrowser.Common/Kernel/BaseKernel.cs

@@ -59,21 +59,18 @@ namespace MediaBrowser.Common.Kernel
             ApplicationPaths = new TApplicationPathsType();
         }
 
-        public virtual Task Init(IProgress<TaskProgress> progress)
+        public virtual async Task Init(IProgress<TaskProgress> progress)
         {
-            return Task.Run(() =>
-            {
-                ReloadLogger();
+            ReloadLogger();
 
-                progress.Report(new TaskProgress() { Description = "Loading configuration", PercentComplete = 0 });
-                ReloadConfiguration();
+            progress.Report(new TaskProgress() { Description = "Loading configuration", PercentComplete = 0 });
+            ReloadConfiguration();
 
-                progress.Report(new TaskProgress() { Description = "Starting Http server", PercentComplete = 5 });
-                ReloadHttpServer();
+            progress.Report(new TaskProgress() { Description = "Starting Http server", PercentComplete = 5 });
+            ReloadHttpServer();
 
-                progress.Report(new TaskProgress() { Description = "Loading Plugins", PercentComplete = 10 });
-                ReloadComposableParts();
-            });
+            progress.Report(new TaskProgress() { Description = "Loading Plugins", PercentComplete = 10 });
+            await ReloadComposableParts().ConfigureAwait(false);
         }
 
         /// <summary>
@@ -98,10 +95,25 @@ namespace MediaBrowser.Common.Kernel
         /// Uses MEF to locate plugins
         /// Subclasses can use this to locate types within plugins
         /// </summary>
-        protected void ReloadComposableParts()
+        protected virtual Task ReloadComposableParts()
         {
-            DisposeComposableParts();
+            return Task.Run(() =>
+            {
+                DisposeComposableParts();
 
+                var container = GetCompositionContainer(includeCurrentAssembly: true);
+
+                container.ComposeParts(this);
+
+                OnComposablePartsLoaded();
+
+                container.Catalog.Dispose();
+                container.Dispose();
+            });
+        }
+
+        public CompositionContainer GetCompositionContainer(bool includeCurrentAssembly = false)
+        {
             // Gets all plugin assemblies by first reading all bytes of the .dll and calling Assembly.Load against that
             // This will prevent the .dll file from getting locked, and allow us to replace it when needed
             IEnumerable<Assembly> pluginAssemblies = Directory.GetFiles(ApplicationPaths.PluginsPath, "*.dll", SearchOption.TopDirectoryOnly).Select(f => Assembly.Load(File.ReadAllBytes((f))));
@@ -112,17 +124,13 @@ namespace MediaBrowser.Common.Kernel
             // Uncomment this if it's ever needed
             //catalog.Catalogs.Add(new AssemblyCatalog(Assembly.GetExecutingAssembly()));
 
-            // Include composable parts in the subclass assembly
-            catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly));
+            if (includeCurrentAssembly)
+            {
+                // Include composable parts in the subclass assembly
+                catalog.Catalogs.Add(new AssemblyCatalog(GetType().Assembly));
+            }
 
-            var container = new CompositionContainer(catalog);
-
-            container.ComposeParts(this);
-
-            OnComposablePartsLoaded();
-
-            catalog.Dispose();
-            container.Dispose();
+            return new CompositionContainer(catalog);
         }
 
         /// <summary>

MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -65,6 +65,7 @@
       <HintPath>..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Interactivity">
       <HintPath>..\packages\MahApps.Metro.0.9.0.0\lib\net40\System.Windows.Interactivity.dll</HintPath>
     </Reference>

MediaBrowser.Common/Net/MimeTypes.cs

@@ -148,6 +148,12 @@ namespace MediaBrowser.Common.Net
                 return "application/x-mpegURL";
             }
 
+            // Misc
+            else if (ext.EndsWith("dll", StringComparison.OrdinalIgnoreCase))
+            {
+                return "application/x-msdownload";
+            }
+
             throw new InvalidOperationException("Argument not supported: " + path);
         }
     }

MediaBrowser.Common/Plugins/BasePlugin.cs

@@ -63,6 +63,28 @@ namespace MediaBrowser.Common.Plugins
             }
         }
 
+        /// <summary>
+        /// Gets the name the assembly file
+        /// </summary>
+        public string AssemblyFileName
+        {
+            get
+            {
+                return GetType().Assembly.GetName().Name + ".dll";
+            }
+        }
+
+        /// <summary>
+        /// Gets the path to the assembly file
+        /// </summary>
+        public string AssemblyFilePath
+        {
+            get
+            {
+                return Path.Combine(Kernel.ApplicationPaths.PluginsPath, AssemblyFileName);
+            }
+        }
+
         /// <summary>
         /// Gets or sets the current plugin configuration
         /// </summary>