Check if output type is supported by command

[signal-cli] / src / main / java / org / asamk / signal / Cli.java

diff --git a/src/main/java/org/asamk/signal/Cli.java b/src/main/java/org/asamk/signal/Cli.java
index 4579f3f5ee272cdbcc54a73f5002556cdc55efd4..f8e2e9ab63eafd95a2148f53da3822d137565d21 100644 (file)
--- a/src/main/java/org/asamk/signal/Cli.java
+++ b/src/main/java/org/asamk/signal/Cli.java
@@ -1,6 +1,12 @@
 package org.asamk.signal;
 
+import net.sourceforge.argparse4j.ArgumentParsers;
+import net.sourceforge.argparse4j.impl.Arguments;
+import net.sourceforge.argparse4j.inf.ArgumentParser;
+import net.sourceforge.argparse4j.inf.MutuallyExclusiveGroup;
 import net.sourceforge.argparse4j.inf.Namespace;
+import net.sourceforge.argparse4j.inf.Subparser;
+import net.sourceforge.argparse4j.inf.Subparsers;
 
 import org.asamk.Signal;
 import org.asamk.signal.commands.Command;
@@ -27,31 +33,77 @@ import org.whispersystems.signalservice.internal.configuration.SignalServiceConf
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class Cli {
 
-    private final static Logger logger = LoggerFactory.getLogger(Main.class);
+    private final static Logger logger = LoggerFactory.getLogger(Cli.class);
 
     private final Namespace ns;
 
+    static ArgumentParser buildArgumentParser() {
+        ArgumentParser parser = ArgumentParsers.newFor("signal-cli")
+                .build()
+                .defaultHelp(true)
+                .description("Commandline interface for Signal.")
+                .version(BaseConfig.PROJECT_NAME + " " + BaseConfig.PROJECT_VERSION);
+
+        parser.addArgument("-v", "--version").help("Show package version.").action(Arguments.version());
+        parser.addArgument("--verbose")
+                .help("Raise log level and include lib signal logs.")
+                .action(Arguments.storeTrue());
+        parser.addArgument("--config")
+                .help("Set the path, where to store the config (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).");
+
+        parser.addArgument("-u", "--username").help("Specify your phone number, that will be used for verification.");
+
+        MutuallyExclusiveGroup mut = parser.addMutuallyExclusiveGroup();
+        mut.addArgument("--dbus").help("Make request via user dbus.").action(Arguments.storeTrue());
+        mut.addArgument("--dbus-system").help("Make request via system dbus.").action(Arguments.storeTrue());
+
+        parser.addArgument("-o", "--output")
+                .help("Choose to output in plain text or JSON")
+                .type(Arguments.enumStringType(OutputType.class))
+                .setDefault(OutputType.PLAIN_TEXT);
+
+        Subparsers subparsers = parser.addSubparsers().title("subcommands").dest("command");
+
+        final Map<String, Command> commands = Commands.getCommands();
+        for (Map.Entry<String, Command> entry : commands.entrySet()) {
+            Subparser subparser = subparsers.addParser(entry.getKey());
+            entry.getValue().attachToSubparser(subparser);
+        }
+
+        return parser;
+    }
+
     public Cli(final Namespace ns) {
         this.ns = ns;
     }
 
     public int init() {
-        Command command = getCommand();
+        String commandKey = ns.getString("command");
+        Command command = Commands.getCommand(commandKey);
         if (command == null) {
             logger.error("Command not implemented!");
             return 1;
         }
 
+        OutputType outputType = ns.get("output");
+        if (!command.getSupportedOutputTypes().contains(outputType)) {
+            logger.error("Command doesn't support output type {}", outputType.toString());
+            return 1;
+        }
+
         String username = ns.getString("username");
 
-        if (ns.getBoolean("dbus") || ns.getBoolean("dbus_system")) {
+        final boolean useDbus = ns.getBoolean("dbus");
+        final boolean useDbusSystem = ns.getBoolean("dbus_system");
+        if (useDbus || useDbusSystem) {
             // If username is null, it will connect to the default object path
-            return initDbusClient(command, username, ns.getBoolean("dbus_system"));
+            return initDbusClient(command, username, useDbusSystem);
         }
 
         final File dataPath;
@@ -208,11 +260,6 @@ public class Cli {
         return manager;
     }
 
-    private Command getCommand() {
-        String commandKey = ns.getString("command");
-        return Commands.getCommand(commandKey);
-    }
-
     private int initDbusClient(final Command command, final String username, final boolean systemBus) {
         try {
             DBusConnection.DBusBusType busType;