From 81149f6aa26091a2f48247f53381808042c446b3 Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Thu, 12 Sep 2024 00:54:56 +0800
Subject: [PATCH] feat: v1.10.5, improve list json outputs

---
 Cargo.lock      | 2 +-
 Cargo.toml      | 2 +-
 src/cmd_list.rs | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 547fe7c..58a0e74 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -487,7 +487,7 @@ dependencies = [
 
 [[package]]
 name = "card-cli"
-version = "1.10.4"
+version = "1.10.5"
 dependencies = [
  "authenticator 0.3.1",
  "base64 0.21.7",
diff --git a/Cargo.toml b/Cargo.toml
index f1b5d78..751b214 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "card-cli"
-version = "1.10.4"
+version = "1.10.5"
 authors = ["Hatter Jiang <jht5945@gmail.com>"]
 edition = "2018"
 
diff --git a/src/cmd_list.rs b/src/cmd_list.rs
index 3b2a4a6..3332250 100644
--- a/src/cmd_list.rs
+++ b/src/cmd_list.rs
@@ -29,6 +29,15 @@ impl Command for CommandImpl {
             if let Ok(pin_retries) = yk.get_pin_retries() {
                 json.insert("pin_retries", pin_retries.to_string());
             }
+            if let Ok(chuid) = yk.chuid() {
+                json.insert("chuid", chuid.to_string());
+            }
+            if let Ok(ccuid) = yk.cccid() {
+                json.insert("ccuid", ccuid.to_string());
+            }
+            if let Ok(piv_keys) = yk.piv_keys() {
+                json.insert("keys", piv_keys.iter().map(|k| format!("{}", k.slot())).collect::<Vec<_>>().join(", "));
+            }
 
             println!("{}", serde_json::to_string_pretty(&json).expect("Convert to JSON failed!"));
         } else {