From 7794adadb1896e915df62da681bf17c009529656 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Mon, 4 Apr 2022 01:01:16 +0800 Subject: [PATCH] chore: file info --- .../tinyencrypt/TinyEncryptMainUtil.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMainUtil.java b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMainUtil.java index 90a27e6..77462a9 100644 --- a/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMainUtil.java +++ b/src/main/java/me/hatter/tools/tinyencrypt/TinyEncryptMainUtil.java @@ -119,32 +119,34 @@ public class TinyEncryptMainUtil { TinyEncryptMeta meta = tlv.getValueAsBytes().asJSONObject(TinyEncryptMeta.class); log.debug("Tiny encrypt meta: " + JSON.toJSONString(meta, true)); StringBuilder sb = new StringBuilder(256); - sb.append("File Info\n").append(header("File")).append(f); + sb.append("Tiny Encrypt File Info\n"); + sb.append(header("File")).append(f); if ((meta.getCompress() != null) && meta.getCompress()) { sb.append(" [compressed]"); } sb.append("\n"); sb.append(header("File version")).append(meta.getVersion()).append("\n"); if (meta.getFileLength() != null) { - sb.append(header("File size")).append(meta.getFileLength()) - .append(" (").append(ByteUtil.formatBytes(meta.getFileLength())).append(")\n"); + sb.append(header("File size")).append(meta.getFileLength()); + if (meta.getFileLength() >= 1024) { + sb.append(" (").append(ByteUtil.formatBytes(meta.getFileLength())).append(")"); + } + sb.append("\n"); } if (meta.getFileLastModified() != null) { sb.append(header("Last modified")).append(new Date(meta.getFileLastModified())).append("\n"); } sb.append(header("Enc file created")).append(new Date(meta.getCreated())).append("\n"); - sb.append(header("Envelop")).append(toYesOrNo(StringUtil.isNotBlank(meta.getEnvelop()))).append("\n"); - sb.append(header("PGP envelop")).append(toYesOrNo(StringUtil.isNotBlank(meta.getPgpEnvelop()))).append("\n"); + sb.append(header("Envelop")).append(toYesOrNo(meta.getEnvelop())).append("\n"); + sb.append(header("PGP envelop")).append(toYesOrNo(meta.getPgpEnvelop())).append("\n"); if (StringUtil.isNotBlank(meta.getPgpFingerprint())) { - sb.append(header("PGP fingerprint")) - .append(meta.getPgpFingerprint()) - .append("\n"); + sb.append(header("PGP fingerprint")).append(meta.getPgpFingerprint()).append("\n"); } sb.append(header("Enc agent")).append(meta.getUserAgent()).append("\n"); if (StringUtil.isNotBlank(meta.getComment())) { sb.append(header("Comment")).append(meta.getComment()).append("\n"); } - sb.append(header("Encrypted comment")).append(toYesOrNo(StringUtil.isNotBlank(meta.getEncryptedComment()))).append("\n"); + sb.append(header("Encrypted comment")).append(toYesOrNo(meta.getEncryptedComment())).append("\n"); log.info(sb.toString()); } @@ -154,6 +156,10 @@ public class TinyEncryptMainUtil { return h + StringUtil.repeat(".", Math.max(width - h.length(), 0)) + ": "; } + private static String toYesOrNo(String s) { + return toYesOrNo(StringUtil.isNotEmpty(s)); + } + private static String toYesOrNo(boolean b) { return b ? "YES" : "NO"; }