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

src/backup/datastore.rs: protect BackupDir fields, impl new()

Browse Source
This commit is contained in:
Dietmar Maurer
2019-03-04 13:51:36 +01:00
parent 1e9a94e579
commit 9b492eb256
4 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/proxmox-backup-client.rs
View File

@ -112,10 +112,7 @@ fn list_backups(
let epoch = item["backup-time"].as_i64().unwrap();
let backup_time = Local.timestamp(epoch, 0);
let backup_dir = BackupDir {
group: BackupGroup::new(btype, id),
backup_time
};
let backup_dir = BackupDir::new(BackupGroup::new(btype, id), backup_time);
let files = item["files"].as_array().unwrap().iter().map(|v| v.as_str().unwrap().to_owned()).collect();
@ -208,10 +205,7 @@ fn list_snapshots(
let epoch = item["backup-time"].as_i64().unwrap();
let backup_time = Local.timestamp(epoch, 0);
let snapshot = BackupDir {
group: BackupGroup::new(btype, id),
backup_time,
};
let snapshot = BackupDir::new(BackupGroup::new(btype, id), backup_time);
let path = snapshot.relative_path().to_str().unwrap().to_owned();
@ -239,9 +233,9 @@ fn forget_snapshots(
let snapshot = BackupDir::parse(path)?;
let query = tools::json_object_to_query(json!({
"backup-type": snapshot.group.backup_type(),
"backup-id": snapshot.group.backup_id(),
"backup-time": snapshot.backup_time.timestamp(),
"backup-type": snapshot.group().backup_type(),
"backup-id": snapshot.group().backup_id(),
"backup-time": snapshot.backup_time().timestamp(),
}))?;
let mut client = HttpClient::new(&repo.host, &repo.user);