nik/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli.git synced 2026-05-26 14:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cli default values

Browse Source
This commit is contained in:
AsamK 2026-05-24 00:51:12 +02:00
parent 46c61c5aac
commit 9e3585dcce
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/asamk/signal/App.java
View File

@ -60,7 +60,7 @@ public class App {
parser.addArgument("-v", "--verbose") parser.addArgument("-v", "--verbose")
.help("Raise log level and include lib signal logs. Specify multiple times for even more logs.") .help("Raise log level and include lib signal logs. Specify multiple times for even more logs.")
.action(Arguments.count()) .action(Arguments.count())
.setDefault(cfg.verbose()); .setDefault(cfg.verbose() == null ? 0 : cfg.verbose());
parser.addArgument("--log-file") parser.addArgument("--log-file")
.type(File.class) .type(File.class)
.help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.") .help("Write log output to the given file. If --verbose is also given, the detailed logs will only be written to the log file.")
@ -68,7 +68,7 @@ public class App {
parser.addArgument("--scrub-log") parser.addArgument("--scrub-log")
.action(Arguments.storeTrue()) .action(Arguments.storeTrue())
.help("Scrub possibly sensitive information from the log, like phone numbers and UUIDs.") .help("Scrub possibly sensitive information from the log, like phone numbers and UUIDs.")
.setDefault(cfg.scrubLog()); .setDefault(cfg.scrubLog() == null ? false : cfg.scrubLog());
parser.addArgument("-d", "--data-dir", "-c", "--config") parser.addArgument("-d", "--data-dir", "-c", "--config")
.help("Set the path where to store data (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).") .help("Set the path where to store data (Default: $XDG_DATA_HOME/signal-cli , $HOME/.local/share/signal-cli).")
.setDefault(cfg.dataDir()); .setDefault(cfg.dataDir());
@ -81,12 +81,12 @@ public class App {
.dest("global-dbus") .dest("global-dbus")
.help("Make request via user dbus.") .help("Make request via user dbus.")
.action(Arguments.storeTrue()) .action(Arguments.storeTrue())
.setDefault(cfg.dbus()); .setDefault(cfg.dbus() == null ? false : cfg.dbus());
mut.addArgument("--dbus-system") mut.addArgument("--dbus-system")
.dest("global-dbus-system") .dest("global-dbus-system")
.help("Make request via system dbus.") .help("Make request via system dbus.")
.action(Arguments.storeTrue()) .action(Arguments.storeTrue())
.setDefault(cfg.dbusSystem()); .setDefault(cfg.dbusSystem() == null ? false : cfg.dbusSystem());
parser.addArgument("--bus-name") parser.addArgument("--bus-name")
.dest("global-bus-name") .dest("global-bus-name")
.setDefault(cfg.busName() != null ? cfg.busName() : DbusConfig.getBusname()) .setDefault(cfg.busName() != null ? cfg.busName() : DbusConfig.getBusname())
@ -112,7 +112,7 @@ public class App {
parser.addArgument("--disable-send-log") parser.addArgument("--disable-send-log")
.help("Disable message send log (for resending messages that recipient couldn't decrypt)") .help("Disable message send log (for resending messages that recipient couldn't decrypt)")
.action(Arguments.storeTrue()) .action(Arguments.storeTrue())
.setDefault(cfg.disableSendLog()); .setDefault(cfg.disableSendLog() != null ? cfg.disableSendLog() : false);
parser.epilog( parser.epilog(
"The global arguments are shown with 'signal-cli -h' and need to come before the subcommand, while the subcommand-specific arguments (shown with 'signal-cli SUBCOMMAND -h') need to be given after the subcommand."); "The global arguments are shown with 'signal-cli -h' and need to come before the subcommand, while the subcommand-specific arguments (shown with 'signal-cli SUBCOMMAND -h') need to be given after the subcommand.");

4
src/main/java/org/asamk/signal/Main.java
View File

@ -113,13 +113,13 @@ public class Main {
.defaultHelp(false); .defaultHelp(false);
parser.addArgument("-v", "--verbose") parser.addArgument("-v", "--verbose")
.action(Arguments.count()) .action(Arguments.count())
.setDefault(config == null ? null : config.verbose()); .setDefault(config == null || config.verbose() == null ? 0 : config.verbose());
parser.addArgument("--log-file") parser.addArgument("--log-file")
.type(File.class) .type(File.class)
.setDefault(config == null || config.logFile() == null ? null : new File(config.logFile())); .setDefault(config == null || config.logFile() == null ? null : new File(config.logFile()));
parser.addArgument("--scrub-log") parser.addArgument("--scrub-log")
.action(Arguments.storeTrue()) .action(Arguments.storeTrue())
.setDefault(config == null ? null : config.scrubLog()); .setDefault(config == null || config.scrubLog() == null ? false : config.scrubLog());
try { try {
return parser.parseKnownArgs(args, null); return parser.parseKnownArgs(args, null);