Add method to find possible command children to CommandInputParser

Author: ZeroMemes

src/main/java/clientapi/command/Command.java

@@ -93,7 +93,7 @@ private void setup(String[] headers, String description) {
 
     @Override
     public final void execute(ExecutionContext context, String[] arguments) throws CommandException {
-        Optional<ChildCommand> sub = CommandInputParser.INSTANCE.findChild(this, arguments);
+        Optional<ChildCommand> sub = CommandInputParser.INSTANCE.findChild(this, arguments, true);
         if (!sub.isPresent())
             throw new UnknownSubCommandException(this, arguments);
 

src/main/java/clientapi/command/executor/parser/CommandInputParser.java

@@ -4,11 +4,10 @@
 import clientapi.command.Command;
 import clientapi.util.ClientAPIUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Used to parse raw text into the individual arguments that will be used for execution
@@ -53,9 +52,33 @@ public final Optional<ParsedCommandInput> parseCommandInput(String raw) {
      *
      * @param command The command
      * @param arguments The arguments
+     * @param strictArgs Whether or not non-header children have argument length checked
      * @return The child command if one that matches the arguments is found
      */
-    public final Optional<ChildCommand> findChild(Command command, String[] arguments) {
+    public final Optional<ChildCommand> findChild(Command command, String[] arguments, boolean strictArgs) {
+        List<ChildCommand> children = findPossibleChildren(command, arguments, strictArgs);
+        switch (children.size()) {
+            case 0: // There were no matches
+                return Optional.empty();
+            case 1: // There was a match by child command header
+                return Optional.of(children.get(0));
+            default: // There was a match based on argument length if strictArgs is true
+                return strictArgs
+                        ? Optional.of(children.get(0))
+                        // If argument count wasn't checked, find the closest argument length
+                        : children.stream().min(Comparator.comparingInt(c -> Math.abs(c.getHeaders().length - arguments.length)));
+        }
+    }
+
+    /**
+     * Returns the possible target children given the input args
+     *
+     * @param command The command
+     * @param arguments The arguments
+     * @param strictArgs Whether or not non-header children have argument length checked
+     * @return The possible children
+     */
+    public final List<ChildCommand> findPossibleChildren(Command command, String[] arguments, boolean strictArgs) {
         String header = arguments.length == 0 ? null : arguments[0];
 
         // Find the command by the header defined by the first argument
@@ -64,11 +87,11 @@ public final Optional<ChildCommand> findChild(Command command, String[] argument
                 .findFirst().orElse(null);
 
         if (child != null)
-            return Optional.of(child);
+            return Collections.singletonList(child);
 
         // Find the command by the length of the arguments
         return command.getChildren().stream()
-                .filter(c -> c.getHeaders().length == 0 && arguments.length == c.getArguments().size())
-                .findFirst();
+                .filter(c -> c.getHeaders().length == 0 && (!strictArgs || arguments.length == c.getArguments().size()))
+                .collect(Collectors.toList());
     }
 }