src/bin/proxmox-backup-manager.rs: improve user list output

diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs
index f12d9632df7ed6e61391d9e8f03023b3fe2e1918..6c0cf63f4e62887823bbf3a0955c4f89ac0cf860 100644 (file)
--- a/src/bin/proxmox-backup-manager.rs
+++ b/src/bin/proxmox-backup-manager.rs
@@ -133,8 +133,14 @@ fn list_users(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Er
 
     let options = default_table_format_options()
         .column(ColumnConfig::new("userid"))
-        .column(ColumnConfig::new("enable"))
-        .column(ColumnConfig::new("expire"))
+        .column(
+            ColumnConfig::new("enable")
+                .renderer(tools::format::render_bool_with_default_true)
+        )
+        .column(
+            ColumnConfig::new("expire")
+                .renderer(tools::format::render_epoch)
+        )
         .column(ColumnConfig::new("firstname"))
         .column(ColumnConfig::new("lastname"))
         .column(ColumnConfig::new("email"))

diff --git a/src/tools/format.rs b/src/tools/format.rs
index 230199087b586930108a07c2daec641bb8c26ae9..ddec648e723832ecc7d3298c8a60c0566718e851 100644 (file)
--- a/src/tools/format.rs
+++ b/src/tools/format.rs
@@ -41,3 +41,8 @@ pub fn render_task_status(value: &Value, record: &Value) -> Result<String, Error
         Ok(value.as_str().unwrap_or("unknown").to_string())
     }
 }
+
+pub fn render_bool_with_default_true(value: &Value, _record: &Value) -> Result<String, Error> {
+    let value = value.as_bool().unwrap_or(true);
+    Ok((if value { "1" } else { "0" }).to_string())
+}