Use PlainTextWriter for all cli stdout output

[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 f9f5d95bb15894150bedfa1e3f5b5df750c3a980..9d72a6c52ff67d78738578477058066523e429c3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UploadStickerPackCommand.java
@@ -3,14 +3,19 @@ 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.manager.Manager;
 import org.asamk.signal.manager.StickerPackInvalidException;
 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 {
 
 
 import java.io.File;
 import java.io.IOException;
 
 public class UploadStickerPackCommand implements LocalCommand {
 

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

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("path")
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("path")


@@ -19,17 +24,18 @@ public class UploadStickerPackCommand implements LocalCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {

+        final var writer = new PlainTextWriterImpl(System.out);

         try {
         try {

-            File path = new File(ns.getString("path"));
-            String url = m.uploadStickerPack(path);
-            System.out.println(url);
+            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;
         } catch (StickerPackInvalidException e) {
             System.err.println("Invalid sticker pack: " + e.getMessage());
             return 0;
         } catch (IOException e) {
             System.err.println("Upload error: " + e.getMessage());
             return 3;
         } catch (StickerPackInvalidException e) {
             System.err.println("Invalid sticker pack: " + e.getMessage());

-            return 3;
+            return 1;

         }
     }
 }
         }
     }
 }