From a37d5b8d6258caf6e88017324a1c2ccb57f38f29 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 15 Oct 2023 16:54:29 +0800 Subject: [PATCH] feat: update config --- src/cmd_config.rs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/cmd_config.rs b/src/cmd_config.rs index fd0f9c9..32f43ac 100644 --- a/src/cmd_config.rs +++ b/src/cmd_config.rs @@ -34,9 +34,13 @@ impl PartialOrd for ConfigProfile { } #[derive(Debug, Args)] -pub struct CmdConfig {} +pub struct CmdConfig { + /// Show KID + #[arg(long)] + pub show_kid: bool, +} -pub fn config(_cmd_version: CmdConfig) -> XResult<()> { +pub fn config(cmd_version: CmdConfig) -> XResult<()> { let config = TinyEncryptConfig::load(TINY_ENC_CONFIG_FILE)?; let mut reverse_map = HashMap::new(); @@ -64,10 +68,17 @@ pub fn config(_cmd_version: CmdConfig) -> XResult<()> { ks.push(format!("[ERROR] Key not found: {}", kid)); } Some(envelop) => { + let kid = if cmd_version.show_kid { + format!("Kid: {}", envelop.kid) + } else { + envelop.sid.as_ref() + .map(|sid| format!("Sid: {}", sid)) + .unwrap_or_else(|| format!("Kid: {}", envelop.kid)) + }; let desc = envelop.desc.as_ref() .map(|desc| format!(", Desc: {}", desc)) .unwrap_or_else(|| "".to_string()); - ks.push(format!("{}{}", envelop.kid, desc)); + ks.push(format!("{}, {}{}", envelop.r#type.get_name(), kid, desc)); } } }