tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/backup/datastore.rs: split BackupDir

Browse Source
This commit is contained in:
Dietmar Maurer 2019-03-01 12:43:11 +01:00
parent 38b0dfa511
commit dc4c09faae
3 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api2/admin/datastore.rs
View File

@ -22,7 +22,7 @@ fn group_backups(backup_list: Vec<BackupInfo>) -> HashMap<String, Vec<BackupInfo
let mut group_hash = HashMap::new(); let mut group_hash = HashMap::new();
for info in backup_list { for info in backup_list {
let group_id = format!("{}/{}", info.backup_dir.backup_type, info.backup_dir.backup_id); let group_id = format!("{}/{}", info.backup_dir.group.backup_type, info.backup_dir.group.backup_id);
let time_list = group_hash.entry(group_id).or_insert(vec![]); let time_list = group_hash.entry(group_id).or_insert(vec![]);
time_list.push(info); time_list.push(info);
} }
@ -223,8 +223,8 @@ fn get_backup_list(
for info in datastore.list_backups()? { for info in datastore.list_backups()? {
list.push(json!({ list.push(json!({
"backup_type": info.backup_dir.backup_type, "backup_type": info.backup_dir.group.backup_type,
"backup_id": info.backup_dir.backup_id, "backup_id": info.backup_dir.group.backup_id,
"backup_time": info.backup_dir.backup_time.timestamp(), "backup_time": info.backup_dir.backup_time.timestamp(),
"files": info.files, "files": info.files,
})); }));

6
src/api2/admin/datastore/catar.rs
View File

@ -146,8 +146,10 @@ fn download_catar(
let datastore = DataStore::lookup_datastore(store)?; let datastore = DataStore::lookup_datastore(store)?;
let backup_dir = BackupDir { let backup_dir = BackupDir {
backup_type: backup_type.to_string(), group: BackupGroup {
backup_id: backup_id.to_string(), backup_type: backup_type.to_string(),
backup_id: backup_id.to_string(),
},
backup_time, backup_time,
}; };

37
src/backup/datastore.rs
View File

@ -26,13 +26,34 @@ pub struct DataStore {
gc_mutex: Mutex<bool>, gc_mutex: Mutex<bool>,
} }
/// Uniquely identify backups (relative to data store) /// Group Backups
#[derive(Debug)] #[derive(Debug)]
pub struct BackupDir { pub struct BackupGroup {
/// Type of backup /// Type of backup
pub backup_type: String, pub backup_type: String,
/// Unique (for this type) ID /// Unique (for this type) ID
pub backup_id: String, pub backup_id: String,
}
impl BackupGroup {
pub fn group_path(&self) -> PathBuf {
let mut relative_path = PathBuf::new();
relative_path.push(&self.backup_type);
relative_path.push(&self.backup_id);
relative_path
}
}
/// Uniquely identify a Backup (relative to data store)
#[derive(Debug)]
pub struct BackupDir {
/// Backup group
pub group: BackupGroup,
/// Backup timestamp /// Backup timestamp
pub backup_time: DateTime<Utc>, pub backup_time: DateTime<Utc>,
} }
@ -41,11 +62,7 @@ impl BackupDir {
pub fn relative_path(&self) -> PathBuf { pub fn relative_path(&self) -> PathBuf {
let mut relative_path = PathBuf::new(); let mut relative_path = self.group.group_path();
relative_path.push(&self.backup_type);
relative_path.push(&self.backup_id);
let date_str = self.backup_time.format("%Y-%m-%dT%H:%M:%S").to_string(); let date_str = self.backup_time.format("%Y-%m-%dT%H:%M:%S").to_string();
@ -249,8 +266,10 @@ impl DataStore {
list.push(BackupInfo { list.push(BackupInfo {
backup_dir: BackupDir { backup_dir: BackupDir {
backup_type: backup_type.to_owned(), group: BackupGroup {
backup_id: backup_id.to_owned(), backup_type: backup_type.to_owned(),
backup_id: backup_id.to_owned(),
},
backup_time: dt, backup_time: dt,
}, },
files, files,