From dda7015497684c4feccc2301d7c9182eb5849b52 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Wed, 1 Apr 2020 12:24:28 +0200
Subject: [PATCH] prune api: return a usable result (we run synchronous
 anyways)

---
 src/api2/admin/datastore.rs | 61 ++++++++++++++++++++++++++-----------
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 283aca8a..68195307 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -419,34 +419,54 @@ fn prune(
 
     let worker_id = format!("{}_{}_{}", store, backup_type, backup_id);
 
+    let mut prune_result = Vec::new();
+
+    let list = group.list_backups(&datastore.base_path())?;
+
+    let mut prune_info = compute_prune_info(list, &prune_options)?;
+
+    prune_info.reverse(); // delete older snapshots first
+
+    let keep_all = !prune_options.keeps_something();
+
+    if dry_run {
+        for (info, mut keep) in prune_info {
+            if keep_all { keep = true; }
+
+            let backup_time = info.backup_dir.backup_time();
+            let group = info.backup_dir.group();
+
+            prune_result.push(json!({
+                "backup-type": group.backup_type(),
+                "backup-id": group.backup_id(),
+                "backup-time": backup_time.timestamp(),
+                "keep": keep,
+            }));
+        }
+        return Ok(json!(prune_result));
+    }
+
+
     // We use a WorkerTask just to have a task log, but run synchrounously
     let worker = WorkerTask::new("prune", Some(worker_id), "root@pam", true)?;
+
     let result = try_block! {
-        if !prune_options.keeps_something() {
+        if keep_all {
             worker.log("No prune selection - keeping all files.");
-            return Ok(());
         } else {
             worker.log(format!("retention options: {}", prune_options.cli_options_string()));
-            if dry_run {
-                worker.log(format!("Testing prune on store \"{}\" group \"{}/{}\"",
-                                   store, backup_type, backup_id));
-            } else {
-                worker.log(format!("Starting prune on store \"{}\" group \"{}/{}\"",
-                                   store, backup_type, backup_id));
-            }
+            worker.log(format!("Starting prune on store \"{}\" group \"{}/{}\"",
+                               store, backup_type, backup_id));
         }
 
-        let list = group.list_backups(&datastore.base_path())?;
+        for (info, mut keep) in prune_info {
+            if keep_all { keep = true; }
 
-        let mut prune_info = compute_prune_info(list, &prune_options)?;
-
-        prune_info.reverse(); // delete older snapshots first
-
-        for (info, keep) in prune_info {
             let backup_time = info.backup_dir.backup_time();
             let timestamp = BackupDir::backup_time_to_string(backup_time);
             let group = info.backup_dir.group();
 
+
             let msg = format!(
                 "{}/{}/{} {}",
                 group.backup_type(),
@@ -457,6 +477,13 @@ fn prune(
 
             worker.log(msg);
 
+            prune_result.push(json!({
+                "backup-type": group.backup_type(),
+                "backup-id": group.backup_id(),
+                "backup-time": backup_time.timestamp(),
+                "keep": keep,
+            }));
+
             if !(dry_run || keep) {
                 datastore.remove_backup_dir(&info.backup_dir)?;
             }
@@ -469,9 +496,9 @@ fn prune(
 
     if let Err(err) = result {
         bail!("prune failed - {}", err);
-    }
+    };
 
-    Ok(json!(worker.to_string())) // return the UPID
+    Ok(json!(prune_result))
 }
 
 #[api(