Merge branch 'development'

src/Artemis.Core/Plugins/PluginFeature.cs

@@ -75,7 +75,8 @@ namespace Artemis.Core
         /// </param>
         protected virtual void Dispose(bool disposing)
         {
-            if (disposing) InternalDisable();
+            if (disposing)
+                SetEnabled(false);
         }
 
         /// <summary>
@@ -104,16 +105,6 @@ namespace Artemis.Core
             Profiler.StopMeasurement("Update");
         }
 
-        internal void StartRenderMeasure()
-        {
-            Profiler.StartMeasurement("Render");
-        }
-
-        internal void StopRenderMeasure()
-        {
-            Profiler.StopMeasurement("Render");
-        }
-
         internal void SetEnabled(bool enable, bool isAutoEnable = false)
         {
             if (enable == IsEnabled)

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/ProfileScript.cs

@@ -11,10 +11,6 @@ namespace Artemis.Core.ScriptingProviders
         protected ProfileScript(Profile profile, ScriptConfiguration configuration) : base(configuration)
         {
             Profile = profile;
-            lock (Profile.Scripts)
-            {
-                Profile.Scripts.Add(this);
-            }
         }
 
         /// <summary>

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/Script.cs

@@ -20,8 +20,6 @@ namespace Artemis.Core.ScriptingProviders
                 throw new ArtemisCoreException("The provided script configuration already has an active script");
 
             ScriptConfiguration = configuration;
-            ScriptConfiguration.Script = this;
-
             ScriptConfiguration.PropertyChanged += ScriptConfigurationOnPropertyChanged;
         }
 

src/Artemis.Core/Services/CoreService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Threading;
 using System.Threading.Tasks;
 using Artemis.Core.Ninject;
 using Artemis.Core.ScriptingProviders;
@@ -58,7 +59,6 @@ namespace Artemis.Core.Services
             _frameStopWatch = new Stopwatch();
             StartupArguments = new List<string>();
 
-            _rgbService.IsRenderPaused = true;
             _rgbService.Surface.Updating += SurfaceOnUpdating;
             _loggingLevel.SettingChanged += (sender, args) => ApplyLoggingLevel();
         }
@@ -222,7 +222,7 @@ namespace Artemis.Core.Services
             _pluginManagementService.CopyBuiltInPlugins();
             _pluginManagementService.LoadPlugins(StartupArguments, IsElevated);
 
-            _rgbService.IsRenderPaused = false;
+            _rgbService.SetRenderPaused(false);
             OnInitialized();
         }
 

src/Artemis.Core/Services/Input/InputService.cs

@@ -305,10 +305,17 @@ namespace Artemis.Core.Services
             }
         }
 
+        public bool IsKeyDown(KeyboardKey key)
+        {
+            return _pressedKeys.Any(p => p.Value.Contains(key));
+        }
+
         #endregion
 
         #region Mouse
 
+        private readonly HashSet<MouseButton> _pressedButtons = new();
+
         private void InputProviderOnMouseButtonDataReceived(object? sender, InputProviderMouseButtonEventArgs e)
         {
             bool foundLedId = InputKeyUtilities.MouseButtonLedIdMap.TryGetValue(e.Button, out LedId ledId);
@@ -320,9 +327,17 @@ namespace Artemis.Core.Services
             ArtemisMouseButtonUpDownEventArgs eventArgs = new(e.Device, led, e.Button, e.IsDown);
             OnMouseButtonUpDown(eventArgs);
             if (e.IsDown)
+            {
+                if (!_pressedButtons.Contains(e.Button))
+                    _pressedButtons.Add(e.Button);
                 OnMouseButtonDown(eventArgs);
+            }
             else
+            {
+                if (_pressedButtons.Contains(e.Button))
+                    _pressedButtons.Remove(e.Button);
                 OnMouseButtonUp(eventArgs);
+            }
 
             // _logger.Verbose("Mouse button data: LED ID: {ledId}, button: {button}, is down: {isDown}, device: {device} ", ledId, e.Button, e.IsDown, e.Device);
         }
@@ -339,6 +354,11 @@ namespace Artemis.Core.Services
             // _logger.Verbose("Mouse move data: XY: {X},{Y} - delta XY: {deltaX},{deltaY} - device: {device} ", e.CursorX, e.CursorY, e.DeltaX, e.DeltaY, e.Device);
         }
 
+        public bool IsButtonDown(MouseButton button)
+        {
+            return _pressedButtons.Contains(button);
+        }
+
         #endregion
 
         #region Events

src/Artemis.Core/Services/Input/Interfaces/IInputService.cs

@@ -40,7 +40,19 @@ namespace Artemis.Core.Services
         /// </summary>
         void ReleaseAll();
 
-        #region Events
+        /// <summary>
+        ///     Determines whether the provided key is pressed by any device
+        /// </summary>
+        /// <param name="key">The key to check</param>
+        /// <returns><see langword="true" /> if the key is pressed; otherwise <see langword="false" /></returns>
+        bool IsKeyDown(KeyboardKey key);
+
+        /// <summary>
+        ///     Determines whether the button key is pressed by any device
+        /// </summary>
+        /// <param name="button">The button to check</param>
+        /// <returns><see langword="true" /> if the button is pressed; otherwise <see langword="false" /></returns>
+        bool IsButtonDown(MouseButton button);
 
         /// <summary>
         ///     Occurs whenever a key on a keyboard was pressed or released
@@ -92,8 +104,6 @@ namespace Artemis.Core.Services
         /// </summary>
         public event EventHandler DeviceIdentified;
 
-        #endregion
-
         #region Identification
 
         /// <summary>

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

@@ -34,13 +34,13 @@ namespace Artemis.Core.Services
         /// <summary>
         ///     Gets or sets whether rendering should be paused
         /// </summary>
-        bool IsRenderPaused { get; set; }
+        bool IsRenderPaused { get; }
 
         /// <summary>
         ///     Gets a boolean indicating whether the render pipeline is open
         /// </summary>
         bool RenderOpen { get; }
-
+        
         /// <summary>
         ///     Gets or sets a boolean indicating whether to flush the RGB.NET LEDs during next update
         /// </summary>
@@ -138,6 +138,13 @@ namespace Artemis.Core.Services
         /// <param name="device">The device to disable</param>
         void DisableDevice(ArtemisDevice device);
 
+        /// <summary>
+        /// Pauses or resumes rendering, method won't return until the current frame finished rendering
+        /// </summary>
+        /// <param name="paused"></param>
+        /// <returns><see langword="true"/> if the pause state was changed; otherwise <see langword="false"/>.</returns>
+        bool SetRenderPaused(bool paused);
+
         /// <summary>
         ///     Occurs when a single device was added
         /// </summary>

src/Artemis.Core/Services/PluginManagementService.cs

@@ -199,6 +199,12 @@ namespace Artemis.Core.Services
 
         public void LoadPlugins(List<string> startupArguments, bool isElevated)
         {
+            if (startupArguments.Contains("--no-plugins"))
+            {
+                _logger.Warning("Artemis launched with --no-plugins, skipping the loading of plugins");
+                return;
+            }
+
             bool ignorePluginLock = startupArguments.Contains("--ignore-plugin-lock");
             bool stayElevated = startupArguments.Contains("--force-elevation");
             bool droppedAdmin = startupArguments.Contains("--dropped-admin");

src/Artemis.Core/Services/RgbService.cs

@@ -27,7 +27,6 @@ namespace Artemis.Core.Services
         private readonly PluginSetting<int> _targetFrameRateSetting;
         private readonly TextureBrush _textureBrush = new(ITexture.Empty) {CalculationMode = RenderMode.Absolute};
         private Dictionary<Led, ArtemisLed> _ledMap;
-        private bool _modifyingProviders;
         private ListLedGroup? _surfaceLedGroup;
         private SKTexture? _texture;
 
@@ -51,6 +50,7 @@ namespace Artemis.Core.Services
             _ledMap = new Dictionary<Led, ArtemisLed>();
 
             UpdateTrigger = new TimerUpdateTrigger {UpdateFrequency = 1.0 / _targetFrameRateSetting.Value};
+            SetRenderPaused(true);
             Surface.RegisterUpdateTrigger(UpdateTrigger);
             
             Utilities.ShutdownRequested += UtilitiesOnShutdownRequested;
@@ -71,7 +71,7 @@ namespace Artemis.Core.Services
 
         private void UtilitiesOnShutdownRequested(object? sender, EventArgs e)
         {
-            IsRenderPaused = true;
+            SetRenderPaused(true);
         }
 
         private void SurfaceOnLayoutChanged(SurfaceLayoutChangedEventArgs args)
@@ -81,16 +81,14 @@ namespace Artemis.Core.Services
 
         private void UpdateLedGroup()
         {
-            lock (_devices)
+            bool changedRenderPaused = SetRenderPaused(true);
+            try
             {
-                if (_modifyingProviders)
-                    return;
-
                 _ledMap = new Dictionary<Led, ArtemisLed>(_devices.SelectMany(d => d.Leds).ToDictionary(l => l.RgbLed));
 
                 if (_surfaceLedGroup == null)
                 {
-                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) {Brush = _textureBrush};
+                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) { Brush = _textureBrush };
                     OnLedsChanged();
                     return;
                 }
@@ -101,10 +99,16 @@ namespace Artemis.Core.Services
                     _surfaceLedGroup.Detach();
 
                     // Apply the application wide brush and decorator
-                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) {Brush = _textureBrush};
+                    _surfaceLedGroup = new ListLedGroup(Surface, LedMap.Select(l => l.Key)) { Brush = _textureBrush };
                     OnLedsChanged();
                 }
             }
+            finally
+            {
+                if (changedRenderPaused)
+                    SetRenderPaused(false);
+            }
+            
         }
 
         private void TargetFrameRateSettingOnSettingChanged(object? sender, EventArgs e)
@@ -141,95 +145,85 @@ namespace Artemis.Core.Services
 
         public void AddDeviceProvider(IRGBDeviceProvider deviceProvider)
         {
-            if (RenderOpen)
-                throw new ArtemisCoreException("Cannot add a device provider while rendering");
+            bool changedRenderPaused = SetRenderPaused(true);
 
-            lock (_devices)
+            try
             {
-                try
+                List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList();
+                Surface.Detach(toRemove.Select(d => d.RgbDevice));
+                foreach (ArtemisDevice device in toRemove)
+                    RemoveDevice(device);
+
+                List<Exception> providerExceptions = new();
+
+                void DeviceProviderOnException(object? sender, ExceptionEventArgs e)
                 {
-                    _modifyingProviders = true;
-
-                    List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList();
-                    Surface.Detach(toRemove.Select(d => d.RgbDevice));
-                    foreach (ArtemisDevice device in toRemove)
-                        RemoveDevice(device);
-
-                    List<Exception> providerExceptions = new();
-
-                    void DeviceProviderOnException(object? sender, ExceptionEventArgs e)
-                    {
-                        if (e.IsCritical)
-                            providerExceptions.Add(e.Exception);
-                        else
-                            _logger.Warning(e.Exception, "Device provider {deviceProvider} threw non-critical exception", deviceProvider.GetType().Name);
-                    }
-
-                    deviceProvider.Exception += DeviceProviderOnException;
-                    deviceProvider.Initialize();
-                    Surface.Attach(deviceProvider.Devices);
-                    deviceProvider.Exception -= DeviceProviderOnException;
-                    if (providerExceptions.Count == 1)
-                        throw new ArtemisPluginException("RGB.NET threw exception: " + providerExceptions.First().Message, providerExceptions.First());
-                    if (providerExceptions.Count > 1)
-                        throw new ArtemisPluginException("RGB.NET threw multiple exceptions", new AggregateException(providerExceptions));
-
-                    if (!deviceProvider.Devices.Any())
-                    {
-                        _logger.Warning("Device provider {deviceProvider} has no devices", deviceProvider.GetType().Name);
-                        return;
-                    }
-
-                    foreach (IRGBDevice rgbDevice in deviceProvider.Devices)
-                    {
-                        ArtemisDevice artemisDevice = GetArtemisDevice(rgbDevice);
-                        AddDevice(artemisDevice);
-                        _logger.Debug("Device provider {deviceProvider} added {deviceName}", deviceProvider.GetType().Name, rgbDevice.DeviceInfo.DeviceName);
-                    }
-
-                    _devices.Sort((a, b) => a.ZIndex - b.ZIndex);
+                    if (e.IsCritical)
+                        providerExceptions.Add(e.Exception);
+                    else
+                        _logger.Warning(e.Exception, "Device provider {deviceProvider} threw non-critical exception", deviceProvider.GetType().Name);
                 }
-                catch (Exception e)
+
+                deviceProvider.Exception += DeviceProviderOnException;
+                deviceProvider.Initialize();
+                Surface.Attach(deviceProvider.Devices);
+                deviceProvider.Exception -= DeviceProviderOnException;
+                if (providerExceptions.Count == 1)
+                    throw new ArtemisPluginException("RGB.NET threw exception: " + providerExceptions.First().Message, providerExceptions.First());
+                if (providerExceptions.Count > 1)
+                    throw new ArtemisPluginException("RGB.NET threw multiple exceptions", new AggregateException(providerExceptions));
+
+                if (!deviceProvider.Devices.Any())
                 {
-                    _logger.Error(e, "Exception during device loading for device provider {deviceProvider}", deviceProvider.GetType().Name);
-                    throw;
+                    _logger.Warning("Device provider {deviceProvider} has no devices", deviceProvider.GetType().Name);
+                    return;
                 }
-                finally
+
+                foreach (IRGBDevice rgbDevice in deviceProvider.Devices)
                 {
-                    _modifyingProviders = false;
-                    UpdateLedGroup();
+                    ArtemisDevice artemisDevice = GetArtemisDevice(rgbDevice);
+                    AddDevice(artemisDevice);
+                    _logger.Debug("Device provider {deviceProvider} added {deviceName}", deviceProvider.GetType().Name, rgbDevice.DeviceInfo.DeviceName);
                 }
+
+                _devices.Sort((a, b) => a.ZIndex - b.ZIndex);
+            }
+            catch (Exception e)
+            {
+                _logger.Error(e, "Exception during device loading for device provider {deviceProvider}", deviceProvider.GetType().Name);
+                throw;
+            }
+            finally
+            {
+                UpdateLedGroup();
+                if (changedRenderPaused)
+                    SetRenderPaused(false);
             }
         }
 
         public void RemoveDeviceProvider(IRGBDeviceProvider deviceProvider)
         {
-            if (RenderOpen)
-                throw new ArtemisCoreException("Cannot update the remove device provider while rendering");
+            bool changedRenderPaused = SetRenderPaused(true);
 
-            lock (_devices)
+            try
             {
-                try
-                {
-                    _modifyingProviders = true;
+                List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList();
+                Surface.Detach(toRemove.Select(d => d.RgbDevice));
+                foreach (ArtemisDevice device in toRemove)
+                    RemoveDevice(device);
 
-                    List<ArtemisDevice> toRemove = _devices.Where(a => deviceProvider.Devices.Any(d => a.RgbDevice == d)).ToList();
-                    Surface.Detach(toRemove.Select(d => d.RgbDevice));
-                    foreach (ArtemisDevice device in toRemove)
-                        RemoveDevice(device);
-
-                    _devices.Sort((a, b) => a.ZIndex - b.ZIndex);
-                }
-                catch (Exception e)
-                {
-                    _logger.Error(e, "Exception during device removal for device provider {deviceProvider}", deviceProvider.GetType().Name);
-                    throw;
-                }
-                finally
-                {
-                    _modifyingProviders = false;
-                    UpdateLedGroup();
-                }
+                _devices.Sort((a, b) => a.ZIndex - b.ZIndex);
+            }
+            catch (Exception e)
+            {
+                _logger.Error(e, "Exception during device removal for device provider {deviceProvider}", deviceProvider.GetType().Name);
+                throw;
+            }
+            finally
+            {
+                UpdateLedGroup();
+                if (changedRenderPaused)
+                    SetRenderPaused(false);
             }
         }
 
@@ -241,6 +235,24 @@ namespace Artemis.Core.Services
             Surface.Dispose();
         }
 
+        public bool SetRenderPaused(bool paused)
+        {
+            if (IsRenderPaused == paused)
+                return false;
+
+            if (paused)
+            {
+                UpdateTrigger.Stop();
+            }
+            else
+            {
+                UpdateTrigger.Start();
+            }
+
+            IsRenderPaused = paused;
+            return true;
+        }
+
         public event EventHandler<DeviceEventArgs>? DeviceAdded;
         public event EventHandler<DeviceEventArgs>? DeviceRemoved;
         public event EventHandler? LedsChanged;
@@ -326,12 +338,22 @@ namespace Artemis.Core.Services
 
         public void AutoArrangeDevices()
         {
-            SurfaceArrangement surfaceArrangement = SurfaceArrangement.GetDefaultArrangement();
-            surfaceArrangement.Arrange(_devices);
-            foreach (ArtemisDevice artemisDevice in _devices)
-                artemisDevice.ApplyDefaultCategories();
+            bool changedRenderPaused = SetRenderPaused(true);
 
-            SaveDevices();
+            try
+            {
+                SurfaceArrangement surfaceArrangement = SurfaceArrangement.GetDefaultArrangement();
+                surfaceArrangement.Arrange(_devices);
+                foreach (ArtemisDevice artemisDevice in _devices)
+                    artemisDevice.ApplyDefaultCategories();
+
+                SaveDevices();
+            }
+            finally
+            {
+                if (changedRenderPaused)
+                    SetRenderPaused(false);
+            }
         }
 
         public ArtemisLayout? ApplyBestDeviceLayout(ArtemisDevice device)
@@ -402,7 +424,7 @@ namespace Artemis.Core.Services
             _deviceRepository.Save(device.DeviceEntity);
 
             DeviceProvider deviceProvider = device.DeviceProvider;
-            
+
             // Feels bad but need to in order to get the initial LEDs back
             _pluginManagementService.DisablePluginFeature(deviceProvider, false);
             Thread.Sleep(500);

src/Artemis.Core/Services/ScriptingService.cs

@@ -6,17 +6,20 @@ using System.Reflection;
 using Artemis.Core.ScriptingProviders;
 using Ninject;
 using Ninject.Parameters;
+using Serilog;
 
 namespace Artemis.Core.Services
 {
     internal class ScriptingService : IScriptingService
     {
+        private readonly ILogger _logger;
         private readonly IPluginManagementService _pluginManagementService;
         private readonly IProfileService _profileService;
         private List<ScriptingProvider> _scriptingProviders;
 
-        public ScriptingService(IPluginManagementService pluginManagementService, IProfileService profileService)
+        public ScriptingService(ILogger logger, IPluginManagementService pluginManagementService, IProfileService profileService)
         {
+            _logger = logger;
             _pluginManagementService = pluginManagementService;
             _profileService = profileService;
 
@@ -81,43 +84,71 @@ namespace Artemis.Core.Services
 
         public GlobalScript? CreateScriptInstance(ScriptConfiguration scriptConfiguration)
         {
-            if (scriptConfiguration.Script != null)
-                throw new ArtemisCoreException("The provided script configuration already has an active script");
+            GlobalScript? script = null;
+            try
+            {
+                if (scriptConfiguration.Script != null)
+                    throw new ArtemisCoreException("The provided script configuration already has an active script");
 
-            ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
-            if (provider == null)
+                ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
+                if (provider == null)
+                    return null;
+
+                script = (GlobalScript) provider.Plugin.Kernel!.Get(
+                    provider.GlobalScriptType,
+                    CreateScriptConstructorArgument(provider.GlobalScriptType, scriptConfiguration)
+                );
+
+                script.ScriptingProvider = provider;
+                script.ScriptingService = this;
+                provider.InternalScripts.Add(script);
+                InternalGlobalScripts.Add(script);
+
+                scriptConfiguration.Script = script;
+                return script;
+            }
+            catch (Exception e)
+            {
+                _logger.Warning(e, "Failed to initialize global script");
+                script?.Dispose();
                 return null;
-
-            GlobalScript script = (GlobalScript) provider.Plugin.Kernel!.Get(
-                provider.GlobalScriptType,
-                CreateScriptConstructorArgument(provider.GlobalScriptType, scriptConfiguration)
-            );
-
-            script.ScriptingProvider = provider;
-            script.ScriptingService = this;
-            provider.InternalScripts.Add(script);
-            InternalGlobalScripts.Add(script);
-            return script;
+            }
         }
 
         public ProfileScript? CreateScriptInstance(Profile profile, ScriptConfiguration scriptConfiguration)
         {
-            if (scriptConfiguration.Script != null)
-                throw new ArtemisCoreException("The provided script configuration already has an active script");
+            ProfileScript? script = null;
+            try
+            {
+                if (scriptConfiguration.Script != null)
+                    throw new ArtemisCoreException("The provided script configuration already has an active script");
 
-            ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
-            if (provider == null)
+                ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
+                if (provider == null)
+                    return null;
+
+                script = (ProfileScript) provider.Plugin.Kernel!.Get(
+                    provider.ProfileScriptType,
+                    CreateScriptConstructorArgument(provider.ProfileScriptType, profile),
+                    CreateScriptConstructorArgument(provider.ProfileScriptType, scriptConfiguration)
+                );
+
+                script.ScriptingProvider = provider;
+                provider.InternalScripts.Add(script);
+                lock (profile)
+                {
+                    scriptConfiguration.Script = script;
+                    profile.Scripts.Add(script);
+                }
+
+                return script;
+            }
+            catch (Exception e)
+            {
+                _logger.Warning(e, "Failed to initialize profile script");
+                script?.Dispose();
                 return null;
-
-            ProfileScript script = (ProfileScript) provider.Plugin.Kernel!.Get(
-                provider.ProfileScriptType,
-                CreateScriptConstructorArgument(provider.ProfileScriptType, profile),
-                CreateScriptConstructorArgument(provider.ProfileScriptType, scriptConfiguration)
-            );
-
-            script.ScriptingProvider = provider;
-            provider.InternalScripts.Add(script);
-            return script;
+            }
         }
 
         /// <inheritdoc />