Plugins - Reworked most of the activation logic

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -13,19 +13,19 @@ namespace Artemis.Core.Services
     internal class ProfileService : IProfileService
     {
         private readonly ILogger _logger;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly IProfileRepository _profileRepository;
         private readonly ISurfaceService _surfaceService;
 
         internal ProfileService(ILogger logger,
-            IPluginService pluginService,
+            IPluginManagementService pluginManagementService,
             ISurfaceService surfaceService,
             IConditionOperatorService conditionOperatorService,
             IDataBindingService dataBindingService,
             IProfileRepository profileRepository)
         {
             _logger = logger;
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _surfaceService = surfaceService;
             _profileRepository = profileRepository;
 
@@ -118,15 +118,15 @@ namespace Artemis.Core.Services
             }
 
             // This could happen during activation so subscribe to it
-            _pluginService.PluginEnabled += ActivatingProfilePluginToggle;
-            _pluginService.PluginDisabled += ActivatingProfilePluginToggle;
+            _pluginManagementService.PluginEnabled += ActivatingProfilePluginToggle;
+            _pluginManagementService.PluginDisabled += ActivatingProfilePluginToggle;
             _surfaceService.SurfaceConfigurationUpdated += ActivatingProfileSurfaceUpdate;
 
             await profileDescriptor.ProfileModule.ChangeActiveProfileAnimated(profile, _surfaceService.ActiveSurface);
             SaveActiveProfile(profileDescriptor.ProfileModule);
 
-            _pluginService.PluginEnabled -= ActivatingProfilePluginToggle;
-            _pluginService.PluginDisabled -= ActivatingProfilePluginToggle;
+            _pluginManagementService.PluginEnabled -= ActivatingProfilePluginToggle;
+            _pluginManagementService.PluginDisabled -= ActivatingProfilePluginToggle;
             _surfaceService.SurfaceConfigurationUpdated -= ActivatingProfileSurfaceUpdate;
 
             return profile;
@@ -285,7 +285,7 @@ namespace Artemis.Core.Services
         /// <param name="surface"></param>
         private void ActiveProfilesPopulateLeds(ArtemisSurface surface)
         {
-            List<ProfileModule> profileModules = _pluginService.GetPluginsOfType<ProfileModule>();
+            List<ProfileModule> profileModules = _pluginManagementService.GetPluginsOfType<ProfileModule>();
             foreach (ProfileModule profileModule in profileModules.Where(p => p.ActiveProfile != null).ToList())
                 profileModule.ActiveProfile.PopulateLeds(surface);
         }

src/Artemis.Core/Services/Storage/SurfaceService.cs

@@ -12,18 +12,18 @@ namespace Artemis.Core.Services
     internal class SurfaceService : ISurfaceService
     {
         private readonly ILogger _logger;
-        private readonly IPluginService _pluginService;
+        private readonly IPluginManagementService _pluginManagementService;
         private readonly PluginSetting<double> _renderScaleSetting;
         private readonly IRgbService _rgbService;
         private readonly List<ArtemisSurface> _surfaceConfigurations;
         private readonly ISurfaceRepository _surfaceRepository;
 
-        public SurfaceService(ILogger logger, ISurfaceRepository surfaceRepository, IRgbService rgbService, IPluginService pluginService, ISettingsService settingsService)
+        public SurfaceService(ILogger logger, ISurfaceRepository surfaceRepository, IRgbService rgbService, IPluginManagementService pluginManagementService, ISettingsService settingsService)
         {
             _logger = logger;
             _surfaceRepository = surfaceRepository;
             _rgbService = rgbService;
-            _pluginService = pluginService;
+            _pluginManagementService = pluginManagementService;
             _surfaceConfigurations = new List<ArtemisSurface>();
             _renderScaleSetting = settingsService.GetSetting("Core.RenderScale", 0.5);
 
@@ -44,7 +44,7 @@ namespace Artemis.Core.Services
             // Add all current devices
             foreach (IRGBDevice rgbDevice in _rgbService.LoadedDevices)
             {
-                PluginImplementation pluginImplementation = _pluginService.GetPluginByDevice(rgbDevice);
+                PluginImplementation pluginImplementation = _pluginManagementService.GetPluginByDevice(rgbDevice);
                 configuration.Devices.Add(new ArtemisDevice(rgbDevice, pluginImplementation, configuration));
             }
 
@@ -136,7 +136,7 @@ namespace Artemis.Core.Services
                     IRGBDevice device = _rgbService.Surface.Devices.FirstOrDefault(d => d.GetDeviceIdentifier() == position.DeviceIdentifier);
                     if (device != null)
                     {
-                        PluginImplementation pluginImplementation = _pluginService.GetPluginByDevice(device);
+                        PluginImplementation pluginImplementation = _pluginManagementService.GetPluginByDevice(device);
                         surfaceConfiguration.Devices.Add(new ArtemisDevice(device, pluginImplementation, surfaceConfiguration, position));
                     }
                 }
@@ -178,7 +178,7 @@ namespace Artemis.Core.Services
             DeviceEntity existingDeviceConfig = surface.SurfaceEntity.DeviceEntities.FirstOrDefault(d => d.DeviceIdentifier == deviceIdentifier);
             if (existingDeviceConfig != null)
             {
-                PluginImplementation pluginImplementation = _pluginService.GetPluginByDevice(rgbDevice);
+                PluginImplementation pluginImplementation = _pluginManagementService.GetPluginByDevice(rgbDevice);
                 device = new ArtemisDevice(rgbDevice, pluginImplementation, surface, existingDeviceConfig);
             }
             // Fall back on creating a new device
@@ -189,7 +189,7 @@ namespace Artemis.Core.Services
                     rgbDevice.DeviceInfo,
                     deviceIdentifier
                 );
-                PluginImplementation pluginImplementation = _pluginService.GetPluginByDevice(rgbDevice);
+                PluginImplementation pluginImplementation = _pluginManagementService.GetPluginByDevice(rgbDevice);
                 device = new ArtemisDevice(rgbDevice, pluginImplementation, surface);
             }