From 8e8eed7b061f1ed47cf9e30abb5e29ee08e3a3dc Mon Sep 17 00:00:00 2001 From: AsamK Date: Thu, 13 May 2021 18:06:57 +0200 Subject: [PATCH] Update argparse4j --- build.gradle.kts | 2 +- src/main/java/org/asamk/signal/App.java | 9 ++++++--- .../java/org/asamk/signal/commands/DaemonCommand.java | 4 ++-- .../java/org/asamk/signal/commands/ReceiveCommand.java | 2 +- .../org/asamk/signal/commands/RemoteDeleteCommand.java | 2 +- src/main/java/org/asamk/signal/commands/SendCommand.java | 2 +- .../org/asamk/signal/commands/SendReactionCommand.java | 4 ++-- .../java/org/asamk/signal/commands/TrustCommand.java | 4 ++-- .../org/asamk/signal/commands/UnregisterCommand.java | 2 +- .../org/asamk/signal/commands/UpdateProfileCommand.java | 8 ++++---- 10 files changed, 21 insertions(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3ad2c67b..70f2a2b4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ repositories { dependencies { implementation("org.bouncycastle:bcprov-jdk15on:1.68") - implementation("net.sourceforge.argparse4j:argparse4j:0.8.1") + implementation("net.sourceforge.argparse4j:argparse4j:0.9.0") implementation("com.github.hypfvieh:dbus-java:3.3.0") implementation("org.slf4j:slf4j-simple:1.7.30") implementation(project(":lib")) diff --git a/src/main/java/org/asamk/signal/App.java b/src/main/java/org/asamk/signal/App.java index 521e453a..54c475b1 100644 --- a/src/main/java/org/asamk/signal/App.java +++ b/src/main/java/org/asamk/signal/App.java @@ -35,6 +35,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import static net.sourceforge.argparse4j.DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS; + public class App { private final static Logger logger = LoggerFactory.getLogger(App.class); @@ -42,7 +44,8 @@ public class App { private final Namespace ns; static ArgumentParser buildArgumentParser() { - var parser = ArgumentParsers.newFor("signal-cli") + var parser = ArgumentParsers.newFor("signal-cli", VERSION_0_9_0_DEFAULT_SETTINGS) + .includeArgumentNamesAsKeysInResult(true) .build() .defaultHelp(true) .description("Commandline interface for Signal.") @@ -101,7 +104,7 @@ public class App { var username = ns.getString("username"); final var useDbus = ns.getBoolean("dbus"); - final var useDbusSystem = ns.getBoolean("dbus_system"); + final var useDbusSystem = ns.getBoolean("dbus-system"); if (useDbus || useDbusSystem) { // If username is null, it will connect to the default object path initDbusClient(command, username, useDbusSystem); @@ -116,7 +119,7 @@ public class App { dataPath = getDefaultDataPath(); } - final var serviceEnvironmentCli = ns.get("service_environment"); + final var serviceEnvironmentCli = ns.get("service-environment"); final var serviceEnvironment = serviceEnvironmentCli == ServiceEnvironmentCli.LIVE ? ServiceEnvironment.LIVE : ServiceEnvironment.SANDBOX; diff --git a/src/main/java/org/asamk/signal/commands/DaemonCommand.java b/src/main/java/org/asamk/signal/commands/DaemonCommand.java index 8d26e452..f54f3bf6 100644 --- a/src/main/java/org/asamk/signal/commands/DaemonCommand.java +++ b/src/main/java/org/asamk/signal/commands/DaemonCommand.java @@ -54,7 +54,7 @@ public class DaemonCommand implements MultiLocalCommand { logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead."); } - boolean ignoreAttachments = ns.getBoolean("ignore_attachments"); + boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); DBusConnection.DBusBusType busType; if (ns.getBoolean("system")) { @@ -88,7 +88,7 @@ public class DaemonCommand implements MultiLocalCommand { logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead."); } - boolean ignoreAttachments = ns.getBoolean("ignore_attachments"); + boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); DBusConnection.DBusBusType busType; if (ns.getBoolean("system")) { diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java index f3f77347..47f9aa84 100644 --- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java +++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java @@ -155,7 +155,7 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand { returnOnTimeout = false; timeout = 3600; } - boolean ignoreAttachments = ns.getBoolean("ignore_attachments"); + boolean ignoreAttachments = ns.getBoolean("ignore-attachments"); try { final var handler = inJson ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m); m.receiveMessages((long) (timeout * 1000), diff --git a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java index 793b362a..8efd581b 100644 --- a/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java +++ b/src/main/java/org/asamk/signal/commands/RemoteDeleteCommand.java @@ -41,7 +41,7 @@ public class RemoteDeleteCommand implements DbusCommand { throw new UserErrorException("You cannot specify recipients by phone number and groups at the same time"); } - final long targetTimestamp = ns.getLong("target_timestamp"); + final long targetTimestamp = ns.getLong("target-timestamp"); final var writer = new PlainTextWriterImpl(System.out); diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java index 3c4ccb77..312ec802 100644 --- a/src/main/java/org/asamk/signal/commands/SendCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendCommand.java @@ -47,7 +47,7 @@ public class SendCommand implements DbusCommand { final List recipients = ns.getList("recipient"); final var isEndSession = ns.getBoolean("endsession"); final var groupIdString = ns.getString("group"); - final var isNoteToSelf = ns.getBoolean("note_to_self"); + final var isNoteToSelf = ns.getBoolean("note-to-self"); final var noRecipients = recipients == null || recipients.isEmpty(); if ((noRecipients && isEndSession) || (noRecipients && groupIdString == null && !isNoteToSelf)) { diff --git a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java index f610e81b..44286acb 100644 --- a/src/main/java/org/asamk/signal/commands/SendReactionCommand.java +++ b/src/main/java/org/asamk/signal/commands/SendReactionCommand.java @@ -51,8 +51,8 @@ public class SendReactionCommand implements DbusCommand { final var emoji = ns.getString("emoji"); final boolean isRemove = ns.getBoolean("remove"); - final var targetAuthor = ns.getString("target_author"); - final long targetTimestamp = ns.getLong("target_timestamp"); + final var targetAuthor = ns.getString("target-author"); + final long targetTimestamp = ns.getLong("target-timestamp"); final var writer = new PlainTextWriterImpl(System.out); diff --git a/src/main/java/org/asamk/signal/commands/TrustCommand.java b/src/main/java/org/asamk/signal/commands/TrustCommand.java index 00371b59..d6debf86 100644 --- a/src/main/java/org/asamk/signal/commands/TrustCommand.java +++ b/src/main/java/org/asamk/signal/commands/TrustCommand.java @@ -28,7 +28,7 @@ public class TrustCommand implements LocalCommand { @Override public void handleCommand(final Namespace ns, final Manager m) throws CommandException { var number = ns.getString("number"); - if (ns.getBoolean("trust_all_known_keys")) { + if (ns.getBoolean("trust-all-known-keys")) { boolean res; try { res = m.trustIdentityAllKeys(number); @@ -39,7 +39,7 @@ public class TrustCommand implements LocalCommand { throw new UserErrorException("Failed to set the trust for this number, make sure the number is correct."); } } else { - var safetyNumber = ns.getString("verified_safety_number"); + var safetyNumber = ns.getString("verified-safety-number"); if (safetyNumber != null) { safetyNumber = safetyNumber.replaceAll(" ", ""); if (safetyNumber.length() == 66) { diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java index 72df842e..d6d27e28 100644 --- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java @@ -23,7 +23,7 @@ public class UnregisterCommand implements LocalCommand { @Override public void handleCommand(final Namespace ns, final Manager m) throws CommandException { try { - if (ns.getBoolean("delete_account")) { + if (ns.getBoolean("delete-account")) { m.deleteAccount(); } else { m.unregister(); diff --git a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java index ce578f27..c2712adb 100644 --- a/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java +++ b/src/main/java/org/asamk/signal/commands/UpdateProfileCommand.java @@ -30,12 +30,12 @@ public class UpdateProfileCommand implements LocalCommand { @Override public void handleCommand(final Namespace ns, final Manager m) throws CommandException { - var givenName = ns.getString("given_name"); - var familyName = ns.getString("family_name"); + var givenName = ns.getString("given-name"); + var familyName = ns.getString("family-name"); var about = ns.getString("about"); - var aboutEmoji = ns.getString("about_emoji"); + var aboutEmoji = ns.getString("about-emoji"); var avatarPath = ns.getString("avatar"); - boolean removeAvatar = ns.getBoolean("remove_avatar"); + boolean removeAvatar = ns.getBoolean("remove-avatar"); Optional avatarFile = removeAvatar ? Optional.absent() -- 2.50.1