Added base64 encoded attachment support (#966)

[signal-cli] / src / main / java / org / asamk / signal / Main.java

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index eaa85c128eff4357c2dbc8a1e6eaf36f7d085d7a..14bdc4c92ded097bb296eeaf4e1b493fd0971f49 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -1,5 +1,5 @@
 /*
 /*

-  Copyright (C) 2015-2021 AsamK and contributors
+  Copyright (C) 2015-2022 AsamK and contributors

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by


@@ -17,6 +17,7 @@
 package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;
 package org.asamk.signal;
 
 import net.sourceforge.argparse4j.ArgumentParsers;

+import net.sourceforge.argparse4j.DefaultSettings;

 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.ArgumentParserException;
 import net.sourceforge.argparse4j.inf.Namespace;


@@ -26,11 +27,12 @@ import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.commands.exceptions.UntrustedKeyErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;

-import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.ManagerLogger;

 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import org.asamk.signal.util.SecurityProvider;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 

+import java.io.File;

 import java.security.Security;
 
 public class Main {
 import java.security.Security;
 
 public class Main {


@@ -41,8 +43,11 @@ public class Main {
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized
         installSecurityProviderWorkaround();
 
         // Configuring the logger needs to happen before any logger is initialized

-        final var isVerbose = isVerbose(args);
-        configureLogging(isVerbose);
+
+        final var nsLog = parseArgs(args);
+        final var verboseLevel = nsLog == null ? 0 : nsLog.getInt("verbose");
+        final var logFile = nsLog == null ? null : nsLog.<File>get("log-file");
+        configureLogging(verboseLevel, logFile);

 
         var parser = App.buildArgumentParser();
 
 
         var parser = App.buildArgumentParser();
 


@@ -53,7 +58,7 @@ public class Main {
             new App(ns).init();
         } catch (CommandException e) {
             System.err.println(e.getMessage());
             new App(ns).init();
         } catch (CommandException e) {
             System.err.println(e.getMessage());

-            if (isVerbose && e.getCause() != null) {
+            if (verboseLevel > 0 && e.getCause() != null) {

                 e.getCause().printStackTrace();
             }
             status = getStatusForError(e);
                 e.getCause().printStackTrace();
             }
             status = getStatusForError(e);


@@ -70,37 +75,32 @@ public class Main {
         Security.addProvider(new BouncyCastleProvider());
     }
 
         Security.addProvider(new BouncyCastleProvider());
     }
 

-    private static boolean isVerbose(String[] args) {
-        var parser = ArgumentParsers.newFor("signal-cli").build().defaultHelp(false);
-        parser.addArgument("--verbose").action(Arguments.storeTrue());
+    private static Namespace parseArgs(String[] args) {
+        var parser = ArgumentParsers.newFor("signal-cli", DefaultSettings.VERSION_0_9_0_DEFAULT_SETTINGS)
+                .includeArgumentNamesAsKeysInResult(true)
+                .build()
+                .defaultHelp(false);
+        parser.addArgument("--verbose").action(Arguments.count());
+        parser.addArgument("--log-file").type(File.class);

 
 

-        Namespace ns;

         try {
         try {

-            ns = parser.parseKnownArgs(args, null);
+            return parser.parseKnownArgs(args, null);

         } catch (ArgumentParserException e) {
         } catch (ArgumentParserException e) {

-            return false;
+            return null;

         }
         }

-
-        return Boolean.TRUE.equals(ns.getBoolean("verbose"));

     }
 
     }
 

-    private static void configureLogging(final boolean verbose) {
-        if (verbose) {
-            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "debug");
-            System.setProperty("org.slf4j.simpleLogger.showThreadName", "true");
-            System.setProperty("org.slf4j.simpleLogger.showShortLogName", "false");
-            System.setProperty("org.slf4j.simpleLogger.showDateTime", "true");
-            System.setProperty("org.slf4j.simpleLogger.dateTimeFormat", "yyyy-MM-dd'T'HH:mm:ss.SSSXX");
-            Manager.initLogger();
-        } else {
-            System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "info");
-            System.setProperty("org.slf4j.simpleLogger.showThreadName", "false");
-            System.setProperty("org.slf4j.simpleLogger.showShortLogName", "true");
-            System.setProperty("org.slf4j.simpleLogger.showDateTime", "false");
+    private static void configureLogging(final int verboseLevel, final File logFile) {
+        LogConfigurator.setVerboseLevel(verboseLevel);
+        LogConfigurator.setLogFile(logFile);
+
+        if (verboseLevel > 0) {
+            java.util.logging.Logger.getLogger("")
+                    .setLevel(verboseLevel > 2 ? java.util.logging.Level.FINEST : java.util.logging.Level.INFO);
+            ManagerLogger.initLogger();

         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
         }
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();

-        // java.util.logging.Logger.getLogger("").setLevel(java.util.logging.Level.FINEST);

     }
 
     private static int getStatusForError(final CommandException e) {
     }
 
     private static int getStatusForError(final CommandException e) {