1.1.1

Add argument in Command
fix TargetParameterCountException
CommandCheck -> Target.Method
object execute -> internal

Author: qluana7

.gitignore

@@ -0,0 +1 @@
+.ionide/

CommandExecutor/Attributes/CommandCheckAttribute.cs

@@ -7,6 +7,7 @@ namespace CommandExecutor.Attributes
     /// Check before method execute.
     /// You can create your own check attribute by inheriting this class
     /// </summary>
+    [AttributeUsage(AttributeTargets.Method)]
     public abstract class CommandCheckAttribute : Attribute
     {
         /// <summary>

CommandExecutor/CommandExecutor.cs

@@ -124,7 +124,9 @@ public void Execute(string command, string[] args) =>
         /// </summary>
         /// <param name="command">The string to search command</param>
         /// <param name="args">The object array to pass as arguments</param>
-        public void Execute(string command, object[] args) =>
+        
+        // Because of it's risk, We decided to change to internal.
+        internal void Execute(string command, object[] args) =>
             FindCommand(command).Execute(args);
 
         /// <summary>
@@ -135,13 +137,13 @@ public void Execute(string command, object[] args) =>
         /// <returns>The class that has information of command</returns>
         public Command FindCommand(string cmd)
         {
-            (MethodInfo method, CommandModule module, var _) = FindCommand(cmd, null);
+            (MethodInfo method, CommandModule module) = FindCommand(cmd, null);
 
             Executor client = this;
             return new Command(ref client, module, method);
         }
 
-        internal (MethodInfo Method, CommandModule Module, object[] Parameters) FindCommand(string command, string[] args)
+        internal (MethodInfo Method, CommandModule Module) FindCommand(string command, string _)
         {
             MethodInfo method = null;
             CommandModule module = null;
@@ -174,20 +176,14 @@ public Command FindCommand(string cmd)
             }
 
             if (method == null || module == null)
-                throw new CommandNotFoundException(new CommandRequest()
-                {
-                    Command = command,
-                    Arguments = args
-                });
-            
-            object[] paras = ConvertParameter(method, args);
+                throw new CommandNotFoundException(command);
 
-            return (method, module, paras.Any() ? paras.ToArray() : null);
+            return (method, module);
         }
 
         internal object[] ConvertParameter(MethodInfo method, string[] args)
         {
-            if (args == null) return Array.Empty<object>();
+            if (args == null) args = Array.Empty<string>();
 
             ParameterInfo[] paras = method.GetParameters();
 

CommandExecutor/CommandExecutor.csproj

@@ -7,7 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DocumentationFile>bin\CommandExecutor.xml</DocumentationFile>
     <!--Assembly Info-->
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <Authors>Lukince</Authors>
     <Company>Lukince</Company>
     <Product>CommandExecutor</Product>

CommandExecutor/Exceptions/CommandNotFoundException.cs

@@ -9,20 +9,20 @@ namespace CommandExecutor.Exceptions
     public class CommandNotFoundException : Exception
     {
         /// <summary>
-        /// Initialize object with <see cref="CommandRequest"/>
+        /// Initialize object with string
         /// </summary>
-        /// <param name="request"></param>
-        public CommandNotFoundException(CommandRequest request): base(GetExceptionMessage(request))
+        /// <param name="request">The name of command.</param>
+        public CommandNotFoundException(string request): base(GetExceptionMessage(request))
         {
-            this.Request = request;
+            this.CommandName = request;
         }
 
         /// <summary>
         /// The request object when exception raised.
         /// </summary>
-        public CommandRequest Request { get; set; }
+        public string CommandName { get; set; }
 
-        private static string GetExceptionMessage(CommandRequest req)
-            => $"Cannot found method name : {req.Command}. Check options if some options set false.";
+        private static string GetExceptionMessage(string req)
+            => $"Cannot found method name : {req}. Check options if some options set false.";
     }
 }

CommandExecutor/Exceptions/ExecuteException.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace CommandExecutor
+{
+    /// <summary>
+    /// A logical exception that occurs during command execution.
+    /// It occurs trying to run command in preparation
+    /// </summary>
+    public class ExecuteException : Exception
+    {
+        /// <summary>
+        /// Initialize object with string
+        /// </summary>
+        /// <param name="message">The exception message</param>
+        public ExecuteException(string message) : base (message) { }
+    }
+}

CommandExecutor/Structures/Command.cs

@@ -54,6 +54,20 @@ internal Command(ref Executor client, CommandModule c, MethodInfo m)
         /// </summary>
         public IEnumerable<Attribute> CustomAttributes => _command.GetCustomAttributes();
 
+        /// <summary>
+        /// The converted objects.
+        /// </summary>
+        /// <value></value>
+        public object[] Arguments { get; private set; } = null;
+        
+        /// <summary>
+        /// The raw string passed.
+        /// </summary>
+        /// <value></value>
+        public string RawArguments { get; private set; } = null;
+        
+        private bool isExeuting;
+        
         private readonly MethodInfo _command;
 
         private readonly CommandAttribute _attribute;
@@ -68,6 +82,10 @@ internal Command(ref Executor client, CommandModule c, MethodInfo m)
         /// <param name="param">The object array that is command parameters</param>
         public void Execute(object[] param)
         {
+            if (isExeuting) throw new ExecuteException("You can't execute again while checking command.");
+            
+            isExeuting = true;
+            
             if (ModuleClass.CheckExecute(this) == false) throw new CommandCheckFailException(this, $"CheckExecute returns false in {ModuleClass.GetType().Name}");
 
             ModuleClass.BeforeExecute();
@@ -79,13 +97,20 @@ public void Execute(object[] param)
             _command.Invoke(ModuleClass, param);
 
             ModuleClass.AfterExecute();
+            
+            isExeuting = false;
         }
 
         /// <summary>
         /// Run command with string which will convert as parameter type array
         /// </summary>
         /// <param name="param">The string for method parameter. parameter will split with space.</param>
-        public void Execute(string param) =>
-            Execute(Client.ConvertParameter(_command, param?.Split(' ')));
+        public void Execute(string param)
+        {
+            RawArguments = param;
+            object[] arg = Client.ConvertParameter(_command, param?.Split(' '));
+            Arguments = arg;
+            Execute(arg);
+        }
     }
 }

CommandExecutor/Structures/CommandRequest.cs

@@ -33,7 +33,7 @@ void Run()
                 IgnoreCase = true,
                 IgnoreExtraArguments = false,
                 GetPrivateMethod = true,
-                IncludeStaticMethod = false
+                IncludeStaticMethod = true
             });
 
             Executor.RegisterCommands<ScopeCommands>();
@@ -44,6 +44,9 @@ void Run()
             Executor.RegisterCommands<SpecialCommands>();
 
             Executor.Execute("ping hello true");
+            
+            //Executor.Execute("ping");
+            
             Executor.Execute("args 3 5 2 asdf");
             Executor.Execute("inf inf this is inf arg test");
             Executor.Execute("nonparam");

Test/Program.cs

@@ -0,0 +1,13 @@
+using CommandExecutor.Attributes;
+using CommandExecutor.Structures;
+
+namespace Test
+{
+    public class TestAttribute : CommandCheckAttribute
+    {
+        public override bool Check(Command cmd)
+        {
+            return true;
+        }
+    }
+}