From ea5f547fdc1adb8c3d37cd4409899add275cc675 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 26 Feb 2020 13:49:47 +0100
Subject: [PATCH] src/bin/proxmox-backup-client.rs - list_snapshot_files: use
 format_and_print_result_full()

---
 src/api2/admin/datastore.rs      |  4 ++--
 src/bin/proxmox-backup-client.rs | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 40020a13..ad94e4d8 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -138,7 +138,7 @@ fn list_groups(
     },
 )]
 /// List snapshot files.
-fn list_snapshot_files(
+pub fn list_snapshot_files(
     store: String,
     backup_type: String,
     backup_id: String,
@@ -293,7 +293,7 @@ fn list_snapshots (
     },
 )]
 /// Get datastore status.
-fn status(
+pub fn status(
     store: String,
     _info: &ApiMethod,
     _rpcenv: &mut dyn RpcEnvironment,
diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs
index 5c5a9120..866ec88a 100644
--- a/src/bin/proxmox-backup-client.rs
+++ b/src/bin/proxmox-backup-client.rs
@@ -671,19 +671,15 @@ async fn list_snapshot_files(param: Value) -> Result<Value, Error> {
 
     record_repository(&repo);
 
-    let list: Value = result["data"].take();
+    let info = &proxmox_backup::api2::admin::datastore::API_RETURN_SCHEMA_LIST_SNAPSHOT_FILES;
 
-    if output_format == "text" {
-        for item in list.as_array().unwrap().iter() {
-            println!(
-                "{} {}",
-                strip_server_file_expenstion(item["filename"].as_str().unwrap()),
-                item["size"].as_u64().unwrap_or(0),
-            );
-        }
-    } else {
-        format_and_print_result(&list, &output_format);
-    }
+    let mut data: Value = result["data"].take();
+
+    let options = TableFormatOptions::new()
+        .noborder(false)
+        .noheader(false);
+
+    format_and_print_result_full(&mut data, info, &output_format, &options);
 
     Ok(Value::Null)
 }
@@ -1489,7 +1485,7 @@ async fn status(param: Value) -> Result<Value, Error> {
         .column(ColumnConfig::new("used").renderer(render_total_percentage))
         .column(ColumnConfig::new("avail").renderer(render_total_percentage));
 
-    let schema = &proxmox_backup::api2::types::StorageStatus::API_SCHEMA;
+    let schema = &proxmox_backup::api2::admin::datastore::API_RETURN_SCHEMA_STATUS;
 
     format_and_print_result_full(&mut data, schema, &output_format, &options);