diff --git a/pbs-tools/src/format.rs b/pbs-tools/src/format.rs index c208d8cb..bc9f20a8 100644 --- a/pbs-tools/src/format.rs +++ b/pbs-tools/src/format.rs @@ -1,9 +1,11 @@ use std::borrow::Borrow; +use std::time::Duration; -use anyhow::Error; +use anyhow::{Context, Error}; use serde_json::Value; use proxmox_human_byte::HumanByte; +use proxmox_time::TimeSpan; pub fn strip_server_file_extension(name: &str) -> &str { if name.ends_with(".didx") || name.ends_with(".fidx") || name.ends_with(".blob") { @@ -64,3 +66,13 @@ pub fn render_bytes_human_readable(value: &Value, _record: &Value) -> Result Result { + if val.is_null() { + return Ok(String::new()); + } + let duration = val.as_u64().context("not a number")?; + let time_span = TimeSpan::from(Duration::from_secs(duration)); + + Ok(format!("{time_span}")) +} diff --git a/src/bin/proxmox-backup-manager.rs b/src/bin/proxmox-backup-manager.rs index 94fc6b2f..28271cb4 100644 --- a/src/bin/proxmox-backup-manager.rs +++ b/src/bin/proxmox-backup-manager.rs @@ -115,7 +115,36 @@ async fn garbage_collection_list_jobs(param: Value) -> Result { let mut data = result["data"].take(); let return_type = &api2::admin::gc::API_METHOD_LIST_ALL_GC_JOBS.returns; - let options = default_table_format_options(); + use pbs_tools::format::{render_bytes_human_readable, render_duration, render_epoch}; + let options = default_table_format_options() + .column(ColumnConfig::new("store")) + .column( + ColumnConfig::new("last-run-endtime") + .right_align(false) + .renderer(render_epoch), + ) + .column( + ColumnConfig::new("duration") + .right_align(false) + .renderer(render_duration), + ) + .column( + ColumnConfig::new("removed-bytes") + .right_align(false) + .renderer(render_bytes_human_readable), + ) + .column( + ColumnConfig::new("pending-bytes") + .right_align(false) + .renderer(render_bytes_human_readable), + ) + .column(ColumnConfig::new("last-run-state")) + .column(ColumnConfig::new("schedule")) + .column( + ColumnConfig::new("next-run") + .right_align(false) + .renderer(render_epoch), + ); format_and_print_result_full(&mut data, return_type, &output_format, &options);