Added JSON output to listGroups and allowed json to be activated with -j (#401)

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

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index bc3acbde93b6604f30a3237a8440b20aa6c17f33..f7a491570722cf60dc63553f22e192533d409a1a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -20,6 +20,10 @@ import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.util.Base64;
 
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.whispersystems.util.Base64;
 

+// TODO delete later when "json" variable is removed
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+

 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 


@@ -27,6 +31,9 @@ import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
 
 public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 

+    // TODO delete later when "json" variable is removed
+    final static Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-t", "--timeout")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-t", "--timeout")


@@ -36,15 +43,23 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")
                 .help("Don’t download attachments of received messages.")
                 .action(Arguments.storeTrue());
         subparser.addArgument("--json")

-                .help("Output received messages in json format, one json object per line.")
+                .help("WARNING: This parameter is now deprecated! Please use the \"output\" option instead.\n\nOutput received messages in json format, one json object per line.")

                 .action(Arguments.storeTrue());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         final ObjectMapper jsonProcessor;
                 .action(Arguments.storeTrue());
     }
 
     public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
         final ObjectMapper jsonProcessor;

+
+        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+
+        // TODO delete later when "json" variable is removed

         if (ns.getBoolean("json")) {
         if (ns.getBoolean("json")) {

+            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");
+        }
+
+        if (inJson) {

             jsonProcessor = new ObjectMapper();
             jsonProcessor = new ObjectMapper();

-            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); // disable autodetect
+            jsonProcessor.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);

             jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
         } else {
             jsonProcessor = null;
             jsonProcessor.disable(JsonGenerator.Feature.AUTO_CLOSE_TARGET);
         } else {
             jsonProcessor = null;


@@ -63,7 +78,9 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                     }
                 } else {
                     System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",

-                            messageReceived.getSender(), DateUtils.formatTimestamp(messageReceived.getTimestamp()), messageReceived.getMessage()));
+                            messageReceived.getSender(),
+                            DateUtils.formatTimestamp(messageReceived.getTimestamp()),
+                            messageReceived.getMessage()));

                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                         System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));
                     if (messageReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                         System.out.println("  Id: " + Base64.encodeBytes(messageReceived.getGroupId()));


@@ -78,23 +95,23 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                 }
             });
 
                 }
             });
 

-            dbusconnection.addSigHandler(Signal.ReceiptReceived.class,
-                    receiptReceived -> {
-                        if (jsonProcessor != null) {
-                            JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
-                            ObjectNode result = jsonProcessor.createObjectNode();
-                            result.putPOJO("envelope", envelope);
-                            try {
-                                jsonProcessor.writeValue(System.out, result);
-                                System.out.println();
-                            } catch (IOException e) {
-                                e.printStackTrace();
-                            }
-                        } else {
-                            System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
-                                    receiptReceived.getSender(), DateUtils.formatTimestamp(receiptReceived.getTimestamp())));
-                        }
-                    });
+            dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                if (jsonProcessor != null) {
+                    JsonMessageEnvelope envelope = new JsonMessageEnvelope(receiptReceived);
+                    ObjectNode result = jsonProcessor.createObjectNode();
+                    result.putPOJO("envelope", envelope);
+                    try {
+                        jsonProcessor.writeValue(System.out, result);
+                        System.out.println();
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
+                            receiptReceived.getSender(),
+                            DateUtils.formatTimestamp(receiptReceived.getTimestamp())));
+                }
+            });

 
             dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
                 if (jsonProcessor != null) {
 
             dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
                 if (jsonProcessor != null) {


@@ -109,7 +126,10 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                     }
                 } else {
                     System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",
                     }
                 } else {
                     System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",

-                            syncReceived.getSource(), syncReceived.getDestination(), DateUtils.formatTimestamp(syncReceived.getTimestamp()), syncReceived.getMessage()));
+                            syncReceived.getSource(),
+                            syncReceived.getDestination(),
+                            DateUtils.formatTimestamp(syncReceived.getTimestamp()),
+                            syncReceived.getMessage()));

                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                         System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));
                     if (syncReceived.getGroupId().length > 0) {
                         System.out.println("Group info:");
                         System.out.println("  Id: " + Base64.encodeBytes(syncReceived.getGroupId()));


@@ -141,10 +161,13 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+        boolean inJson = ns.getString("output").equals("json") || ns.getBoolean("json");
+
+        // TODO delete later when "json" variable is removed
+        if (ns.getBoolean("json")) {
+            logger.warn("\"--json\" option has been deprecated, please use \"output\" instead.");

         }
         }

+

         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");
         double timeout = 5;
         if (ns.getDouble("timeout") != null) {
             timeout = ns.getDouble("timeout");


@@ -156,8 +179,14 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {
         }
         boolean ignoreAttachments = ns.getBoolean("ignore_attachments");
         try {

-            final Manager.ReceiveMessageHandler handler = ns.getBoolean("json") ? new JsonReceiveMessageHandler(m) : new ReceiveMessageHandler(m);
-            m.receiveMessages((long) (timeout * 1000), TimeUnit.MILLISECONDS, returnOnTimeout, ignoreAttachments, handler);
+            final Manager.ReceiveMessageHandler handler = inJson
+                    ? new JsonReceiveMessageHandler(m)
+                    : new ReceiveMessageHandler(m);
+            m.receiveMessages((long) (timeout * 1000),
+                    TimeUnit.MILLISECONDS,
+                    returnOnTimeout,
+                    ignoreAttachments,
+                    handler);

             return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());
             return 0;
         } catch (IOException e) {
             System.err.println("Error while receiving messages: " + e.getMessage());