src/backup/datastore.rs: split BackupInfo

2019-03-01 12:32:10 +01:00
parent dcd15d10bb
commit 38b0dfa511
3 changed files with 55 additions and 51 deletions
--- a/src/api2/admin/datastore/catar.rs
+++ b/src/api2/admin/datastore/catar.rs
@ -145,7 +145,13 @@ fn download_catar(

    let datastore = DataStore::lookup_datastore(store)?;

-    let mut path = datastore.get_backup_dir(backup_type, backup_id, backup_time);
+    let backup_dir = BackupDir {
+        backup_type: backup_type.to_string(),
+        backup_id: backup_id.to_string(),
+        backup_time,
+    };
+
+    let mut path = backup_dir.relative_path();

    let mut full_archive_name = PathBuf::from(archive_name);
    full_archive_name.set_extension("didx");