From abb2480b0d27057c5258c7a2dfd205ff9c95825b Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 2 Apr 2023 21:20:55 +0800 Subject: [PATCH] feat: v0.7.3, parse args error message improvement --- .../tools/tinyencrypt/TinyEncryptArgsUtil.java | 13 ++++++++++++- .../tinyencrypt/config/TinyEncryptConstant.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptArgsUtil.java b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptArgsUtil.java index dd41f9d..4ad49b5 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptArgsUtil.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptArgsUtil.java @@ -1,13 +1,24 @@ package me.hatter.tools.tinyencrypt; import me.hatter.tools.commons.io.RFile; +import me.hatter.tools.commons.log.LogTool; +import me.hatter.tools.commons.log.LogTools; import picocli.CommandLine; public class TinyEncryptArgsUtil { + private static final LogTool log = LogTools.getLogTool(TinyEncryptArgsUtil.class); private static final String DEFAULT_TINY_ENCRYPT_CONFIG = "~/.tinyencrypt_config.json"; - public static TinyEncryptArgs parseTinyEncryptArgs(String[] args) { + try { + return innerParseTinyEncryptArgs(args); + } catch (CommandLine.UnmatchedArgumentException unmatchedArgumentException) { + log.error("Parse args failed: " + unmatchedArgumentException.getMessage()); + return null; + } + } + + public static TinyEncryptArgs innerParseTinyEncryptArgs(String[] args) { final TinyEncryptArgs tinyEncryptArgs = new TinyEncryptArgs(); final CommandLine cmd = new CommandLine(tinyEncryptArgs); cmd.parseArgs(args); diff --git a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java index 960a986..bec0d2c 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/config/TinyEncryptConstant.java @@ -1,7 +1,7 @@ package me.hatter.tools.tinyencrypt.config; public class TinyEncryptConstant { - public static final String VERSION = "0.7.2"; + public static final String VERSION = "0.7.3"; public static final String ENC_FILE_EXT = ".tinyenc"; }