From 72b550a836afebf97b25f15252cb5d7086468c36 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 7 Jun 2022 14:12:00 +0200
Subject: [PATCH] api: tape restore: code cleanup to reduce indentation level

No semantic change intended. IMO the interface of "both a datastore
and NS mapping must be present" is still a bit weird, at least in how
its used here to decide what to skip and what not, maybe we can
implement this in a more clear way (or maybe I'm just overlooking
something that makes it clearer as is).

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

diff --git a/src/api2/tape/restore.rs b/src/api2/tape/restore.rs
index 657629cf..a7408752 100644
--- a/src/api2/tape/restore.rs
+++ b/src/api2/tape/restore.rs
@@ -202,6 +202,11 @@ impl DataStoreMap {
         self.target_store(source_datastore)
             .map(|store| (store, self.target_ns(source_datastore, source_ns)))
     }
+
+    /// Returns true if there's both a datastore and namespace mapping from a source datastore/ns
+    fn has_full_mapping(&self, datastore: &str, ns: &BackupNamespace) -> bool {
+        self.target_store(datastore).is_some() && self.target_ns(datastore, ns).is_some()
+    }
 }
 
 fn check_datastore_privs(
@@ -626,30 +631,28 @@ fn restore_list_worker(
             let mut restorable = Vec::new();
             // restore source namespaces
             for (store, snapshot) in catalog.list_snapshots() {
-                if let Ok((ns, dir)) = parse_ns_and_snapshot(&snapshot) {
-                    if let Some((_, Some(_))) = store_map.get_targets(store, &ns) {
-                        let snapshot = print_ns_and_snapshot(&ns, &dir);
-                        match check_snapshot_restorable(
-                            &worker,
-                            &store_map,
-                            store,
-                            &snapshot,
-                            &ns,
-                            &dir,
-                            false,
-                            &user_info,
-                            auth_id,
-                            restore_owner,
-                        ) {
-                            Ok(true) => {
-                                restorable.push((store.to_string(), snapshot.to_string(), ns, dir))
-                            }
-                            Ok(false) => {}
-                            Err(err) => {
-                                task_warn!(worker, "{err}");
-                                skipped.push(format!("{store}:{snapshot}"));
-                            }
-                        }
+                let (ns, dir) = match parse_ns_and_snapshot(&snapshot) {
+                    Ok((ns, dir)) if store_map.has_full_mapping(store, &ns) => (ns, dir),
+                    _ => continue,
+                };
+                let snapshot = print_ns_and_snapshot(&ns, &dir);
+                match check_snapshot_restorable(
+                    &worker,
+                    &store_map,
+                    store,
+                    &snapshot,
+                    &ns,
+                    &dir,
+                    false,
+                    &user_info,
+                    auth_id,
+                    restore_owner,
+                ) {
+                    Ok(true) => restorable.push((store.to_string(), snapshot.to_string(), ns, dir)),
+                    Ok(false) => {}
+                    Err(err) => {
+                        task_warn!(worker, "{err}");
+                        skipped.push(format!("{store}:{snapshot}"));
                     }
                 }
             }