From c89f9cf89d06aeee6997e80b0376dd50a86e373b Mon Sep 17 00:00:00 2001
From: Houkime <>
Date: Mon, 14 Aug 2023 12:43:44 +0000
Subject: [PATCH] feature(backups): do not rely on mounting

---
 .../backup/backuppers/restic_backupper.py     | 33 +++++++++----------
 tests/test_graphql/test_backup.py             | 11 +++++++
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/selfprivacy_api/backup/backuppers/restic_backupper.py b/selfprivacy_api/backup/backuppers/restic_backupper.py
index 418aa5b..a935520 100644
--- a/selfprivacy_api/backup/backuppers/restic_backupper.py
+++ b/selfprivacy_api/backup/backuppers/restic_backupper.py
@@ -9,8 +9,9 @@ from typing import List, TypeVar, Callable
 from collections.abc import Iterable
 from json.decoder import JSONDecodeError
 from os.path import exists, join
-from os import listdir
+from os import listdir, mkdir
 from time import sleep
+from shutil import rmtree
 
 from selfprivacy_api.backup.util import output_yielder, sync
 from selfprivacy_api.backup.backuppers import AbstractBackupper
@@ -364,23 +365,21 @@ class ResticBackupper(AbstractBackupper):
             if verify:
                 self._raw_verified_restore(snapshot_id, target=temp_dir)
                 snapshot_root = temp_dir
-            else:  # attempting inplace restore via mount + sync
-                assert exists(
-                    temp_dir
-                )  # paranoid check, TemporaryDirectory is supposedly created
-                self.mount_repo(temp_dir)
-                snapshot_root = join(temp_dir, "ids", snapshot_id)
+                for folder in folders:
+                    src = join(snapshot_root, folder.strip("/"))
+                    if not exists(src):
+                        raise ValueError(
+                            f"No such path: {src}. We tried to find {folder}"
+                        )
+                    dst = folder
+                    sync(src, dst)
 
-            assert snapshot_root is not None
-            for folder in folders:
-                src = join(snapshot_root, folder.strip("/"))
-                if not exists(src):
-                    raise ValueError(f"No such path: {src}. We tried to find {folder}")
-                dst = folder
-                sync(src, dst)
-
-            if not verify:
-                self.unmount_repo(temp_dir)
+            else:  # attempting inplace restore
+                for folder in folders:
+                    rmtree(folder)
+                    mkdir(folder)
+                self._raw_verified_restore(snapshot_id, target="/")
+                return
 
     def _raw_verified_restore(self, snapshot_id, target="/"):
         """barebones restic restore"""
diff --git a/tests/test_graphql/test_backup.py b/tests/test_graphql/test_backup.py
index 9736f91..25eaaf4 100644
--- a/tests/test_graphql/test_backup.py
+++ b/tests/test_graphql/test_backup.py
@@ -746,6 +746,17 @@ def test_mount_umount(backups, dummy_service, tmpdir):
     assert len(listdir(mountpoint)) == 0
 
 
+def test_mount_nonexistent(backups, dummy_service, tmpdir):
+    backupper = Backups.provider().backupper
+    assert isinstance(backupper, ResticBackupper)
+
+    mountpoint = tmpdir / "nonexistent"
+    assert not path.exists(mountpoint)
+
+    with pytest.raises(FileNotFoundError):
+        handle = backupper.mount_repo(mountpoint)
+
+
 def test_move_blocks_backups(backups, dummy_service, restore_strategy):
     snap = Backups.back_up(dummy_service)
     job = Jobs.add(