Fix formatting

[signal-cli] / src / main / java / cli / Main.java

diff --git a/src/main/java/cli/Main.java b/src/main/java/cli/Main.java
index b1822aafb02ad413e8f3f1bb1ac36c40f9b71768..d314ff0b2fb765b17116e660a3625935e01e0386 100644 (file)
--- a/src/main/java/cli/Main.java
+++ b/src/main/java/cli/Main.java
@@ -161,7 +161,15 @@ public class Main {
     private static Namespace parseArgs(String[] args) {
         ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
                 .defaultHelp(true)
     private static Namespace parseArgs(String[] args) {
         ArgumentParser parser = ArgumentParsers.newArgumentParser("textsecure-cli")
                 .defaultHelp(true)

-                .description("Commandline interface for TextSecure.");
+                .description("Commandline interface for TextSecure.")
+                .version(Manager.PROJECT_NAME + " " + Manager.PROJECT_VERSION);
+
+        parser.addArgument("-u", "--username")
+                .help("Specify your phone number, that will be used for verification.");
+        parser.addArgument("-v", "--version")
+                .help("Show package version.")
+                .action(Arguments.version());
+

         Subparsers subparsers = parser.addSubparsers()
                 .title("subcommands")
                 .dest("command")
         Subparsers subparsers = parser.addSubparsers()
                 .title("subcommands")
                 .dest("command")


@@ -188,12 +196,15 @@ public class Main {
                 .help("Add file as attachment");
 
         Subparser parserReceive = subparsers.addParser("receive");
                 .help("Add file as attachment");
 
         Subparser parserReceive = subparsers.addParser("receive");

-        parser.addArgument("-u", "--username")
-                .required(true)
-                .help("Specify your phone number, that will be used for verification.");

 
         try {
 
         try {

-            return parser.parseArgs(args);
+            Namespace ns = parser.parseArgs(args);
+            if (ns.getString("username") == null) {
+                parser.printUsage();
+                System.err.println("You need to specify a username (phone number)");
+                System.exit(2);
+            }
+            return ns;

         } catch (ArgumentParserException e) {
             parser.handleError(e);
             return null;
         } catch (ArgumentParserException e) {
             parser.handleError(e);
             return null;


@@ -264,7 +275,7 @@ public class Main {
                                 if (attachment.isPointer()) {
                                     final TextSecureAttachmentPointer pointer = attachment.asPointer();
                                     System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));
                                 if (attachment.isPointer()) {
                                     final TextSecureAttachmentPointer pointer = attachment.asPointer();
                                     System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length + (pointer.getRelay().isPresent() ? " Relay: " + pointer.getRelay().get() : ""));

-                                    System.out.println((pointer.getSize().isPresent() ? " Size: " + pointer.getSize().get() : " bytes") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
+                                    System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));

                                     try {
                                         File file = m.retrieveAttachment(pointer);
                                         System.out.println("  Stored plaintext in: " + file);
                                     try {
                                         File file = m.retrieveAttachment(pointer);
                                         System.out.println("  Stored plaintext in: " + file);