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

remove DataChunk file format - use DataBlob instead

Browse Source
This commit is contained in:
Dietmar Maurer
2019-10-06 10:31:06 +02:00
parent c26d4b4573
commit 4ee8f53d07
12 changed files with 184 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backup/read_chunk.rs
View File

@ -3,7 +3,7 @@ use std::sync::Arc;
use super::datastore::*;
use super::crypt_config::*;
use super::data_chunk::*;
use super::data_blob::*;
/// The ReadChunk trait allows reading backup data chunks (local or remote)
pub trait ReadChunk {
@ -32,13 +32,12 @@ impl ReadChunk for LocalChunkReader {
let (path, _) = self.store.chunk_path(digest);
let raw_data = proxmox::tools::fs::file_get_contents(&path)?;
let chunk = DataChunk::from_raw(raw_data, *digest)?;
let chunk = DataBlob::from_raw(raw_data)?;
chunk.verify_crc()?;
let raw_data = match self.crypt_config {
Some(ref crypt_config) => chunk.decode(Some(crypt_config))?,
None => chunk.decode(None)?,
};
let raw_data = chunk.decode(self.crypt_config.clone())?;
// fixme: verify digest?
Ok(raw_data)
}