mirror of
https://github.com/AsamK/signal-cli
synced 2025-08-29 10:30:38 +00:00
Check if output type is supported by command
This commit is contained in:
parent
c588130491
commit
a2debdb234
6 changed files with 37 additions and 0 deletions
|
@ -91,6 +91,12 @@ public class Cli {
|
||||||
return 1;
|
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");
|
String username = ns.getString("username");
|
||||||
|
|
||||||
final boolean useDbus = ns.getBoolean("dbus");
|
final boolean useDbus = ns.getBoolean("dbus");
|
||||||
|
|
|
@ -2,7 +2,15 @@ package org.asamk.signal.commands;
|
||||||
|
|
||||||
import net.sourceforge.argparse4j.inf.Subparser;
|
import net.sourceforge.argparse4j.inf.Subparser;
|
||||||
|
|
||||||
|
import org.asamk.signal.OutputType;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
public interface Command {
|
public interface Command {
|
||||||
|
|
||||||
void attachToSubparser(Subparser subparser);
|
void attachToSubparser(Subparser subparser);
|
||||||
|
|
||||||
|
default Set<OutputType> getSupportedOutputTypes() {
|
||||||
|
return Set.of(OutputType.PLAIN_TEXT);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
public class DaemonCommand implements MultiLocalCommand {
|
public class DaemonCommand implements MultiLocalCommand {
|
||||||
|
@ -37,6 +38,11 @@ public class DaemonCommand implements MultiLocalCommand {
|
||||||
.action(Arguments.storeTrue());
|
.action(Arguments.storeTrue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<OutputType> getSupportedOutputTypes() {
|
||||||
|
return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int handleCommand(final Namespace ns, final Manager m) {
|
public int handleCommand(final Namespace ns, final Manager m) {
|
||||||
boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
|
boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
|
||||||
|
|
|
@ -14,6 +14,7 @@ import java.io.IOException;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public class GetUserStatusCommand implements LocalCommand {
|
public class GetUserStatusCommand implements LocalCommand {
|
||||||
|
@ -29,6 +30,11 @@ public class GetUserStatusCommand implements LocalCommand {
|
||||||
.action(Arguments.storeTrue());
|
.action(Arguments.storeTrue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<OutputType> getSupportedOutputTypes() {
|
||||||
|
return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int handleCommand(final Namespace ns, final Manager m) {
|
public int handleCommand(final Namespace ns, final Manager m) {
|
||||||
// Setup the json object mapper
|
// Setup the json object mapper
|
||||||
|
|
|
@ -62,6 +62,11 @@ public class ListGroupsCommand implements LocalCommand {
|
||||||
subparser.help("List group information including names, ids, active status, blocked status and members");
|
subparser.help("List group information including names, ids, active status, blocked status and members");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<OutputType> getSupportedOutputTypes() {
|
||||||
|
return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int handleCommand(final Namespace ns, final Manager m) {
|
public int handleCommand(final Namespace ns, final Manager m) {
|
||||||
if (ns.get("output") == OutputType.JSON) {
|
if (ns.get("output") == OutputType.JSON) {
|
||||||
|
|
|
@ -20,6 +20,7 @@ import org.slf4j.LoggerFactory;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Base64;
|
import java.util.Base64;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
|
import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
|
||||||
|
@ -41,6 +42,11 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
|
||||||
.action(Arguments.storeTrue());
|
.action(Arguments.storeTrue());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<OutputType> getSupportedOutputTypes() {
|
||||||
|
return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
|
||||||
|
}
|
||||||
|
|
||||||
public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
|
public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
|
||||||
boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
|
boolean inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue