webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor output writers

Browse source
This commit is contained in:
AsamK 2021-08-08 17:32:55 +02:00
parent f449a242e4
commit 48b2c7ff8a
42 changed files with 327 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/org/asamk/signal/App.java
View file

@ -76,11 +76,10 @@ public class App {
var subparsers = parser.addSubparsers().title("subcommands").dest("command");
final var commands = Commands.getCommands();
for (var entry : commands.entrySet()) {
var subparser = subparsers.addParser(entry.getKey());
entry.getValue().attachToSubparser(subparser);
}
Commands.getCommandSubparserAttachers().forEach((key, value) -> {
var subparser = subparsers.addParser(key);
value.attachToSubparser(subparser);
});
return parser;
}
@ -90,13 +89,17 @@ public class App {
}
public void init() throws CommandException {
var outputType = ns.<OutputType>get("output");
var outputWriter = outputType == OutputType.JSON
? new JsonWriter(System.out)
: new PlainTextWriterImpl(System.out);
var commandKey = ns.getString("command");
var command = Commands.getCommand(commandKey);
var command = Commands.getCommand(commandKey, outputWriter);
if (command == null) {
throw new UserErrorException("Command not implemented!");
}
var outputType = ns.<OutputType>get("output");
if (!command.getSupportedOutputTypes().contains(outputType)) {
throw new UserErrorException("Command doesn't support output type " + outputType.toString());
}