src/backup/manifest.rs: improve parser (try_from)
This commit is contained in:
@ -52,13 +52,20 @@ impl TryFrom<Value> for BackupManifest {
|
||||
|
||||
fn try_from(data: Value) -> Result<Self, Error> {
|
||||
|
||||
let backup_type = data["backup_type"].as_str().unwrap();
|
||||
let backup_id = data["backup_id"].as_str().unwrap();
|
||||
let backup_time = data["backup_time"].as_i64().unwrap();
|
||||
let backup_type = crate::tools::required_string_property(&data, "backup_type")?;
|
||||
let backup_id = crate::tools::required_string_property(&data, "backup_id")?;
|
||||
let backup_time = crate::tools::required_integer_property(&data, "backup_time")?;
|
||||
|
||||
let snapshot = BackupDir::new(backup_type, backup_id, backup_time);
|
||||
|
||||
let files = Vec::new();
|
||||
let mut files = Vec::new();
|
||||
for item in crate::tools::required_array_property(&data, "files")?.iter() {
|
||||
let filename = crate::tools::required_string_property(item, "filename")?.to_owned();
|
||||
let csum = crate::tools::required_string_property(item, "csum")?;
|
||||
let csum = proxmox::tools::hex_to_digest(csum)?;
|
||||
let size = crate::tools::required_integer_property(item, "size")? as u64;
|
||||
files.push(FileInfo { filename, size, csum });
|
||||
}
|
||||
|
||||
Ok(Self { files, snapshot })
|
||||
}
|
||||
|
Reference in New Issue
Block a user