Add CommandException to abstract cli return codes for errors

[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..1ed14e213e1d0eb383874d1778931842d950e105 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -4,6 +4,9 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.PlainTextWriterImpl;
+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;
@@ -23,19 +26,17 @@ public class UploadStickerPackCommand implements LocalCommand {
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         final var writer = new PlainTextWriterImpl(System.out);
+        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: " + e.getMessage());
         } catch (StickerPackInvalidException e) {
-            System.err.println("Invalid sticker pack: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Invalid sticker pack: " + e.getMessage());
         }
     }
 }