skip metadata when passing contents

Author: Jaksuhn

ECommons

@@ -1,6 +1,7 @@
 using NLua;
 using SomethingNeedDoing.Core.Events;
 using SomethingNeedDoing.Core.Interfaces;
+using SomethingNeedDoing.Utils;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -93,7 +94,7 @@ await Svc.Framework.RunOnTick(async () =>
                 try
                 {
                     // Execute the script
-                    var results = lua.LoadEntryPointWrappedScript(macro.Macro.Content);
+                    var results = lua.LoadEntryPointWrappedScript(macro.Macro.ContentSansMetadata());
                     if (results.Length == 0 || results[0] is not LuaFunction func)
                         throw new LuaException("Failed to load Lua script: No function returned");
 

SomethingNeedDoing/LuaMacro/NLuaMacroEngine.cs

@@ -1,5 +1,6 @@
 using SomethingNeedDoing.Core.Events;
 using SomethingNeedDoing.Core.Interfaces;
+using SomethingNeedDoing.Utils;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -51,7 +52,7 @@ public async Task StartMacro(IMacro macro, CancellationToken token, TriggerEvent
 
         var state = new MacroExecutionState(macro)
         {
-            Commands = parser.Parse(macro.Content, Scheduler),
+            Commands = parser.Parse(macro.ContentSansMetadata(), Scheduler),
             CurrentLoop = 0,
             LoopCount = loopCount == 0 ? 1 : loopCount
         };

SomethingNeedDoing/NativeMacro/NativeMacroEngine.cs

@@ -1,9 +1,25 @@
 using SomethingNeedDoing.Core.Events;
 using SomethingNeedDoing.Core.Interfaces;
+using System.Text.RegularExpressions;
 
 namespace SomethingNeedDoing.Utils;
 public static class ConfigMacroExtensions
 {
+    private static readonly Regex MetadataBlockRegex = new(
+        @"^--\[\[SND\s*Metadata\s*\]\]\s*\n(.*?)\n--\[\[End\s*Metadata\s*\]\]",
+        RegexOptions.Singleline | RegexOptions.IgnoreCase);
+
+    /// <summary>
+    /// Removes the metadata block from macro content.
+    /// </summary>
+    public static string ContentSansMetadata(this IMacro macro)
+    {
+        var match = MetadataBlockRegex.Match(macro.Content);
+        if (!match.Success)
+            return macro.Content;
+        return macro.Content[..match.Index] + macro.Content[(match.Index + match.Length)..].TrimStart('\r', '\n');
+    }
+
     public static void Rename(this ConfigMacro macro, string newName)
     {
         macro.Name = newName;