From d105176f459e3c7fdfa123778698337d8af9a5c7 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 9 Dec 2019 18:00:22 +0100 Subject: [PATCH] src/bin/proxmox-backup-client.rs: cleanup - factor out view_task_result() --- src/bin/proxmox-backup-client.rs | 42 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index f2ab0eee..fd780575 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -146,6 +146,23 @@ fn complete_repository(_arg: &str, _param: &HashMap) -> Vec Result<(), Error> { + let data = &result["data"]; + if output_format == "text" { + if let Some(upid) = data.as_str() { + display_task_log(client, upid, true).await?; + } + } else { + format_and_print_result(&data, &output_format); + } + + Ok(()) +} + async fn backup_directory>( client: &BackupWriter, dir_path: P, @@ -547,19 +564,9 @@ fn start_garbage_collection( record_repository(&repo); - let data = &result["data"]; - if output_format == "text" { - if let Some(upid) = data.as_str() { - display_task_log(client, upid, true).await?; - } - } else { - format_and_print_result(&data, &output_format); - } - - Ok::<_, Error>(()) + view_task_result(client, result, &output_format).await })?; - Ok(Value::Null) } @@ -1167,17 +1174,8 @@ fn prune( record_repository(&repo); - let data = &result["data"]; - if output_format == "text" { - if let Some(upid) = data.as_str() { - display_task_log(client, upid, true).await?; - } - } else { - format_and_print_result(&data, &output_format); - } - - Ok::<_, Error>(()) - })?; + view_task_result(client, result, &output_format).await + })?; Ok(Value::Null) }