Merge branch 'development'

.github/workflows/docfx.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Build DocFX
         run: docfx docfx/docfx_project/docfx.json
       - name: Upload to FTP
-        uses: SamKirkland/FTP-Deploy-Action@4.3.4
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
         with:
           server: www360.your-server.de
           protocol: ftps

src/Artemis.Core/Models/BreakableModel.cs

@@ -61,6 +61,9 @@ public bool TryOrBreak(Action action, string breakMessage)
     /// <inheritdoc />
     public void SetBrokenState(string state, Exception? exception = null)
     {
+        if (state == BrokenState && BrokenStateException?.StackTrace == exception?.StackTrace)
+            return;
+
         BrokenState = state ?? throw new ArgumentNullException(nameof(state));
         BrokenStateException = exception;
         OnBrokenStateChanged();

src/Artemis.Core/Models/IPluginFeatureDependent.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Artemis.Core;
+
+/// <summary>
+/// Represents a class that depends on plugin features
+/// </summary>
+public interface IPluginFeatureDependent
+{
+    /// <summary>
+    /// Gets the plugin features this class depends on, may contain the same plugin feature twice if depending on it in multiple ways.
+    /// </summary>
+    /// <returns>A <see cref="List{T}"/> of <see cref="PluginFeature"/> this class depends on.</returns>
+    public IEnumerable<PluginFeature> GetFeatureDependencies();
+}

src/Artemis.Core/Models/Profile/Conditions/AlwaysOnCondition.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Artemis.Storage.Entities.Profile.Abstract;
 using Artemis.Storage.Entities.Profile.Conditions;
 
@@ -82,4 +83,14 @@ public void OverrideTimeline(TimeSpan position)
     }
 
     #endregion
+
+    #region Implementation of IPluginFeatureDependent
+
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return [];
+    }
+
+    #endregion
 }

src/Artemis.Core/Models/Profile/Conditions/EventCondition.cs

@@ -325,4 +325,14 @@ public void LoadNodeScript()
     }
 
     #endregion
+
+    #region Implementation of IPluginFeatureDependent
+
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return Script.GetFeatureDependencies().Concat(EventPath?.GetFeatureDependencies() ?? []);
+    }
+
+    #endregion
 }

src/Artemis.Core/Models/Profile/Conditions/ICondition.cs

@@ -6,7 +6,7 @@ namespace Artemis.Core;
 /// <summary>
 ///     Represents a condition applied to a <see cref="ProfileElement" />
 /// </summary>
-public interface ICondition : IDisposable, IStorageModel
+public interface ICondition : IDisposable, IStorageModel, IPluginFeatureDependent
 {
     /// <summary>
     ///     Gets the entity used to store this condition

src/Artemis.Core/Models/Profile/Conditions/PlayOnceCondition.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using Artemis.Storage.Entities.Profile.Abstract;
 using Artemis.Storage.Entities.Profile.Conditions;
 
@@ -82,4 +83,14 @@ public void OverrideTimeline(TimeSpan position)
     }
 
     #endregion
+
+    #region Implementation of IPluginFeatureDependent
+
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return [];
+    }
+
+    #endregion
 }

src/Artemis.Core/Models/Profile/Conditions/StaticCondition.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Artemis.Storage.Entities.Profile.Abstract;
 using Artemis.Storage.Entities.Profile.Conditions;
@@ -159,6 +160,16 @@ public void LoadNodeScript()
     }
 
     #endregion
+
+    #region Implementation of IPluginFeatureDependent
+
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return Script.GetFeatureDependencies();
+    }
+
+    #endregion
 }
 
 /// <summary>

src/Artemis.Core/Models/Profile/DataBindings/DataBinding.cs

@@ -243,4 +243,14 @@ public void Save()
     }
 
     #endregion
+
+    #region Implementation of IPluginFeatureDependent
+
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return Script.GetFeatureDependencies();
+    }
+
+    #endregion
 }

src/Artemis.Core/Models/Profile/DataBindings/IDataBinding.cs

@@ -8,7 +8,7 @@ namespace Artemis.Core;
 ///     Represents a data binding that binds a certain <see cref="LayerProperty{T}" /> to a value inside a
 ///     <see cref="DataModel" />
 /// </summary>
-public interface IDataBinding : IStorageModel, IDisposable
+public interface IDataBinding : IStorageModel, IDisposable, IPluginFeatureDependent
 {
     /// <summary>
     ///     Gets the layer property the data binding is applied to

src/Artemis.Core/Models/Profile/DataModel/DataModelPath.cs

@@ -11,7 +11,7 @@ namespace Artemis.Core;
 /// <summary>
 ///     Represents a path that points to a property in data model
 /// </summary>
-public class DataModelPath : IStorageModel, IDisposable
+public class DataModelPath : IStorageModel, IDisposable, IPluginFeatureDependent
 {
     private readonly LinkedList<DataModelPathSegment> _segments;
     private Expression<Func<object, object>>? _accessorLambda;
@@ -188,6 +188,14 @@ public override string ToString()
         return string.IsNullOrWhiteSpace(Path) ? "this" : Path;
     }
 
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        if (Target == null)
+            return [];
+        return [Target.Module];
+    }
+
     /// <summary>
     ///     Occurs whenever the path becomes invalid
     /// </summary>

src/Artemis.Core/Models/Profile/Folder.cs

@@ -179,6 +179,14 @@ public override string ToString()
         return $"[Folder] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
     }
 
+    /// <inheritdoc />
+    public override IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return LayerEffects.SelectMany(e => e.GetFeatureDependencies())
+            .Concat(Children.SelectMany(c => c.GetFeatureDependencies()))
+            .Concat(DisplayCondition.GetFeatureDependencies());
+    }
+
     #region Rendering
 
     /// <inheritdoc />

src/Artemis.Core/Models/Profile/Layer.cs

@@ -160,10 +160,12 @@ public BaseLayerBrush? LayerBrush
     public LayerAdapter Adapter { get; }
 
     /// <inheritdoc />
-    public override bool ShouldBeEnabled => !Suspended && DisplayConditionMet;
+    public override bool ShouldBeEnabled => !Suspended && DisplayConditionMet && HasBounds;
 
     internal override RenderElementEntity RenderElementEntity => LayerEntity;
 
+    private bool HasBounds => Bounds.Width > 0 && Bounds.Height > 0;
+
     /// <inheritdoc />
     public override List<ILayerProperty> GetAllLayerProperties()
     {
@@ -187,6 +189,16 @@ public override string ToString()
         return $"[Layer] {nameof(Name)}: {Name}, {nameof(Order)}: {Order}";
     }
 
+    /// <inheritdoc />
+    public override IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return LayerEffects.SelectMany(e => e.GetFeatureDependencies())
+            .Concat(LayerBrush?.GetFeatureDependencies() ?? [])
+            .Concat(General.GetFeatureDependencies())
+            .Concat(Transform.GetFeatureDependencies())
+            .Concat(DisplayCondition.GetFeatureDependencies());
+    }
+
     /// <summary>
     ///     Occurs when a property affecting the rendering properties of this layer has been updated
     /// </summary>
@@ -383,7 +395,7 @@ public override void Update(double deltaTime)
 
             if (ShouldBeEnabled)
                 Enable();
-            else if (Suspended || (Timeline.IsFinished && !_renderCopies.Any()))
+            else if (Suspended || !HasBounds || (Timeline.IsFinished && !_renderCopies.Any()))
                 Disable();
 
             if (!Enabled || Timeline.Delta == TimeSpan.Zero)
@@ -766,7 +778,7 @@ public void RemoveLed(ArtemisLed led)
 
         if (!_leds.Remove(led))
             return;
-        
+
         CalculateRenderProperties();
     }
 

src/Artemis.Core/Models/Profile/LayerProperties/FloatRange.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json.Serialization;
 
 namespace Artemis.Core;
 
@@ -14,12 +15,13 @@ public readonly struct FloatRange
     /// </summary>
     /// <param name="start">The start value of the range</param>
     /// <param name="end">The end value of the range</param>
+    [JsonConstructor]
     public FloatRange(float start, float end)
     {
         Start = start;
         End = end;
 
-        _rand = new Random();
+        _rand = Random.Shared;
     }
 
     /// <summary>

src/Artemis.Core/Models/Profile/LayerProperties/ILayerProperty.cs

@@ -11,7 +11,7 @@ namespace Artemis.Core;
 ///         initialize these for you.
 ///     </para>
 /// </summary>
-public interface ILayerProperty : IStorageModel, IDisposable
+public interface ILayerProperty : IStorageModel, IDisposable, IPluginFeatureDependent
 {
     /// <summary>
     ///     Gets the description attribute applied to this property

src/Artemis.Core/Models/Profile/LayerProperties/IntRange.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Text.Json.Serialization;
 
 namespace Artemis.Core;
 
@@ -14,12 +15,13 @@ public readonly struct IntRange
     /// </summary>
     /// <param name="start">The start value of the range</param>
     /// <param name="end">The end value of the range</param>
+    [JsonConstructor]
     public IntRange(int start, int end)
     {
         Start = start;
         End = end;
 
-        _rand = new Random();
+        _rand = Random.Shared;
     }
 
     /// <summary>

src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs

@@ -54,6 +54,12 @@ public override string ToString()
         return $"{Path} - {CurrentValue} ({PropertyType})";
     }
 
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return DataBinding.GetFeatureDependencies();
+    }
+
     /// <summary>
     ///     Releases the unmanaged resources used by the object and optionally releases the managed resources.
     /// </summary>

src/Artemis.Core/Models/Profile/LayerPropertyGroup.cs

@@ -15,7 +15,7 @@ namespace Artemis.Core;
 ///         initialize these for you.
 ///     </para>
 /// </summary>
-public abstract class LayerPropertyGroup : IDisposable
+public abstract class LayerPropertyGroup : IDisposable, IPluginFeatureDependent
 {
     private readonly List<ILayerProperty> _layerProperties;
     private readonly List<LayerPropertyGroup> _layerPropertyGroups;
@@ -343,4 +343,14 @@ public void Dispose()
         Dispose(true);
         GC.SuppressFinalize(this);
     }
+
+    #region Implementation of IPluginFeatureDependent
+
+    /// <inheritdoc />
+    public IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return LayerProperties.SelectMany(p => p.GetFeatureDependencies()).Concat(LayerPropertyGroups.SelectMany(g => g.GetFeatureDependencies()));
+    }
+
+    #endregion
 }

src/Artemis.Core/Models/Profile/Profile.cs

@@ -171,6 +171,12 @@ public override string ToString()
         return $"[Profile] {nameof(Name)}: {Name}";
     }
 
+    /// <inheritdoc />
+    public override IEnumerable<PluginFeature> GetFeatureDependencies()
+    {
+        return GetRootFolder().GetFeatureDependencies().Concat(Scripts.Select(c => c.ScriptingProvider));
+    }
+
     /// <summary>
     ///     Populates all the LEDs on the elements in this profile
     /// </summary>

src/Artemis.Core/Models/Profile/ProfileElement.cs

@@ -9,7 +9,7 @@ namespace Artemis.Core;
 /// <summary>
 ///     Represents an element of a <see cref="Profile" />
 /// </summary>
-public abstract class ProfileElement : BreakableModel, IDisposable
+public abstract class ProfileElement : BreakableModel, IDisposable, IPluginFeatureDependent
 {
     internal readonly List<ProfileElement> ChildrenList;
     private Guid _entityId;
@@ -122,6 +122,9 @@ public override string ToString()
         return $"{nameof(EntityId)}: {EntityId}, {nameof(Order)}: {Order}, {nameof(Name)}: {Name}";
     }
 
+    /// <inheritdoc />
+    public abstract IEnumerable<PluginFeature> GetFeatureDependencies();
+
     /// <summary>
     ///     Occurs when a child was added to the <see cref="Children" /> list
     /// </summary>