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("");
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)?;
}
// 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))?;
use anyhow::{bail, format_err, Error};
use lazy_static::lazy_static;
-use serde_json::Value;
use proxmox::tools::fs::{replace_file, CreateOptions};
Ok((manifest, raw_size))
}
- pub fn load_manifest_json(
- &self,
- backup_dir: &BackupDir,
- ) -> Result<Value, Error> {
- let blob = self.load_blob(backup_dir, MANIFEST_BLOB_NAME)?;
- // no expected digest available
- let manifest_data = blob.decode(None, None)?;
- let manifest: Value = serde_json::from_slice(&manifest_data[..])?;
- Ok(manifest)
- }
-
pub fn store_manifest(
&self,
backup_dir: &BackupDir,
- manifest: Value,
+ manifest: BackupManifest,
) -> Result<(), Error> {
+ let manifest = serde_json::to_value(manifest)?;
let manifest = serde_json::to_string_pretty(&manifest)?;
let blob = DataBlob::encode(manifest.as_bytes(), None, true)?;
let raw_data = blob.raw_data();
upid,
};
manifest.unprotected["verify_state"] = serde_json::to_value(verify_state)?;
- datastore.store_manifest(&backup_dir, serde_json::to_value(manifest)?)
+ datastore.store_manifest(&backup_dir, manifest)
.map_err(|err| format_err!("unable to store manifest blob - {}", err))?;
Ok(error_count == 0)