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

datastore: remove load_manifest_json

Browse Source 
There's no point in having that as a seperate method, just parse the
thing into a struct and write it back out correctly.

Also makes further changes to the method simpler.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter
2020-10-14 14:16:35 +02:00
committed by Dietmar Maurer
parent bfa54f2e85
commit 883aa6d5a4
4 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1428,9 +1428,9 @@ fn get_notes(
let allowed = (user_privs & PRIV_DATASTORE_READ) != 0;
if !allowed { check_backup_owner(&datastore, backup_dir.group(), &userid)?; }
let manifest = datastore.load_manifest_json(&backup_dir)?;
let (manifest, _) = datastore.load_manifest(&backup_dir)?;
let notes = manifest["unprotected"]["notes"]
let notes = manifest.unprotected["notes"]
.as_str()
.unwrap_or("");
@ -1481,9 +1481,9 @@ fn set_notes(
let allowed = (user_privs & PRIV_DATASTORE_READ) != 0;
if !allowed { check_backup_owner(&datastore, backup_dir.group(), &userid)?; }
let mut manifest = datastore.load_manifest_json(&backup_dir)?;
let (mut manifest, _) = datastore.load_manifest(&backup_dir)?;
manifest["unprotected"]["notes"] = notes.into();
manifest.unprotected["notes"] = notes.into();
datastore.store_manifest(&backup_dir, manifest)?;

4
src/api2/backup/environment.rs
View File

@ -473,12 +473,12 @@ impl BackupEnvironment {
}
// check manifest
let mut manifest = self.datastore.load_manifest_json(&self.backup_dir)
let (mut manifest, _) = self.datastore.load_manifest(&self.backup_dir)
.map_err(|err| format_err!("unable to load manifest blob - {}", err))?;
let stats = serde_json::to_value(state.backup_stat)?;
manifest["unprotected"]["chunk_upload_stats"] = stats;
manifest.unprotected["chunk_upload_stats"] = stats;
self.datastore.store_manifest(&self.backup_dir, manifest)
.map_err(|err| format_err!("unable to store manifest blob - {}", err))?;