6 files changed, 272 insertions, 7 deletions

diff --git a/src/cz/crcs/ectester/common/CLITools.java b/src/cz/crcs/ectester/common/cli/CLITools.java
index 57cea64..8f34f62 100644
--- a/src/cz/crcs/ectester/common/CLITools.java
+++ b/src/cz/crcs/ectester/common/cli/CLITools.java
@@ -1,11 +1,14 @@
-package cz.crcs.ectester.common;
+package cz.crcs.ectester.common.cli;
 
 import cz.crcs.ectester.common.ec.EC_Category;
 import cz.crcs.ectester.common.ec.EC_Data;
 import cz.crcs.ectester.data.EC_Store;
+import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.Map;
 
 /**
@@ -22,6 +25,37 @@ public class CLITools {
         help.printHelp(prog, header, options, footer, usage);
     }
 
+    private static void help(HelpFormatter help, PrintWriter pw, CommandLineParser cli, int depth) {
+        if (cli instanceof TreeParser) {
+            TreeParser tp = (TreeParser) cli;
+            tp.getParsers().forEach((key, value) -> {
+                help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, String.format("%" + String.valueOf(depth) + "s" + key + ":", " "));
+                help.printOptions(pw, HelpFormatter.DEFAULT_WIDTH, value.getOptions(), HelpFormatter.DEFAULT_LEFT_PAD + depth, HelpFormatter.DEFAULT_DESC_PAD);
+                pw.println();
+                CLITools.help(help, pw, value.getParser(), depth + 1);
+            });
+        }
+    }
+
+    /**
+     * Print tree help.
+     */
+    public static void help(String prog, String header, Options baseOpts, TreeParser baseParser, String footer, boolean usage) {
+        HelpFormatter help = new HelpFormatter();
+        help.setOptionComparator(null);
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        if (usage) {
+            help.printUsage(pw, HelpFormatter.DEFAULT_WIDTH, prog, baseOpts);
+        }
+        help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, header);
+        help.printOptions(pw, HelpFormatter.DEFAULT_WIDTH, baseOpts, HelpFormatter.DEFAULT_LEFT_PAD, HelpFormatter.DEFAULT_DESC_PAD);
+        pw.println();
+        help(help, pw, baseParser, 1);
+        help.printWrapped(pw, HelpFormatter.DEFAULT_WIDTH, footer);
+        System.out.println(sw.toString());
+    }
+
     /**
      * Print version info.
      */
diff --git a/src/cz/crcs/ectester/common/cli/ParserOptions.java b/src/cz/crcs/ectester/common/cli/ParserOptions.java
new file mode 100644
index 0000000..4216ce3
--- /dev/null
+++ b/src/cz/crcs/ectester/common/cli/ParserOptions.java
@@ -0,0 +1,25 @@
+package cz.crcs.ectester.common.cli;
+
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.Options;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class ParserOptions {
+    private CommandLineParser parser;
+    private Options options;
+
+    public ParserOptions(CommandLineParser parser, Options options) {
+        this.parser = parser;
+        this.options = options;
+    }
+
+    public CommandLineParser getParser() {
+        return parser;
+    }
+
+    public Options getOptions() {
+        return options;
+    }
+}
diff --git a/src/cz/crcs/ectester/common/cli/TreeCommandLine.java b/src/cz/crcs/ectester/common/cli/TreeCommandLine.java
new file mode 100644
index 0000000..ef6079e
--- /dev/null
+++ b/src/cz/crcs/ectester/common/cli/TreeCommandLine.java
@@ -0,0 +1,134 @@
+package cz.crcs.ectester.common.cli;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.function.BiFunction;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class TreeCommandLine extends CommandLine {
+    private String name = "";
+    private TreeCommandLine next;
+    private CommandLine cli;
+
+    public TreeCommandLine(CommandLine cli, TreeCommandLine next) {
+        this.cli = cli;
+        this.next = next;
+    }
+
+    public TreeCommandLine(String name, CommandLine cli, TreeCommandLine next) {
+        this(cli, next);
+        this.name = name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getNextName() {
+        if (next != null) {
+            return next.getName();
+        }
+        return null;
+    }
+
+    public TreeCommandLine getNext() {
+        return next;
+    }
+
+    public CommandLine getThis() {
+        return cli;
+    }
+
+    private <T> T getOption(String opt, BiFunction<CommandLine, String, T> getter, T defaultValue) {
+        if (opt.contains(".")) {
+            String[] parts = opt.split(".", 2);
+            if (next != null && parts[0].equals(next.getName())) {
+                return getter.apply(next, parts[1]);
+            }
+            return defaultValue;
+        }
+        return getter.apply(cli, opt);
+    }
+
+    @Override
+    public boolean hasOption(String opt) {
+        return getOption(opt, CommandLine::hasOption, false);
+    }
+
+    @Override
+    public boolean hasOption(char opt) {
+        return cli.hasOption(opt);
+    }
+
+    @Override
+    public Object getParsedOptionValue(String opt) throws ParseException {
+        if (opt.contains(".")) {
+            String[] parts = opt.split(".", 2);
+            if (next != null && parts[0].equals(next.getName())) {
+                return next.getParsedOptionValue(parts[1]);
+            }
+            return null;
+        }
+        return cli.getParsedOptionValue(opt);
+    }
+
+    @Override
+    public Object getOptionObject(char opt) {
+        return cli.getOptionObject(opt);
+    }
+
+    @Override
+    public String getOptionValue(String opt) {
+        return getOption(opt, CommandLine::getOptionValue, null);
+    }
+
+    @Override
+    public String getOptionValue(char opt) {
+        return cli.getOptionValue(opt);
+    }
+
+    @Override
+    public String[] getOptionValues(String opt) {
+        return getOption(opt, CommandLine::getOptionValues, null);
+    }
+
+    @Override
+    public String[] getOptionValues(char opt) {
+        return cli.getOptionValues(opt);
+    }
+
+    @Override
+    public String getOptionValue(String opt, String defaultValue) {
+        return getOption(opt, CommandLine::getOptionValue, defaultValue);
+    }
+
+    @Override
+    public String getOptionValue(char opt, String defaultValue) {
+        return cli.getOptionValue(opt, defaultValue);
+    }
+
+    @Override
+    public Properties getOptionProperties(String opt) {
+        return getOption(opt, CommandLine::getOptionProperties, new Properties());
+    }
+
+    @Override
+    public Iterator<Option> iterator() {
+        return cli.iterator();
+    }
+
+    @Override
+    public Option[] getOptions() {
+        return cli.getOptions();
+    }
+}
diff --git a/src/cz/crcs/ectester/common/cli/TreeParser.java b/src/cz/crcs/ectester/common/cli/TreeParser.java
new file mode 100644
index 0000000..079760e
--- /dev/null
+++ b/src/cz/crcs/ectester/common/cli/TreeParser.java
@@ -0,0 +1,75 @@
+package cz.crcs.ectester.common.cli;
+
+import org.apache.commons.cli.*;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * @author Jan Jancar johny@neuromancer.sk
+ */
+public class TreeParser implements CommandLineParser {
+    private Map<String, ParserOptions> parsers;
+    private boolean required;
+
+    public TreeParser(Map<String, ParserOptions> parsers, boolean required) {
+        this.parsers = parsers;
+        this.required = required;
+    }
+
+    public Map<String, ParserOptions> getParsers() {
+        return Collections.unmodifiableMap(parsers);
+    }
+
+    public boolean isRequired() {
+        return required;
+    }
+
+    @Override
+    public CommandLine parse(Options options, String[] arguments) throws ParseException {
+        return this.parse(options, arguments, null);
+    }
+
+    public CommandLine parse(Options options, String[] arguments, Properties properties) throws ParseException {
+        return this.parse(options, arguments, properties, false);
+    }
+
+    @Override
+    public CommandLine parse(Options options, String[] arguments, boolean stopAtNonOption) throws ParseException {
+        return this.parse(options, arguments, null, stopAtNonOption);
+    }
+
+    public CommandLine parse(Options options, String[] arguments, Properties properties, boolean stopAtNonOption) throws ParseException {
+        DefaultParser thisParser = new DefaultParser();
+        CommandLine cli = thisParser.parse(options, arguments, properties, true);
+
+        CommandLine subCli = null;
+        String[] args = cli.getArgs();
+        String sub = null;
+        if (args.length != 0) {
+            sub = args[0];
+            ParserOptions subparser = parsers.get(sub);
+            if (subparser != null) {
+                String[] remainingArgs = new String[args.length - 1];
+                System.arraycopy(args, 1, remainingArgs, 0, args.length - 1);
+                subCli = subparser.getParser().parse(subparser.getOptions(), remainingArgs, true);
+            }
+        } else {
+            if (required) {
+                throw new MissingOptionException(new ArrayList(parsers.keySet()));
+            }
+        }
+        if (subCli instanceof TreeCommandLine) {
+            TreeCommandLine subTreeCli = (TreeCommandLine) subCli;
+            subTreeCli.setName(sub);
+            return new TreeCommandLine(cli, subTreeCli);
+        } else if (subCli != null) {
+            TreeCommandLine subTreeCli = new TreeCommandLine(sub, subCli, null);
+            return new TreeCommandLine(cli, subTreeCli);
+        } else {
+            return new TreeCommandLine(cli, null);
+        }
+    }
+}
diff --git a/src/cz/crcs/ectester/reader/ECTesterReader.java b/src/cz/crcs/ectester/reader/ECTesterReader.java
index c51430d..2c57107 100644
--- a/src/cz/crcs/ectester/reader/ECTesterReader.java
+++ b/src/cz/crcs/ectester/reader/ECTesterReader.java
@@ -23,10 +23,8 @@ package cz.crcs.ectester.reader;
 
 import cz.crcs.ectester.applet.ECTesterApplet;
 import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.common.CLITools;
+import cz.crcs.ectester.common.cli.CLITools;
 import cz.crcs.ectester.common.Util;
-import cz.crcs.ectester.common.ec.EC_Category;
-import cz.crcs.ectester.common.ec.EC_Data;
 import cz.crcs.ectester.common.ec.EC_Params;
 import cz.crcs.ectester.common.output.OutputLogger;
 import cz.crcs.ectester.common.test.TestException;
diff --git a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
index e8998ff..99253cc 100644
--- a/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/src/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -1,8 +1,7 @@
 package cz.crcs.ectester.standalone;
 
-import cz.crcs.ectester.applet.EC_Consts;
-import cz.crcs.ectester.common.CLITools;
-import cz.crcs.ectester.common.ec.EC_Curve;
+import cz.crcs.ectester.common.cli.CLITools;
+import cz.crcs.ectester.common.test.Result;
 import cz.crcs.ectester.data.EC_Store;
 import cz.crcs.ectester.standalone.consts.KeyPairGeneratorIdent;
 import cz.crcs.ectester.standalone.libs.BouncyCastleLib;