Implement more methods for DbusManagerImpl

[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..0fc75aeef4890dd4003bf56de27dbbd3c3f0434c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,39 +3,55 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 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.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.StickerPackInvalidException;

+import org.asamk.signal.output.JsonWriter;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;

+import java.util.Map;

 
 

-public class UploadStickerPackCommand implements LocalCommand {
+public class UploadStickerPackCommand implements JsonRpcLocalCommand {

 
     private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
 
 
     private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class);
 

+    @Override
+    public String getName() {
+        return "uploadStickerPack";
+    }
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @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
         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 {
+        var path = new File(ns.getString("path"));
+

         try {
         try {

-            var path = new File(ns.getString("path"));

             var url = m.uploadStickerPack(path);
             var url = m.uploadStickerPack(path);

-            writer.println("{}", url);
-            return 0;
+            if (outputWriter instanceof PlainTextWriter writer) {
+                writer.println("{}", url);
+            } else {
+                final var writer = (JsonWriter) outputWriter;
+                writer.write(Map.of("url", url));
+            }

         } catch (IOException e) {
         } catch (IOException e) {

-            System.err.println("Upload error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage(), e);

         } catch (StickerPackInvalidException e) {
         } catch (StickerPackInvalidException e) {

-            System.err.println("Invalid sticker pack: " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Invalid sticker pack: " + e.getMessage());

         }
     }
 }
         }
     }
 }