backup_info: BackupDir shortcut

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 1b313763b04c5866ae4bb5d2f1108bb3260ad9d3..404e420a0e6a13520916222110fb1a169bdaaa9b 100644 (file)
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -98,7 +98,7 @@ fn delete_snapshots (
     let backup_id = tools::required_string_param(&param, "backup-id")?;
     let backup_time = tools::required_integer_param(&param, "backup-time")?;
 
-    let snapshot = BackupDir::new(BackupGroup::new(backup_type, backup_id), backup_time);
+    let snapshot = BackupDir::new(backup_type, backup_id, backup_time);
 
     let datastore = DataStore::lookup_datastore(store)?;
 

diff --git a/src/api2/admin/datastore/catar.rs b/src/api2/admin/datastore/catar.rs
index e514cfbdd4ba2799e601dafdaead65deec39b125..eca4eb8698e5784fe0128ccb0d1e65f8e3c44db1 100644 (file)
--- a/src/api2/admin/datastore/catar.rs
+++ b/src/api2/admin/datastore/catar.rs
@@ -80,7 +80,7 @@ fn upload_catar(
     verify_chunk_size(chunk_size)?;
 
     let datastore = DataStore::lookup_datastore(store)?;
-    let backup_dir = BackupDir::new(BackupGroup::new(backup_type, backup_id), backup_time);
+    let backup_dir = BackupDir::new(backup_type, backup_id, backup_time);
 
     let (mut path, _new) = datastore.create_backup_dir(&backup_dir)?;
 
@@ -144,7 +144,7 @@ fn download_catar(
 
     let datastore = DataStore::lookup_datastore(store)?;
 
-    let backup_dir = BackupDir::new(BackupGroup::new(backup_type, backup_id), backup_time);
+    let backup_dir = BackupDir::new(backup_type, backup_id, backup_time);
 
     let mut path = backup_dir.relative_path();
 

diff --git a/src/backup/backup_info.rs b/src/backup/backup_info.rs
index 5af5c496f4c3049ef8947261c14c73b90ff41c78..0fa7f1e644cea69aac1f8ea11e354c0156558ddf 100644 (file)
--- a/src/backup/backup_info.rs
+++ b/src/backup/backup_info.rs
@@ -92,9 +92,16 @@ pub struct BackupDir {
 
 impl BackupDir {
 
-    pub fn new(group: BackupGroup, timestamp: i64) -> Self {
+    pub fn new<T, U>(backup_type: T, backup_id: U, timestamp: i64) -> Self
+    where
+        T: Into<String>,
+        U: Into<String>,
+    {
         // Note: makes sure that nanoseconds is 0
-        Self { group, backup_time: Local.timestamp(timestamp, 0) }
+        Self {
+            group: BackupGroup::new(backup_type.into(), backup_id.into()),
+            backup_time: Local.timestamp(timestamp, 0),
+        }
     }
 
     pub fn group(&self) -> &BackupGroup {
@@ -112,7 +119,7 @@ impl BackupDir {
 
         let group = BackupGroup::new(cap.get(1).unwrap().as_str(), cap.get(2).unwrap().as_str());
         let backup_time = cap.get(3).unwrap().as_str().parse::<DateTime<Local>>()?;
-        Ok(BackupDir::new(group, backup_time.timestamp()))
+        Ok(BackupDir::from((group, backup_time.timestamp())))
     }
 
     pub fn relative_path(&self) ->  PathBuf  {
@@ -125,6 +132,12 @@ impl BackupDir {
     }
 }
 
+impl From<(BackupGroup, i64)> for BackupDir {
+    fn from((group, timestamp): (BackupGroup, i64)) -> Self {
+        Self { group, backup_time: Local.timestamp(timestamp, 0) }
+    }
+}
+
 /// Detailed Backup Information, lists files inside a BackupDir
 #[derive(Debug)]
 pub struct BackupInfo {
@@ -165,7 +178,7 @@ impl BackupInfo {
                     })?;
 
                     list.push(BackupInfo {
-                        backup_dir: BackupDir::new(BackupGroup::new(backup_type, backup_id), dt.timestamp()),
+                        backup_dir: BackupDir::new(backup_type, backup_id, dt.timestamp()),
                         files,
                     });
 

diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs
index f25765e966a96d2cfcd2d8cd3eb018ad52775f89..c05d0f13478adbc47b167a01601523d886fcc8b1 100644 (file)
--- a/src/bin/proxmox-backup-client.rs
+++ b/src/bin/proxmox-backup-client.rs
@@ -111,7 +111,7 @@ fn list_backups(
         let btype = item["backup-type"].as_str().unwrap();
         let epoch = item["backup-time"].as_i64().unwrap();
 
-        let backup_dir = BackupDir::new(BackupGroup::new(btype, id), epoch);
+        let backup_dir = BackupDir::new(btype, id, epoch);
 
         let files = item["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_owned()).collect();
 
@@ -203,7 +203,7 @@ fn list_snapshots(
         let btype = item["backup-type"].as_str().unwrap();
         let epoch = item["backup-time"].as_i64().unwrap();
 
-        let snapshot = BackupDir::new(BackupGroup::new(btype, id), epoch);
+        let snapshot = BackupDir::new(btype, id, epoch);
 
         let path = snapshot.relative_path().to_str().unwrap().to_owned();