Log a debug message when dropping json rpc response for request without id

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

diff --git a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
index 9d72a6c52ff67d78738578477058066523e429c3..a58392389623f75743dd2b1b19d7813730b010ac 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,7 +3,11 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.OutputWriter;
+import org.asamk.signal.PlainTextWriter;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.StickerPackInvalidException;
 import org.slf4j.Logger;
@@ -16,26 +20,32 @@ public class UploadStickerPackCommand implements LocalCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
 
+    @Override
+    public String getName() {
+        return "uploadStickerPack";
+    }
+
     @Override
     public void attachToSubparser(final Subparser subparser) {
+        subparser.help("Upload a new sticker pack, consisting of a manifest file and the stickers images.");
         subparser.addArgument("path")
                 .help("The path of the manifest.json or a zip file containing the sticker pack you wish to upload.");
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        final var writer = new PlainTextWriterImpl(System.out);
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var writer = (PlainTextWriter) outputWriter;
+        var path = new File(ns.getString("path"));
+
         try {
-            var path = new File(ns.getString("path"));
             var url = m.uploadStickerPack(path);
             writer.println("{}", url);
-            return 0;
         } catch (IOException e) {
-            System.err.println("Upload error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage());
         } catch (StickerPackInvalidException e) {
-            System.err.println("Invalid sticker pack: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Invalid sticker pack: " + e.getMessage());
         }
     }
 }