Merge branch 'development' into VisualScripting

src/Artemis.Core/Services/PluginManagementService.cs

@@ -10,6 +10,7 @@ using Artemis.Core.DeviceProviders;
 using Artemis.Core.Ninject;
 using Artemis.Storage.Entities.General;
 using Artemis.Storage.Entities.Plugins;
+using Artemis.Storage.Entities.Surface;
 using Artemis.Storage.Repositories.Interfaces;
 using McMaster.NETCore.Plugins;
 using Ninject;
@@ -28,15 +29,17 @@ namespace Artemis.Core.Services
         private readonly IKernel _kernel;
         private readonly ILogger _logger;
         private readonly IPluginRepository _pluginRepository;
+        private readonly IDeviceRepository _deviceRepository;
         private readonly IQueuedActionRepository _queuedActionRepository;
         private readonly List<Plugin> _plugins;
         private bool _isElevated;
 
-        public PluginManagementService(IKernel kernel, ILogger logger, IPluginRepository pluginRepository, IQueuedActionRepository queuedActionRepository)
+        public PluginManagementService(IKernel kernel, ILogger logger, IPluginRepository pluginRepository, IDeviceRepository deviceRepository, IQueuedActionRepository queuedActionRepository)
         {
             _kernel = kernel;
             _logger = logger;
             _pluginRepository = pluginRepository;
+            _deviceRepository = deviceRepository;
             _queuedActionRepository = queuedActionRepository;
             _plugins = new List<Plugin>();
 
@@ -572,7 +575,11 @@ namespace Artemis.Core.Services
         {
             if (plugin.IsEnabled)
                 throw new ArtemisCoreException("Cannot remove the settings of an enabled plugin");
+            
             _pluginRepository.RemoveSettings(plugin.Guid);
+            foreach (DeviceEntity deviceEntity in _deviceRepository.GetAll().Where(e => e.DeviceProvider == plugin.Guid.ToString())) 
+                _deviceRepository.Remove(deviceEntity);
+
             plugin.Settings?.ClearSettings();
         }
 

src/Artemis.Core/Services/RgbService.cs

@@ -35,7 +35,7 @@ namespace Artemis.Core.Services
             _logger = logger;
             _pluginManagementService = pluginManagementService;
             _deviceRepository = deviceRepository;
-            _targetFrameRateSetting = settingsService.GetSetting("Core.TargetFrameRate", 25);
+            _targetFrameRateSetting = settingsService.GetSetting("Core.TargetFrameRate", 30);
             _renderScaleSetting = settingsService.GetSetting("Core.RenderScale", 0.25);
 
             Surface = new RGBSurface();

src/Artemis.Core/Services/SettingsService.cs

@@ -16,6 +16,12 @@ namespace Artemis.Core.Services
         {
             return _pluginSettings.GetSetting(name, defaultValue);
         }
+
+        /// <inheritdoc />
+        public void SaveAllSettings()
+        {
+            _pluginSettings.SaveAllSettings();
+        }
     }
 
     /// <summary>
@@ -32,5 +38,10 @@ namespace Artemis.Core.Services
         /// <param name="defaultValue">The default value to use if the setting does not exist yet</param>
         /// <returns></returns>
         PluginSetting<T> GetSetting<T>(string name, T? defaultValue = default);
+
+        /// <summary>
+        ///     Saves all settings, obviously
+        /// </summary>
+        void SaveAllSettings();
     }
 }