X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/22f19c406779893d08675c2d06d2b7708cc3f2a8..28f735741a26c571da59323f0faceee95b055e3b:/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 f9f5d95b..993e37c4 100644
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,33 +3,46 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
+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;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 
 public class UploadStickerPackCommand implements LocalCommand {
 
-    @Override
-    public void attachToSubparser(final Subparser subparser) {
+    private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
+    private final OutputWriter outputWriter;
+
+    public UploadStickerPackCommand(final OutputWriter outputWriter) {
+        this.outputWriter = outputWriter;
+    }
+
+    public static 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) {
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+        final var writer = (PlainTextWriter) outputWriter;
+        var path = new File(ns.getString("path"));
+
         try {
-            File path = new File(ns.getString("path"));
-            String url = m.uploadStickerPack(path);
-            System.out.println(url);
-            return 0;
+            var url = m.uploadStickerPack(path);
+            writer.println("{}", url);
         } 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 3;
+            throw new UserErrorException("Invalid sticker pack: " + e.getMessage());
         }
     }
 }