Added plugin unloading

src/Artemis.Core/Plugins/Abstract/ModuleDataModel.cs

@@ -1,5 +1,4 @@
 using Artemis.Core.Plugins.Interfaces;
-using Stylet;
 
 namespace Artemis.Core.Plugins.Abstract
 {

src/Artemis.Core/Plugins/Abstract/ModuleViewModel.cs

@@ -1,5 +1,4 @@
 using Artemis.Core.Plugins.Interfaces;
-using Artemis.Core.Plugins.Models;
 using Stylet;
 
 namespace Artemis.Core.Plugins.Abstract

src/Artemis.Core/Plugins/Abstract/ProfileModule.cs

@@ -17,11 +17,6 @@ namespace Artemis.Core.Plugins.Abstract
         /// <inheritdoc />
         public abstract bool ExpandsMainDataModel { get; }
 
-        /// <inheritdoc />
-        public void EnablePlugin()
-        {
-            // Load and activate the last active profile
-        }
 
         /// <inheritdoc />
         public virtual void Update(double deltaTime)
@@ -47,9 +42,13 @@ namespace Artemis.Core.Plugins.Abstract
         public abstract IScreen GetMainViewModel();
 
         /// <inheritdoc />
-        public void Dispose()
+        public abstract void EnablePlugin();
-        {
+
-        }
+        /// <inheritdoc />
+        public abstract void DisablePlugin();
+
+        /// <inheritdoc />
+        public abstract void Dispose();
 
         public void ChangeActiveProfile(Profile profile)
         {

src/Artemis.Core/Plugins/Interfaces/IPlugin.cs

@@ -2,14 +2,21 @@
 
 namespace Artemis.Core.Plugins.Interfaces
 {
+    /// <inheritdoc />
     /// <summary>
     ///     This is the base plugin type, use the other interfaces such as IModule to create plugins
     /// </summary>
     public interface IPlugin : IDisposable
     {
         /// <summary>
-        ///     Called when the plugin is loaded
+        ///     Called when the plugin is activated
         /// </summary>
         void EnablePlugin();
+
+
+        /// <summary>
+        ///     Called when the plugin is deactivated
+        /// </summary>
+        void DisablePlugin();
     }
 }

src/Artemis.Core/Plugins/Models/PluginInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using AppDomainToolkit;
 using Artemis.Core.Plugins.Interfaces;
 using Newtonsoft.Json;
@@ -7,6 +8,10 @@ namespace Artemis.Core.Plugins.Models
 {
     public class PluginInfo
     {
+        internal PluginInfo()
+        {
+        }
+
         /// <summary>
         ///     The plugins GUID
         /// </summary>
@@ -28,10 +33,10 @@ namespace Artemis.Core.Plugins.Models
         public string Main { get; set; }
 
         /// <summary>
-        ///     Full path to the plugin's current folder
+        ///     The plugins root directory
         /// </summary>
         [JsonIgnore]
-        public string Folder { get; set; }
+        public DirectoryInfo Directory { get; set; }
 
         /// <summary>
         ///     A reference to the type implementing IPlugin, available after successful load
@@ -48,6 +53,7 @@ namespace Artemis.Core.Plugins.Models
         /// <summary>
         ///     The AppDomain context of this plugin
         /// </summary>
+        [JsonIgnore]
         internal AppDomainContext<AssemblyTargetLoader, PathBasedAssemblyResolver> Context { get; set; }
 
         public override string ToString()

src/Artemis.Core/ProfileElements/Layer.cs

@@ -61,12 +61,10 @@ namespace Artemis.Core.ProfileElements
         public void UpdateLayerType(ILayerType layerType)
         {
             if (LayerType != null)
-            {
                 lock (LayerType)
                 {
                     LayerType.Dispose();
                 }
-            }
 
             LayerType = layerType;
         }

src/Artemis.Core/Services/CoreService.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Threading.Tasks;
 using Artemis.Core.Exceptions;
 using Artemis.Core.Plugins.Interfaces;
@@ -38,7 +37,7 @@ namespace Artemis.Core.Services
                 throw new ArtemisCoreException("Cannot initialize the core as it is already initialized.");
 
             // Initialize the services
-            await _pluginService.LoadPlugins();
+            await Task.Run(() => _pluginService.LoadPlugins());
             await _rgbService.LoadDevices();
 
             OnInitialized();
@@ -48,7 +47,7 @@ namespace Artemis.Core.Services
         {
             try
             {
-                var modules = _pluginService.GetModules();
+                var modules = _pluginService.GetPluginsOfType<IModule>();
 
                 // Update all active modules
                 foreach (var module in modules)

src/Artemis.Core/Services/Interfaces/IPluginService.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
 using Artemis.Core.Events;
 using Artemis.Core.Plugins.Interfaces;
 using Artemis.Core.Plugins.Models;
@@ -11,46 +9,81 @@ namespace Artemis.Core.Services.Interfaces
     public interface IPluginService : IArtemisService, IDisposable
     {
         /// <summary>
-        ///     Indicates wether or not plugins are currently being loaded
+        ///     Indicates whether or not plugins are currently being loaded
         /// </summary>
         bool LoadingPlugins { get; }
 
-        /// <summary>
-        ///     All loaded plugins
-        /// </summary>
-        ReadOnlyCollection<PluginInfo> Plugins { get; }
-
         /// <summary>
         ///     Loads all installed plugins. If plugins already loaded this will reload them all
         /// </summary>
-        Task LoadPlugins();
+        void LoadPlugins();
 
         /// <summary>
-        ///     Occurs when a single plugin has loaded
+        ///     Unloads all installed plugins.
         /// </summary>
-        event EventHandler<PluginEventArgs> PluginLoaded;
+        void UnloadPlugins();
 
         /// <summary>
-        ///     Occurs when loading all plugins has started
+        ///     Loads the plugin defined in the provided <see cref="PluginInfo" />
         /// </summary>
-        event EventHandler StartedLoadingPlugins;
+        /// <param name="pluginInfo">The plugin info defining the plugin to load</param>
+        void LoadPlugin(PluginInfo pluginInfo);
 
         /// <summary>
-        ///     Occurs when loading all plugins has finished
+        ///     Unloads the plugin defined in the provided <see cref="PluginInfo" />
         /// </summary>
-        event EventHandler FinishedLoadedPlugins;
+        /// <param name="pluginInfo">The plugin info defining the plugin to unload</param>
+        void UnloadPlugin(PluginInfo pluginInfo);
 
         /// <summary>
-        ///     If found, returns an instance of the layer type matching the given GUID
+        ///     Finds the plugin info related to the plugin
+        /// </summary>
+        /// <param name="plugin">The plugin you want to find the plugin info for</param>
+        /// <returns>The plugins PluginInfo</returns>
+        PluginInfo GetPluginInfo(IPlugin plugin);
+
+        /// <summary>
+        ///     Gets the plugin info of all loaded plugins
+        /// </summary>
+        /// <returns>A list containing all the plugin info</returns>
+        List<PluginInfo> GetAllPluginInfo();
+
+        /// <summary>
+        ///     Finds an instance of the layer type matching the given GUID
         /// </summary>
         /// <param name="layerTypeGuid">The GUID of the layer type to find</param>
         /// <returns>An instance of the layer type</returns>
         ILayerType GetLayerTypeByGuid(Guid layerTypeGuid);
 
         /// <summary>
-        ///     Returns all the plugins implementing <see cref="IModule" />
+        ///     Finds all enabled <see cref="IPlugin" /> instances of type <see cref="T" />
         /// </summary>
-        /// <returns></returns>
+        /// <typeparam name="T">Either <see cref="IPlugin" /> or a plugin type implementing <see cref="IPlugin" /></typeparam>
-        IReadOnlyList<IModule> GetModules();
+        /// <returns>Returns a list of plug instances of type <see cref="T" /></returns>
+        List<T> GetPluginsOfType<T>() where T : IPlugin;
+
+        #region Events
+
+        /// <summary>
+        ///     Occurs when a plugin has loaded
+        /// </summary>
+        event EventHandler<PluginEventArgs> PluginLoaded;
+
+        /// <summary>
+        ///     Occurs when a plugin has been unloaded
+        /// </summary>
+        event EventHandler<PluginEventArgs> PluginUnloaded;
+
+        /// <summary>
+        ///     Occurs when a plugin has been enabled
+        /// </summary>
+        event EventHandler<PluginEventArgs> PluginEnabled;
+
+        /// <summary>
+        ///     Occurs when a plugin has been disabled
+        /// </summary>
+        event EventHandler<PluginEventArgs> PluginDisabled;
+
+        #endregion
     }
 }

src/Artemis.Core/Services/PluginService.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using AppDomainToolkit;
 using Artemis.Core.Events;
 using Artemis.Core.Exceptions;
@@ -23,7 +21,7 @@ namespace Artemis.Core.Services
         private readonly List<PluginInfo> _plugins;
         private IKernel _childKernel;
 
-        public PluginService(IKernel kernel)
+        internal PluginService(IKernel kernel)
         {
             _kernel = kernel;
             _plugins = new List<PluginInfo>();
@@ -32,19 +30,20 @@ namespace Artemis.Core.Services
                 Directory.CreateDirectory(Constants.DataFolder + "plugins");
         }
 
+        /// <inheritdoc />
         public bool LoadingPlugins { get; private set; }
-        public ReadOnlyCollection<PluginInfo> Plugins => _plugins.AsReadOnly();
 
         /// <inheritdoc />
-        public async Task LoadPlugins()
+        public void LoadPlugins()
         {
             if (LoadingPlugins)
                 throw new ArtemisCoreException("Cannot load plugins while a previous load hasn't been completed yet.");
 
-            OnStartedLoadingPlugins();
+            lock (_plugins)
-
-            await Task.Run(() =>
             {
+                LoadingPlugins = true;
+
+                // Unload all currently loaded plugins first
                 UnloadPlugins();
 
                 // Create a child kernel and app domain that will only contain the plugins
@@ -53,6 +52,7 @@ namespace Artemis.Core.Services
                 // Load the plugin assemblies into the plugin context
                 var directory = new DirectoryInfo(Path.Combine(Constants.DataFolder, "plugins"));
                 foreach (var subDirectory in directory.EnumerateDirectories())
+                {
                     try
                     {
                         // Load the metadata
@@ -62,61 +62,145 @@ namespace Artemis.Core.Services
 
                         // Locate the main entry
                         var pluginInfo = JsonConvert.DeserializeObject<PluginInfo>(File.ReadAllText(metadataFile));
-                        // TODO Just temporarily until settings are in place
+                        pluginInfo.Directory = subDirectory;
-                        pluginInfo.Enabled = true;
+                        LoadPlugin(pluginInfo);
-                        var mainFile = Path.Combine(subDirectory.FullName, pluginInfo.Main);
-                        if (!File.Exists(mainFile))
-                            throw new ArtemisPluginException(pluginInfo, "Couldn't find the plugins main entry at " + mainFile);
-
-                        // Load the plugin, all types implementing IPlugin and register them with DI
-                        var setupInfo = new AppDomainSetup
-                        {
-                            ApplicationName = pluginInfo.Guid.ToString(),
-                            ApplicationBase = AppDomain.CurrentDomain.BaseDirectory,
-                            PrivateBinPath = subDirectory.FullName
-                        };
-                        pluginInfo.Context = AppDomainContext.Create(setupInfo);
-
-                        try
-                        {
-                            pluginInfo.Context.LoadAssemblyWithReferences(LoadMethod.LoadFrom, mainFile);
-                        }
-                        catch (Exception e)
-                        {
-                            throw new ArtemisPluginException(pluginInfo, "Failed to load the plugins assembly", e);
-                        }
-
-                        // Get the IPlugin implementation from the main assembly and if there is only one, instantiate it
-                        var mainAssembly = pluginInfo.Context.Domain.GetAssemblies().First(a => a.Location == mainFile);
-                        var pluginTypes = mainAssembly.GetTypes().Where(t => typeof(IPlugin).IsAssignableFrom(t)).ToList();
-                        if (pluginTypes.Count > 1)
-                            throw new ArtemisPluginException(pluginInfo, $"Plugin contains {pluginTypes.Count} implementations of IPlugin, only 1 allowed");
-                        if (pluginTypes.Count == 0)
-                            throw new ArtemisPluginException(pluginInfo, "Plugin contains no implementation of IPlugin");
-
-                        var pluginType = pluginTypes.Single();
-                        _childKernel.Bind<IPlugin>().To(pluginType).InSingletonScope();
-                        try
-                        {
-                            pluginInfo.Instance = (IPlugin) _childKernel.Get(pluginType);
-                        }
-                        catch (Exception e)
-                        {
-                            throw new ArtemisPluginException(pluginInfo, "Failed to instantiate the plugin", e);
-                        }
-                        _plugins.Add(pluginInfo);
                     }
                     catch (Exception e)
                     {
                         throw new ArtemisPluginException("Failed to load plugin", e);
                     }
+                }
 
                 // Activate plugins after they are all loaded
                 foreach (var pluginInfo in _plugins.Where(p => p.Enabled))
+                {
                     pluginInfo.Instance.EnablePlugin();
-            });
+                    OnPluginEnabled(new PluginEventArgs(pluginInfo));
+                }
 
-            OnFinishedLoadedPlugins();
+                LoadingPlugins = false;
+            }
+        }
+
+        /// <inheritdoc />
+        public void UnloadPlugins()
+        {
+            lock (_plugins)
+            {
+                // Unload all plugins
+                while (_plugins.Count > 0)
+                {
+                    UnloadPlugin(_plugins[0]);
+                }
+
+                // Dispose the child kernel and therefore any leftover plugins instantiated with it
+                if (_childKernel != null)
+                {
+                    _childKernel.Dispose();
+                    _childKernel = null;
+                }
+
+                _plugins.Clear();
+            }
+        }
+
+        /// <inheritdoc />
+        public void LoadPlugin(PluginInfo pluginInfo)
+        {
+            lock (_plugins)
+            {
+                // Unload the plugin first if it is already loaded
+                if (_plugins.Contains(pluginInfo))
+                    UnloadPlugin(pluginInfo);
+
+                // TODO Just temporarily until settings are in place
+                pluginInfo.Enabled = true;
+                var mainFile = Path.Combine(pluginInfo.Directory.FullName, pluginInfo.Main);
+                if (!File.Exists(mainFile))
+                    throw new ArtemisPluginException(pluginInfo, "Couldn't find the plugins main entry at " + mainFile);
+
+                // Load the plugin, all types implementing IPlugin and register them with DI
+                var setupInfo = new AppDomainSetup
+                {
+                    ApplicationName = pluginInfo.Guid.ToString(),
+                    ApplicationBase = AppDomain.CurrentDomain.BaseDirectory,
+                    PrivateBinPath = pluginInfo.Directory.FullName
+                };
+                pluginInfo.Context = AppDomainContext.Create(setupInfo);
+
+                try
+                {
+                    pluginInfo.Context.LoadAssemblyWithReferences(LoadMethod.LoadFrom, mainFile);
+                }
+                catch (Exception e)
+                {
+                    throw new ArtemisPluginException(pluginInfo, "Failed to load the plugins assembly", e);
+                }
+
+                // Get the IPlugin implementation from the main assembly and if there is only one, instantiate it
+                var mainAssembly = pluginInfo.Context.Domain.GetAssemblies().First(a => a.Location == mainFile);
+                var pluginTypes = mainAssembly.GetTypes().Where(t => typeof(IPlugin).IsAssignableFrom(t)).ToList();
+                if (pluginTypes.Count > 1)
+                    throw new ArtemisPluginException(pluginInfo, $"Plugin contains {pluginTypes.Count} implementations of IPlugin, only 1 allowed");
+                if (pluginTypes.Count == 0)
+                    throw new ArtemisPluginException(pluginInfo, "Plugin contains no implementation of IPlugin");
+
+                var pluginType = pluginTypes.Single();
+                try
+                {
+                    pluginInfo.Instance = (IPlugin) _childKernel.Get(pluginType);
+                }
+                catch (Exception e)
+                {
+                    throw new ArtemisPluginException(pluginInfo, "Failed to instantiate the plugin", e);
+                }
+
+                _plugins.Add(pluginInfo);
+                OnPluginLoaded(new PluginEventArgs(pluginInfo));
+            }
+        }
+
+        /// <inheritdoc />
+        public void UnloadPlugin(PluginInfo pluginInfo)
+        {
+            lock (_plugins)
+            {
+                try
+                {
+                    pluginInfo.Instance.DisablePlugin();
+                }
+                catch (Exception)
+                {
+                    // TODO: Log these
+                }
+                finally
+                {
+                    OnPluginDisabled(new PluginEventArgs(pluginInfo));
+                }
+
+                _childKernel.Unbind(pluginInfo.Instance.GetType());
+                
+                pluginInfo.Instance.Dispose();
+                pluginInfo.Context.Dispose();
+                _plugins.Remove(pluginInfo);
+
+                OnPluginUnloaded(new PluginEventArgs(pluginInfo));
+            }
+        }
+
+        /// <inheritdoc />
+        public PluginInfo GetPluginInfo(IPlugin plugin)
+        {
+            lock (_plugins)
+            {
+                return _plugins.FirstOrDefault(p => p.Instance == plugin);
+            }
+        }
+
+        /// <inheritdoc />
+        public List<PluginInfo> GetAllPluginInfo()
+        {
+            return new List<PluginInfo>(_plugins);
         }
 
         /// <inheritdoc />
@@ -132,9 +216,13 @@ namespace Artemis.Core.Services
             return layerType;
         }
 
-        public IReadOnlyList<IModule> GetModules()
+        /// <inheritdoc />
+        public List<T> GetPluginsOfType<T>() where T : IPlugin
         {
-            return Plugins.Where(p => p.Instance is IModule).Select(p => (IModule) p.Instance).ToList();
+            lock (_plugins)
+            {
+                return _plugins.Where(p => p.Enabled && p.Instance is T).Select(p => (T) p.Instance).ToList();
+            }
         }
 
         public void Dispose()
@@ -142,38 +230,32 @@ namespace Artemis.Core.Services
             UnloadPlugins();
         }
 
-        private void UnloadPlugins()
-        {
-            _plugins.Clear();
-
-            if (_childKernel != null)
-            {
-                _childKernel.Dispose();
-                _childKernel = null;
-            }
-        }
 
         #region Events
 
         public event EventHandler<PluginEventArgs> PluginLoaded;
-        public event EventHandler StartedLoadingPlugins;
+        public event EventHandler<PluginEventArgs> PluginUnloaded;
-        public event EventHandler FinishedLoadedPlugins;
+        public event EventHandler<PluginEventArgs> PluginEnabled;
+        public event EventHandler<PluginEventArgs> PluginDisabled;
 
-        private void OnPluginLoaded(PluginEventArgs e)
+        protected virtual void OnPluginLoaded(PluginEventArgs e)
         {
             PluginLoaded?.Invoke(this, e);
         }
 
-        private void OnStartedLoadingPlugins()
+        protected virtual void OnPluginUnloaded(PluginEventArgs e)
         {
-            LoadingPlugins = true;
+            PluginUnloaded?.Invoke(this, e);
-            StartedLoadingPlugins?.Invoke(this, EventArgs.Empty);
         }
 
-        private void OnFinishedLoadedPlugins()
+        protected virtual void OnPluginEnabled(PluginEventArgs e)
         {
-            LoadingPlugins = false;
+            PluginEnabled?.Invoke(this, e);
-            FinishedLoadedPlugins?.Invoke(this, EventArgs.Empty);
+        }
+
+        protected virtual void OnPluginDisabled(PluginEventArgs e)
+        {
+            PluginDisabled?.Invoke(this, e);
         }
 
         #endregion

src/Artemis.Core/Services/RgbService.cs

@@ -13,8 +13,8 @@ namespace Artemis.Core.Services
 {
     public class RgbService : IRgbService, IDisposable
     {
-        private readonly TimerUpdateTrigger _updateTrigger;
         private readonly List<IRGBDevice> _loadedDevices;
+        private readonly TimerUpdateTrigger _updateTrigger;
 
         public RgbService()
         {
@@ -68,7 +68,9 @@ namespace Artemis.Core.Services
                             OnDeviceLoaded(new DeviceEventArgs(surfaceDevice));
                         }
                         else
+                        {
                             OnDeviceReloaded(new DeviceEventArgs(surfaceDevice));
+                        }
                     }
                 }
             });

src/Artemis.Core/app.config

@@ -28,7 +28,8 @@
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
@@ -52,7 +53,8 @@
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
@@ -68,7 +70,8 @@
         <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
@@ -84,7 +87,8 @@
         <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
       </dependentAssembly>
       <dependentAssembly>
@@ -92,7 +96,8 @@
         <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
       </dependentAssembly>
       <dependentAssembly>

src/Artemis.Core/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="AppDomainToolkit" version="1.0.4.3" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.0" targetFramework="net461" />

src/Artemis.Plugins.LayerTypes.Brush/BrushLayerType.cs

@@ -1,4 +1,5 @@
-using System.Drawing;
+using System;
+using System.Drawing;
 using Artemis.Core.Plugins.Interfaces;
 using Artemis.Core.ProfileElements;
 using QRCoder;
@@ -17,6 +18,11 @@ namespace Artemis.Plugins.LayerTypes.Brush
             var qrGenerator = new QRCodeGenerator();
         }
 
+        public void DisablePlugin()
+        {
+            throw new NotImplementedException();
+        }
+
         public void Update(Layer layer)
         {
             var config = layer.LayerTypeConfiguration as BrushConfiguration;

src/Artemis.Plugins.LayerTypes.Brush/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="QRCoder" version="1.2.5" targetFramework="net461" />
   <package id="RGB.NET.Core" version="0.1.22" targetFramework="net461" />

src/Artemis.Plugins.Modules.General/GeneralModule.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Drawing;
 using Artemis.Core;
 using Artemis.Core.Plugins.Interfaces;
@@ -70,6 +71,11 @@ namespace Artemis.Plugins.Modules.General
             PopulateColors();
         }
 
+        public void DisablePlugin()
+        {
+            throw new NotImplementedException();
+        }
+
         private void UpdateLedColor(Led led, double deltaTime)
         {
             if (_colors.ContainsKey(led))

src/Artemis.Plugins.Modules.General/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <packages>
   <package id="QRCoder" version="1.3.5" targetFramework="net461" />
   <package id="RGB.NET.Core" version="0.1.22" targetFramework="net461" />

src/Artemis.Storage/Migrations/StorageContextModelSnapshot.cs

@@ -11,7 +11,7 @@ namespace Artemis.Storage.Migrations
     {
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
-#pragma warning disable 612, 618
+            #pragma warning disable 612, 618
             modelBuilder
                 .HasAnnotation("ProductVersion", "2.0.2-rtm-10011");
 
@@ -180,7 +180,7 @@ namespace Artemis.Storage.Migrations
                     .WithMany()
                     .HasForeignKey("RootFolderGuid");
             });
-#pragma warning restore 612, 618
+            #pragma warning restore 612, 618
         }
     }
 }

src/Artemis.UI/App.config

@@ -31,7 +31,8 @@
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
@@ -55,7 +56,8 @@
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
@@ -71,7 +73,8 @@
         <bindingRedirect oldVersion="0.0.0.0-2.6.0.0" newVersion="2.6.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
       </dependentAssembly>
       <dependentAssembly>
@@ -87,7 +90,8 @@
         <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
       </dependentAssembly>
       <dependentAssembly>
@@ -95,7 +99,8 @@
         <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51"
+                          culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
       </dependentAssembly>
       <dependentAssembly>

src/Artemis.UI/Bootstrapper.cs

@@ -22,6 +22,8 @@ namespace Artemis.UI
 
         protected override void ConfigureIoC(IKernel kernel)
         {
+            kernel.Settings.InjectNonPublic = true;
+
             // Load this assembly's module
             kernel.Load<UIModule>();
             // Load the core assembly's module

src/Artemis.UI/Controls/Visualizers/RGBSurfaceVisualizer.cs

@@ -70,10 +70,8 @@ namespace Artemis.UI.Controls.Visualizers
         private void RGBSurfaceOnSurfaceLayoutChanged(SurfaceLayoutChangedEventArgs args)
         {
             if (args.DeviceAdded)
-            {
                 foreach (var device in args.Devices)
                     _newDevices.Add(device);
-            }
 
             UpdateSurface();
         }

src/Artemis.UI/Stylet/ArtemisViewManager.cs

@@ -6,7 +6,6 @@ namespace Artemis.UI.Stylet
     {
         public ArtemisViewManager(ViewManagerConfig config) : base(config)
         {
-
         }
     }
 }

src/Artemis.UI/Stylet/NinjectBootstrapper.cs

@@ -34,7 +34,7 @@ namespace Artemis.UI.Stylet
             kernel.Bind<IViewManager>().ToConstant(new ViewManager(viewManagerConfig));
 
             kernel.Bind<IWindowManagerConfig>().ToConstant(this).InTransientScope();
-            kernel.Bind<IWindowManager>().ToMethod(c => new WindowManager(c.Kernel.Get<IViewManager>(),() => c.Kernel.Get<IMessageBoxViewModel>(), c.Kernel.Get<IWindowManagerConfig>())).InSingletonScope();
+            kernel.Bind<IWindowManager>().ToMethod(c => new WindowManager(c.Kernel.Get<IViewManager>(), () => c.Kernel.Get<IMessageBoxViewModel>(), c.Kernel.Get<IWindowManagerConfig>())).InSingletonScope();
             kernel.Bind<IEventAggregator>().To<EventAggregator>().InSingletonScope();
             kernel.Bind<IMessageBoxViewModel>().To<MessageBoxViewModel>(); // Not singleton!
         }

src/Artemis.UI/ViewModels/RootViewModel.cs

@@ -1,9 +1,9 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Controls;
+using Artemis.Core.Events;
 using Artemis.Core.Plugins.Interfaces;
 using Artemis.Core.Services.Interfaces;
 using Artemis.UI.ViewModels.Interfaces;
@@ -29,44 +29,22 @@ namespace Artemis.UI.ViewModels
 
             // Sync up with the plugin service
             Modules = new BindableCollection<IModule>();
-            LoadingPlugins = _pluginService.LoadingPlugins;
+            Modules.AddRange(_pluginService.GetPluginsOfType<IModule>());
-            _pluginService.StartedLoadingPlugins += PluginServiceOnStartedLoadingPlugins;
-            _pluginService.FinishedLoadedPlugins += PluginServiceOnFinishedLoadedPlugins;
-
-            if (!LoadingPlugins)
-                Modules.AddRange(_pluginService.GetModules());
 
+            _pluginService.PluginEnabled += PluginServiceOnPluginEnabled;
+            _pluginService.PluginDisabled += PluginServiceOnPluginDisabled;
             PropertyChanged += OnSelectedModuleChanged;
             PropertyChanged += OnSelectedPageChanged;
         }
 
-
         public IObservableCollection<IModule> Modules { get; set; }
-
         public bool MenuOpen { get; set; }
-        public bool LoadingPlugins { get; set; }
         public ListBoxItem SelectedPage { get; set; }
         public IModule SelectedModule { get; set; }
 
-        private void PluginServiceOnStartedLoadingPlugins(object sender, EventArgs eventArgs)
-        {
-            LoadingPlugins = true;
-
-            Modules.Clear();
-            SelectedModule = null;
-        }
-
-        private void PluginServiceOnFinishedLoadedPlugins(object sender, EventArgs eventArgs)
-        {
-            Modules.AddRange(_pluginService.GetModules());
-            SelectedModule = null;
-
-            LoadingPlugins = false;
-        }
-
         public async Task NavigateToSelectedModule()
         {
-            if (SelectedModule == null || LoadingPlugins)
+            if (SelectedModule == null)
                 return;
 
             // Create a view model for the given plugin info (which will be a module)
@@ -78,6 +56,31 @@ namespace Artemis.UI.ViewModels
             MenuOpen = false;
         }
 
+        private void PluginServiceOnPluginEnabled(object sender, PluginEventArgs e)
+        {
+            var existing = Modules.FirstOrDefault(m => _pluginService.GetPluginInfo(m)?.Guid == e.PluginInfo.Guid);
+            if (existing != null)
+            {
+                if (SelectedModule == existing && SelectedModule != null)
+                    SelectedModule = null;
+                Modules.Remove(existing);
+            }
+
+            if (e.PluginInfo.Instance is IModule module)
+                Modules.Add(module);
+        }
+
+        private void PluginServiceOnPluginDisabled(object sender, PluginEventArgs e)
+        {
+            var existing = Modules.FirstOrDefault(m => _pluginService.GetPluginInfo(m)?.Guid == e.PluginInfo.Guid);
+            if (existing != null)
+            {
+                if (SelectedModule == existing && SelectedModule != null)
+                    SelectedModule = null;
+                Modules.Remove(existing);
+            }
+        }
+
         private async void OnSelectedModuleChanged(object sender, PropertyChangedEventArgs e)
         {
             if (e.PropertyName == "SelectedModule")