Plugins - Reworked most of the activation logic

src/Artemis.UI/Screens/ProfileEditor/LayerProperties/LayerEffects/EffectsViewModel.cs

@@ -12,13 +12,13 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects
 {
     public class EffectsViewModel : Conductor<LayerEffectDescriptor>.Collection.AllActive
     {
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly IProfileEditorService _profileEditorService;
         private LayerEffectDescriptor _selectedLayerEffectDescriptor;
 
-        public EffectsViewModel(LayerPropertiesViewModel layerPropertiesViewModel, IPluginService pluginService, IProfileEditorService profileEditorService)
+        public EffectsViewModel(LayerPropertiesViewModel layerPropertiesViewModel, IPluginManagementService pluginManagementService, IProfileEditorService profileEditorService)
         {
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _profileEditorService = profileEditorService;
             LayerPropertiesViewModel = layerPropertiesViewModel;
             PropertyChanged += HandleSelectedLayerEffectChanged;
@@ -35,7 +35,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.LayerEffects
 
         public void PopulateDescriptors()
         {
-            List<LayerEffectProvider> layerBrushProviders = _pluginService.GetPluginsOfType<LayerEffectProvider>();
+            List<LayerEffectProvider> layerBrushProviders = _pluginManagementService.GetPluginsOfType<LayerEffectProvider>();
             List<LayerEffectDescriptor> descriptors = layerBrushProviders.SelectMany(l => l.LayerEffectDescriptors).ToList();
             Items.AddRange(descriptors.Except(Items));
             Items.RemoveRange(Items.Except(descriptors));

src/Artemis.UI/Screens/Settings/Debug/Tabs/DataModelDebugViewModel.cs

@@ -13,7 +13,7 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
     public class DataModelDebugViewModel : Screen
     {
         private readonly IDataModelUIService _dataModelUIService;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly Timer _updateTimer;
         private bool _isModuleFilterEnabled;
         private DataModelPropertiesViewModel _mainDataModel;
@@ -21,10 +21,10 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
         private string _propertySearch;
         private Module _selectedModule;
 
-        public DataModelDebugViewModel(IDataModelUIService dataModelUIService, IPluginService pluginService)
+        public DataModelDebugViewModel(IDataModelUIService dataModelUIService, IPluginManagementService pluginManagementService)
         {
             _dataModelUIService = dataModelUIService;
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _updateTimer = new Timer(500);
 
             DisplayName = "Data model";
@@ -77,8 +77,8 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
             GetDataModel();
             _updateTimer.Start();
             _updateTimer.Elapsed += OnUpdateTimerOnElapsed;
-            _pluginService.PluginEnabled += PluginServiceOnPluginToggled;
-            _pluginService.PluginDisabled += PluginServiceOnPluginToggled;
+            _pluginManagementService.PluginEnabled += PluginManagementServiceOnPluginManagementToggled;
+            _pluginManagementService.PluginDisabled += PluginManagementServiceOnPluginManagementToggled;
 
             PopulateModules();
 
@@ -89,8 +89,8 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
         {
             _updateTimer.Stop();
             _updateTimer.Elapsed -= OnUpdateTimerOnElapsed;
-            _pluginService.PluginEnabled -= PluginServiceOnPluginToggled;
-            _pluginService.PluginDisabled -= PluginServiceOnPluginToggled;
+            _pluginManagementService.PluginEnabled -= PluginManagementServiceOnPluginManagementToggled;
+            _pluginManagementService.PluginDisabled -= PluginManagementServiceOnPluginManagementToggled;
 
             base.OnDeactivate();
         }
@@ -110,14 +110,14 @@ namespace Artemis.UI.Screens.Settings.Debug.Tabs
                 : _dataModelUIService.GetMainDataModelVisualization();
         }
 
-        private void PluginServiceOnPluginToggled(object? sender, PluginEventArgs e)
+        private void PluginManagementServiceOnPluginManagementToggled(object? sender, PluginEventArgs e)
         {
             PopulateModules();
         }
 
         private void PopulateModules()
         {
-            Modules = _pluginService.GetPluginsOfType<Module>().Where(p => p.IsEnabled).ToList();
+            Modules = _pluginManagementService.GetPluginsOfType<Module>().Where(p => p.IsEnabled).ToList();
         }
     }
 }

src/Artemis.UI/Screens/Settings/Tabs/General/GeneralSettingsTabViewModel.cs

@@ -25,7 +25,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
         private List<Tuple<string, int>> _targetFrameRates;
         private readonly PluginSetting<LayerBrushReference> _defaultLayerBrushDescriptor;
 
-        public GeneralSettingsTabViewModel(IDialogService dialogService, IDebugService debugService, ISettingsService settingsService, IPluginService pluginService)
+        public GeneralSettingsTabViewModel(IDialogService dialogService, IDebugService debugService, ISettingsService settingsService, IPluginManagementService pluginManagementService)
         {
             DisplayName = "GENERAL";
 
@@ -46,7 +46,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.General
             // Anything else is kinda broken right now
             SampleSizes = new List<int> {1, 9};
 
-            List<LayerBrushProvider> layerBrushProviders = pluginService.GetPluginsOfType<LayerBrushProvider>();
+            List<LayerBrushProvider> layerBrushProviders = pluginManagementService.GetPluginsOfType<LayerBrushProvider>();
 
             LayerBrushDescriptors = new BindableCollection<LayerBrushDescriptor>(layerBrushProviders.SelectMany(l => l.LayerBrushDescriptors));
             _defaultLayerBrushDescriptor = _settingsService.GetSetting("ProfileEditor.DefaultLayerBrushDescriptor", new LayerBrushReference

src/Artemis.UI/Screens/Settings/Tabs/Modules/ModuleOrderTabViewModel.cs

@@ -10,17 +10,17 @@ namespace Artemis.UI.Screens.Settings.Tabs.Modules
     public class ModuleOrderTabViewModel : Screen, IDropTarget
     {
         private readonly IModuleService _moduleService;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly DefaultDropHandler _defaultDropHandler;
         private readonly List<ModuleOrderModuleViewModel> _modules;
 
-        public ModuleOrderTabViewModel(IPluginService pluginService, IModuleService moduleService)
+        public ModuleOrderTabViewModel(IPluginManagementService pluginManagementService, IModuleService moduleService)
         {
             DisplayName = "MODULE PRIORITY";
 
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _moduleService = moduleService;
-            _modules = new List<ModuleOrderModuleViewModel>(pluginService.GetPluginsOfType<Module>().Select(m => new ModuleOrderModuleViewModel(m)));
+            _modules = new List<ModuleOrderModuleViewModel>(pluginManagementService.GetPluginsOfType<Module>().Select(m => new ModuleOrderModuleViewModel(m)));
             _defaultDropHandler = new DefaultDropHandler();
 
             NormalModules = new BindableCollection<ModuleOrderModuleViewModel>();

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsTabViewModel.cs

@@ -9,15 +9,15 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
 {
     public class PluginSettingsTabViewModel : Conductor<PluginSettingsViewModel>.Collection.AllActive
     {
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly ISettingsVmFactory _settingsVmFactory;
         private BindableCollection<PluginSettingsViewModel> _plugins;
 
-        public PluginSettingsTabViewModel(IPluginService pluginService, ISettingsVmFactory settingsVmFactory)
+        public PluginSettingsTabViewModel(IPluginManagementService pluginManagementService, ISettingsVmFactory settingsVmFactory)
         {
             DisplayName = "PLUGINS";
 
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _settingsVmFactory = settingsVmFactory;
         }
 
@@ -29,7 +29,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
                 Items.Clear();
                 await Task.Delay(200);
 
-                List<PluginSettingsViewModel> instances = _pluginService.GetAllPluginInfo().Select(p => _settingsVmFactory.CreatePluginSettingsViewModel(p.Instance)).ToList();
+                List<PluginSettingsViewModel> instances = _pluginManagementService.GetAllPluginInfo().Select(p => _settingsVmFactory.CreatePluginSettingsViewModel(p.Plugin)).ToList();
                 foreach (PluginSettingsViewModel pluginSettingsViewModel in instances) 
                     Items.Add(pluginSettingsViewModel);
             });

src/Artemis.UI/Screens/Settings/Tabs/Plugins/PluginSettingsViewModel.cs

@@ -26,7 +26,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
     {
         private readonly IDialogService _dialogService;
         private readonly ILogger _logger;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly ISnackbarMessageQueue _snackbarMessageQueue;
         private readonly IWindowManager _windowManager;
         private bool _enabling;
@@ -37,7 +37,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             ILogger logger,
             IWindowManager windowManager,
             IDialogService dialogService,
-            IPluginService pluginService,
+            IPluginManagementService pluginManagementService,
             ISnackbarMessageQueue snackbarMessageQueue)
         {
             PluginImplementation = pluginImplementation;
@@ -46,7 +46,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             _logger = logger;
             _windowManager = windowManager;
             _dialogService = dialogService;
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _snackbarMessageQueue = snackbarMessageQueue;
         }
 
@@ -183,7 +183,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
 
                 try
                 {
-                    _pluginService.EnablePlugin(PluginImplementation);
+                    _pluginManagementService.EnablePluginImplementation(PluginImplementation);
                 }
                 catch (Exception e)
                 {
@@ -195,7 +195,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
                 }
             }
             else
-                _pluginService.DisablePlugin(PluginImplementation);
+                _pluginManagementService.DisablePluginImplementation(PluginImplementation);
 
             NotifyOfPropertyChange(nameof(IsEnabled));
             NotifyOfPropertyChange(nameof(CanOpenSettings));
@@ -208,7 +208,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
             bool restart = false;
 
             // If any plugin already requires a restart, don't ask the user again
-            bool restartQueued = _pluginService.GetAllPluginInfo().Any(p => p.Instance != null && !p.IsEnabled && p.Instance.IsEnabled);
+            bool restartQueued = _pluginManagementService.GetAllPluginInfo().Any(p => p.Plugin != null && !p.IsEnabled && p.Plugin.IsEnabled);
             // If the plugin isn't enabled (load failed), it can be disabled without a restart
             if (!restartQueued && PluginImplementation.IsEnabled)
             {
@@ -220,7 +220,7 @@ namespace Artemis.UI.Screens.Settings.Tabs.Plugins
                 );
             }
 
-            _pluginService.DisablePlugin(PluginImplementation);
+            _pluginManagementService.DisablePluginImplementation(PluginImplementation);
             if (restart)
             {
                 _logger.Debug("Restarting for device provider disable {pluginInfo}", PluginImplementation.PluginInfo);

src/Artemis.UI/Screens/Sidebar/SidebarViewModel.cs

@@ -29,18 +29,18 @@ namespace Artemis.UI.Screens.Sidebar
         private readonly Timer _activeModulesUpdateTimer;
         private readonly IKernel _kernel;
         private readonly IModuleVmFactory _moduleVmFactory;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private string _activeModules;
         private bool _isSidebarOpen;
         private IScreen _selectedItem;
         private BindableCollection<INavigationItem> _sidebarItems;
         private Dictionary<INavigationItem, Module> _sidebarModules;
 
-        public SidebarViewModel(IKernel kernel, IEventAggregator eventAggregator, IModuleVmFactory moduleVmFactory, IPluginService pluginService)
+        public SidebarViewModel(IKernel kernel, IEventAggregator eventAggregator, IModuleVmFactory moduleVmFactory, IPluginManagementService pluginManagementService)
         {
             _kernel = kernel;
             _moduleVmFactory = moduleVmFactory;
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
 
             SidebarModules = new Dictionary<INavigationItem, Module>();
             SidebarItems = new BindableCollection<INavigationItem>();
@@ -49,8 +49,8 @@ namespace Artemis.UI.Screens.Sidebar
             _activeModulesUpdateTimer.Start();
             _activeModulesUpdateTimer.Elapsed += ActiveModulesUpdateTimerOnElapsed;
 
-            _pluginService.PluginEnabled += PluginServiceOnPluginEnabled;
-            _pluginService.PluginDisabled += PluginServiceOnPluginDisabled;
+            _pluginManagementService.PluginEnabled += PluginManagementServiceOnPluginManagementEnabled;
+            _pluginManagementService.PluginDisabled += PluginManagementServiceOnPluginManagementDisabled;
 
             SetupSidebar();
             eventAggregator.Subscribe(this);
@@ -96,8 +96,8 @@ namespace Artemis.UI.Screens.Sidebar
             SelectedItem?.Deactivate();
             SelectedItem = null;
 
-            _pluginService.PluginEnabled -= PluginServiceOnPluginEnabled;
-            _pluginService.PluginDisabled -= PluginServiceOnPluginDisabled;
+            _pluginManagementService.PluginEnabled -= PluginManagementServiceOnPluginManagementEnabled;
+            _pluginManagementService.PluginDisabled -= PluginManagementServiceOnPluginManagementDisabled;
 
             _activeModulesUpdateTimer.Stop();
             _activeModulesUpdateTimer.Elapsed -= ActiveModulesUpdateTimerOnElapsed;
@@ -118,7 +118,7 @@ namespace Artemis.UI.Screens.Sidebar
             // Add all activated modules
             SidebarItems.Add(new DividerNavigationItem());
             SidebarItems.Add(new SubheaderNavigationItem {Subheader = "Modules"});
-            List<Module> modules = _pluginService.GetPluginsOfType<Module>().ToList();
+            List<Module> modules = _pluginManagementService.GetPluginsOfType<Module>().ToList();
             foreach (Module module in modules)
                 AddModule(module);
 
@@ -210,15 +210,15 @@ namespace Artemis.UI.Screens.Sidebar
 
         #region Event handlers
 
-        private void PluginServiceOnPluginEnabled(object sender, PluginEventArgs e)
+        private void PluginManagementServiceOnPluginManagementEnabled(object sender, PluginEventArgs e)
         {
-            if (e.PluginInfo.Instance is Module module)
+            if (e.PluginInfo.Plugin is Module module)
                 AddModule(module);
         }
 
-        private void PluginServiceOnPluginDisabled(object sender, PluginEventArgs e)
+        private void PluginManagementServiceOnPluginManagementDisabled(object sender, PluginEventArgs e)
         {
-            if (e.PluginInfo.Instance is Module module)
+            if (e.PluginInfo.Plugin is Module module)
                 RemoveModule(module);
         }
 

src/Artemis.UI/Screens/Splash/SplashViewModel.cs

@@ -10,13 +10,13 @@ namespace Artemis.UI.Screens.Splash
     public class SplashViewModel : Screen
     {
         private readonly ICoreService _coreService;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private string _status;
 
-        public SplashViewModel(ICoreService coreService, IPluginService pluginService)
+        public SplashViewModel(ICoreService coreService, IPluginManagementService pluginManagementService)
         {
             _coreService = coreService;
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             Status = "Initializing Core";
         }
 
@@ -37,46 +37,46 @@ namespace Artemis.UI.Screens.Splash
         protected override void OnInitialActivate()
         {
             _coreService.Initialized += OnCoreServiceOnInitialized;
-            _pluginService.CopyingBuildInPlugins += OnPluginServiceOnCopyingBuildInPlugins;
-            _pluginService.PluginLoading += OnPluginServiceOnPluginLoading;
-            _pluginService.PluginLoaded += OnPluginServiceOnPluginLoaded;
-            _pluginService.PluginEnabling += PluginServiceOnPluginEnabling;
-            _pluginService.PluginEnabled += PluginServiceOnPluginEnabled;
+            _pluginManagementService.CopyingBuildInPlugins += OnPluginManagementServiceOnCopyingBuildInPluginsManagement;
+            _pluginManagementService.PluginLoading += OnPluginManagementServiceOnPluginManagementLoading;
+            _pluginManagementService.PluginLoaded += OnPluginManagementServiceOnPluginManagementLoaded;
+            _pluginManagementService.PluginEnabling += PluginManagementServiceOnPluginManagementEnabling;
+            _pluginManagementService.PluginEnabled += PluginManagementServiceOnPluginManagementEnabled;
             base.OnInitialActivate();
         }
 
         protected override void OnClose()
         {
             _coreService.Initialized -= OnCoreServiceOnInitialized;
-            _pluginService.CopyingBuildInPlugins -= OnPluginServiceOnCopyingBuildInPlugins;
-            _pluginService.PluginLoading -= OnPluginServiceOnPluginLoading;
-            _pluginService.PluginLoaded -= OnPluginServiceOnPluginLoaded;
-            _pluginService.PluginEnabling -= PluginServiceOnPluginEnabling;
-            _pluginService.PluginEnabled -= PluginServiceOnPluginEnabled;
+            _pluginManagementService.CopyingBuildInPlugins -= OnPluginManagementServiceOnCopyingBuildInPluginsManagement;
+            _pluginManagementService.PluginLoading -= OnPluginManagementServiceOnPluginManagementLoading;
+            _pluginManagementService.PluginLoaded -= OnPluginManagementServiceOnPluginManagementLoaded;
+            _pluginManagementService.PluginEnabling -= PluginManagementServiceOnPluginManagementEnabling;
+            _pluginManagementService.PluginEnabled -= PluginManagementServiceOnPluginManagementEnabled;
             base.OnClose();
         }
 
-        private void OnPluginServiceOnPluginLoaded(object sender, PluginEventArgs args)
+        private void OnPluginManagementServiceOnPluginManagementLoaded(object sender, PluginEventArgs args)
         {
             Status = "Initializing UI";
         }
 
-        private void OnPluginServiceOnPluginLoading(object sender, PluginEventArgs args)
+        private void OnPluginManagementServiceOnPluginManagementLoading(object sender, PluginEventArgs args)
         {
             Status = "Loading plugin: " + args.PluginInfo.Name;
         }
 
-        private void PluginServiceOnPluginEnabled(object sender, PluginEventArgs args)
+        private void PluginManagementServiceOnPluginManagementEnabled(object sender, PluginEventArgs args)
         {
             Status = "Initializing UI";
         }
 
-        private void PluginServiceOnPluginEnabling(object sender, PluginEventArgs args)
+        private void PluginManagementServiceOnPluginManagementEnabling(object sender, PluginEventArgs args)
         {
             Status = "Enabling plugin: " + args.PluginInfo.Name;
         }
 
-        private void OnPluginServiceOnCopyingBuildInPlugins(object sender, EventArgs args)
+        private void OnPluginManagementServiceOnCopyingBuildInPluginsManagement(object sender, EventArgs args)
         {
             Status = "Updating built-in plugins";
         }