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

src/backup/manifest.rs: use serde_json::from_value() to deserialize data

Browse Source 
Also modified from_data compute signature ditectly from json.
This commit is contained in:
Dietmar Maurer
2020-07-09 09:48:30 +02:00
parent 512d50a455
commit 3dacedce71
2 changed files with 14 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/backup_writer.rs
View File

@ -453,8 +453,6 @@ impl BackupWriter {
/// Download backup manifest (index.json) of last backup
pub async fn download_previous_manifest(&self) -> Result<BackupManifest, Error> {
use std::convert::TryFrom;
let mut raw_data = Vec::with_capacity(64 * 1024);
let param = json!({ "archive-name": MANIFEST_BLOB_NAME });
@ -463,8 +461,8 @@ impl BackupWriter {
let blob = DataBlob::from_raw(raw_data)?;
blob.verify_crc()?;
let data = blob.decode(self.crypt_config.as_ref().map(Arc::as_ref))?;
let json: Value = serde_json::from_slice(&data[..])?;
let manifest = BackupManifest::try_from(json)?;
let manifest = BackupManifest::from_data(&data[..], self.crypt_config.as_ref().map(Arc::as_ref))?;
Ok(manifest)
}