mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-11 11:26:27 +00:00
Scripting - Fixed broken scripts being applied to profiles in an invalid state
UI - Updated about tab link
This commit is contained in:
1 parent
fcdfbe61bb
commit
7ad7eaad89
7 files changed
+97
-43
No files matched your search
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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 />
|
||||
|
||||
Reference in new issue
Block a user