This commit is contained in:
Dietmar Maurer 2019-10-13 09:39:21 +02:00
parent e17d5d864d
commit 511a47bd73

View File

@ -52,18 +52,20 @@ impl TryFrom<Value> for BackupManifest {
fn try_from(data: Value) -> Result<Self, Error> { fn try_from(data: Value) -> Result<Self, Error> {
let backup_type = crate::tools::required_string_property(&data, "backup_type")?; use crate::tools::{required_string_property, required_integer_property, required_array_property};
let backup_id = crate::tools::required_string_property(&data, "backup_id")?;
let backup_time = crate::tools::required_integer_property(&data, "backup_time")?; let backup_type = required_string_property(&data, "backup_type")?;
let backup_id = required_string_property(&data, "backup_id")?;
let backup_time = required_integer_property(&data, "backup_time")?;
let snapshot = BackupDir::new(backup_type, backup_id, backup_time); let snapshot = BackupDir::new(backup_type, backup_id, backup_time);
let mut files = Vec::new(); let mut files = Vec::new();
for item in crate::tools::required_array_property(&data, "files")?.iter() { for item in required_array_property(&data, "files")?.iter() {
let filename = crate::tools::required_string_property(item, "filename")?.to_owned(); let filename = required_string_property(item, "filename")?.to_owned();
let csum = crate::tools::required_string_property(item, "csum")?; let csum = required_string_property(item, "csum")?;
let csum = proxmox::tools::hex_to_digest(csum)?; let csum = proxmox::tools::hex_to_digest(csum)?;
let size = crate::tools::required_integer_property(item, "size")? as u64; let size = required_integer_property(item, "size")? as u64;
files.push(FileInfo { filename, size, csum }); files.push(FileInfo { filename, size, csum });
} }