From be8216c0b4a12e8cd165f492f5091693ac8a953f Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Sun, 16 Oct 2022 15:14:52 +0200
Subject: [PATCH] [fix] Backup restore

---
 share/actionsmap.yml     |  3 ++-
 src/backup.py            | 35 +++++++++++++++++++++++------------
 src/repositories/borg.py |  2 +-
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/share/actionsmap.yml b/share/actionsmap.yml
index 368c7e9dd..f1b47e279 100644
--- a/share/actionsmap.yml
+++ b/share/actionsmap.yml
@@ -1092,10 +1092,11 @@ backup:
             arguments:
                 repository:
                     help: Repository of the backup archive
-                name:
+                archive_name:
                     help: Name of the archive to delete
                     extra:
                         pattern: *pattern_backup_archive_name
+                    nargs: "*"
 
     subcategories:
         repository:
diff --git a/src/backup.py b/src/backup.py
index 8797ade0a..8e6a2d64f 100644
--- a/src/backup.py
+++ b/src/backup.py
@@ -1107,7 +1107,24 @@ class RestoreManager:
 
         filesystem.mkdir(self.work_dir, parents=True)
 
-        self.archive.extract()
+        # Select paths to extract
+        paths = ["backup.csv", "info.json", "hooks"]
+        paths += [f"apps/{app}" for app in self.targets.list("apps", exclude=["Skipped"])]
+        for system in self.targets.list("system", exclude=["Skipped"]):
+            if system.startswith("data"):
+                paths.append(f"data/{system}")
+            elif system.startswith("conf_ynh"):
+                if "conf/ynh" not in paths:
+                    paths.append("conf/ynh")
+            else:
+                paths.append(system.replace("_", "/", 1))
+
+        if not self.targets.list("system", exclude=["Skipped"]):
+            paths.remove("hooks")
+
+        logger.debug(f"List of paths to extract: {paths}")
+
+        self.archive.extract(paths=paths, destination=self.work_dir)
 
     #
     # Space computation / checks                                            #
@@ -1717,7 +1734,7 @@ def backup_create(
         )
     )
     repo_results = backup_manager.backup()
-    repo_states = [repo_result == "Success" for repository, repo_result in repo_results.items()]
+    repo_states = [repo_result == "Sent" for repository, repo_result in repo_results.items()]
 
     if all(repo_states) and all(parts_states):
         logger.success(m18n.n("backup_created"))
@@ -1886,7 +1903,7 @@ def backup_info(repository, name, with_details=False, human_readable=False):
     return archive.info(with_details=with_details, human_readable=human_readable)
 
 
-def backup_delete(repository, name):
+def backup_delete(repository, archive_name):
     """
     Delete a backup
 
@@ -1894,15 +1911,9 @@ def backup_delete(repository, name):
         name -- Name of the local backup archive
 
     """
-    repo = BackupRepository(repository)
-    archive = BackupArchive(repo, name)
-
-    # FIXME Those are really usefull ?
-    hook_callback("pre_backup_delete", args=[name])
-
-    archive.delete()
-
-    hook_callback("post_backup_delete", args=[name])
+    for name in archive_name:
+        repo = BackupRepository(repository)
+        BackupArchive(repo, name).delete()
 
     logger.success(m18n.n("backup_deleted"))
 
diff --git a/src/repositories/borg.py b/src/repositories/borg.py
index a4e664b0f..934010d44 100644
--- a/src/repositories/borg.py
+++ b/src/repositories/borg.py
@@ -259,7 +259,7 @@ class BorgBackupArchive(BackupArchive):
         response.content_type = "application/x-tar"
         return HTTPResponse(reader, 200)
 
-    def extract(self, paths=None, destination=None, exclude_paths=[]):
+    def extract(self, paths=[], destination=None, exclude_paths=[]):
         paths, destination, exclude_paths = super().extract(paths, destination, exclude_paths)
         cmd = ['borg', 'extract', self.archive_path] + paths
         for path in exclude_paths: