tsarevvv/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proxmox-backup-mgr: gc jobs: pretty-print bytes/duration/timestamps

Browse Source 
Signed-off-by: Lukas Wagner <l.wagner@proxmox.com>
Tested-by: Gabriel Goller <g.goller@proxmox.com>
This commit is contained in:
Lukas Wagner 2024-04-18 12:17:06 +02:00 committed by Fabian Grünbichler
parent 84baca8a4c
commit 0f1496d138
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pbs-tools/src/format.rs
View File

@ -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<Str
};
Ok(text)
}
pub fn render_duration(val: &Value, _record: &Value) -> Result<String, Error> {
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}"))
}

31
src/bin/proxmox-backup-manager.rs
View File

@ -115,7 +115,36 @@ async fn garbage_collection_list_jobs(param: Value) -> Result<Value, Error> {
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);