Added multi-space strings

Can now surround strings with quotes to keep multi spaced strings

Author: maxfleetdev

Commander/Runtime/Core/CommandParser.cs

@@ -1,26 +1,65 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;
 
 public static class CommandParser
-{
+{
+    private static readonly Regex _tokeniser = new Regex(
+        @"[\""].+?[\""]|['].+?[']|[^ ]+",
+        RegexOptions.Compiled);
+
+    /// <summary>
+    /// Takes the raw input of the user and returns the command name and it's converted parameters
+    /// </summary>
+    /// <param name="rawInput">Input sent by user</param>
+    /// <param name="command">The commands name</param>
+    /// <param name="args">The command parameters</param>
     public static void StringToCommand(string rawInput, out string command, out string[] args)
     {
-        // TODO: Keep in single string when surrounded in quotes
-        var parts = rawInput.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
-        if (parts.Length == 0)
+        // Skip empty input
+        if (string.IsNullOrWhiteSpace(rawInput))
+        {
+            command = "";
+            args = Array.Empty<string>();
+            return;
+        }
+
+        // Keep strings which are surrounded by " or '
+        var matches = _tokeniser.Matches(rawInput.Trim());
+        var tokens = new List<string>(matches.Count);
+        foreach (Match m in matches)
+        {
+            var t = m.Value;
+
+            // Strip the quotes
+            if ((t.StartsWith("\"") && t.EndsWith("\"")) || (t.StartsWith("'") && t.EndsWith("'")))
+            {
+                t = t.Substring(1, t.Length - 2);
+            }
+            tokens.Add(t);
+        }
+
+        // Skip if we found no tokens from past stripping
+        if (tokens.Count == 0)
         {
             command = "";
             args = Array.Empty<string>();
             return;
         }
 
-        // Return variables
-        command = parts[0];
-        args = parts.Length > 1? parts.Skip(1).ToArray() : Array.Empty<string>();
+        command = tokens[0];
+        args = tokens.Skip(1).ToArray();
     }
 
-    // Convert string into it's given type. E.g "1" = int, "STATE_IDLE" = enum, etc...
+    /// <summary>
+    /// Convert string into it's given type. E.g "1" = int, "STATE_IDLE" = enum, etc...
+    /// </summary>
+    /// <param name="raw">The raw string</param>
+    /// <param name="targetType">Type of data we will convert to</param>
+    /// <returns></returns>
+    /// <exception cref="InvalidOperationException"></exception>
     public static object ConvertStringToType(string raw, Type targetType)
     {
         // String Conversion
@@ -41,6 +80,7 @@ public static object ConvertStringToType(string raw, Type targetType)
             return Convert.ChangeType(raw, targetType, CultureInfo.InvariantCulture);
         }
 
-        throw new InvalidOperationException($"No converter for type {targetType.Name}");
+        // Data needs
+        throw new InvalidOperationException($"No converter for type {targetType.Name}! Create conversion in .../Commander/Runtime/Core/CommandParse.cs");
     }
 }

Commander/Runtime/Core/CommandRegistry.cs

@@ -9,17 +9,17 @@ public static class CommandRegistry
     {
         #region Properties
 
-        /// <summary>
-        /// Enable or disable debug logs
-        /// </summary>
-        public static bool ShowDebugLogs = true;
-
         /// <summary>
         /// Name of command and it's tuple of method info and target MonoBehaviour
         /// </summary>
         private static Dictionary<string, List<(MethodInfo mi, MonoBehaviour target)>> _commands
             = new Dictionary<string, List<(MethodInfo, MonoBehaviour)>>
-            (StringComparer.OrdinalIgnoreCase);
+            (StringComparer.OrdinalIgnoreCase);
+
+        /// <summary>
+        /// Enable or disable debug logs
+        /// </summary>
+        public static bool ShowDebugLogs = true;
 
         #endregion
 

Commander/Samples/Scripts/CommandTest.cs

@@ -0,0 +1,10 @@
+using UnityEngine;
+
+public class CommandTest : MonoBehaviour
+{
+    [Command("TestCommand")]
+    private void TestCommandMethod(int a, string b)
+    {
+        Debug.Log($"Test command executed with parameters: a={a}, b={b}");
+    }
+}

Commander/Samples/Scripts/CommandTest.cs.meta

@@ -7,8 +7,11 @@ public class ConsoleManager : MonoBehaviour, ConsoleInput.IUIActions
 {
     [SerializeField] private GameObject consoleUI;
     [SerializeField] private TMP_InputField inputField;
-    private ConsoleInput _consoleInput;
-
+    
+    private ConsoleInput _consoleInput;
+
+    #region Lifecycle
+
     private void Awake()
     {
         consoleUI.SetActive(false);
@@ -25,16 +28,26 @@ private void OnDisable()
     {
         _consoleInput.UI.Disable();
         inputField.onSubmit.RemoveAllListeners();
-    }
-
+    }
+
+    #endregion
+
+    #region Input Events
+
     public void OnConsoleToggle(InputAction.CallbackContext context)
     {
         bool toggle = !consoleUI.activeSelf;
         consoleUI.SetActive(toggle);
-    }
-
+    }
+
+    #endregion
+
+    #region UI Events
+
     public void InputSent(string input)
     {
         CommandRegistry.ExecuteCommand(input);
-    }
+    }
+
+    #endregion
 }