X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/221d937eecca5c9b09a3bee7df812203b9927a56..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 1ed14e21..993e37c4 100644 --- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java +++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java @@ -3,7 +3,8 @@ 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; @@ -18,23 +19,28 @@ import java.io.IOException; public class UploadStickerPackCommand implements LocalCommand { private final static Logger logger = LoggerFactory.getLogger(UploadStickerPackCommand.class); + private final OutputWriter outputWriter; - @Override - public void attachToSubparser(final Subparser subparser) { + 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 void handleCommand(final Namespace ns, final Manager m) throws CommandException { - final var writer = new PlainTextWriterImpl(System.out); + final var writer = (PlainTextWriter) outputWriter; var path = new File(ns.getString("path")); try { var url = m.uploadStickerPack(path); writer.println("{}", url); } catch (IOException e) { - throw new IOErrorException("Upload error: " + e.getMessage()); + throw new IOErrorException("Upload error (maybe image size too large):" + e.getMessage()); } catch (StickerPackInvalidException e) { throw new UserErrorException("Invalid sticker pack: " + e.getMessage()); }