From 20a04cf07c8b71ef5d4506715bb597aa96debb46 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Sun, 5 Jun 2022 10:42:46 +0200
Subject: [PATCH] api: tape restore: refactor some code parts shorter

not wanting to play code golf here, but bloat in code makes it often
also harder to read, so try to reduce some of that without making it
to terse.

No semantic change intended.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 src/api2/tape/restore.rs | 45 ++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
index cde1e908..32d97ff5 100644
--- a/src/api2/tape/restore.rs
+++ b/src/api2/tape/restore.rs
@@ -476,26 +476,19 @@ fn restore_full_worker(
     }
 
     let used_datastores = store_map.used_datastores();
-    task_log!(
-        worker,
-        "Datastore(s): {}",
-        used_datastores
-            .values()
-            .map(|(t, _)| String::from(t.name()))
-            .collect::<Vec<String>>()
-            .join(", "),
-    );
-
-    task_log!(worker, "Drive: {}", drive_name);
-    task_log!(
-        worker,
-        "Required media list: {}",
-        media_id_list
-            .iter()
-            .map(|media_id| media_id.label.label_text.as_str())
-            .collect::<Vec<&str>>()
-            .join(";")
-    );
+    let datastore_list = used_datastores
+        .values()
+        .map(|(t, _)| String::from(t.name()))
+        .collect::<Vec<String>>()
+        .join(", ");
+    task_log!(worker, "Datastore(s): {datastore_list}",);
+    task_log!(worker, "Drive: {drive_name}");
+    let required_media = media_id_list
+        .iter()
+        .map(|media_id| media_id.label.label_text.as_str())
+        .collect::<Vec<&str>>()
+        .join(";");
+    task_log!(worker, "Required media list: {required_media}",);
 
     let mut datastore_locks = Vec::new();
     for (target, _) in used_datastores.values() {
@@ -549,12 +542,8 @@ fn check_snapshot_restorable(
         (datastore, namespaces)
     } else {
         match store_map.get_targets(store, ns) {
-            Some((ds, Some(ns))) => {
-                if ns.is_empty() {
-                    return Ok(false);
-                }
-                (ds, ns)
-            }
+            Some((_, Some(ns))) if ns.is_empty() => return Ok(false),
+            Some((datastore, Some(ns))) => (datastore, ns),
             Some((_, None)) => return Ok(false),
             None => return Ok(false),
         }
@@ -830,9 +819,7 @@ fn restore_list_worker(
                     format_err!("unexpected source datastore: {}", source_datastore)
                 })?;
 
-                let namespaces = target_ns.unwrap_or_else(|| vec![source_ns.clone()]);
-
-                for ns in namespaces {
+                for ns in target_ns.unwrap_or_else(|| vec![source_ns.clone()]) {
                     if let Err(err) = proxmox_lang::try_block!({
                         check_and_create_namespaces(
                             &user_info,