diff --git a/src/client/remote_chunk_reader.rs b/src/client/remote_chunk_reader.rs index 3a6cb255..2d56543b 100644 --- a/src/client/remote_chunk_reader.rs +++ b/src/client/remote_chunk_reader.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; use std::sync::Arc; -use anyhow::{Error}; +use anyhow::Error; use super::BackupReader; -use crate::backup::{ReadChunk, DataBlob, CryptConfig}; +use crate::backup::{CryptConfig, DataBlob, ReadChunk}; use crate::tools::runtime::block_on; /// Read chunks from remote host using ``BackupReader`` @@ -12,11 +12,10 @@ pub struct RemoteChunkReader { client: Arc, crypt_config: Option>, cache_hint: HashMap<[u8; 32], usize>, - cache: HashMap<[u8; 32], Vec>, + cache: HashMap<[u8; 32], Vec>, } impl RemoteChunkReader { - /// Create a new instance. /// /// Chunks listed in ``cache_hint`` are cached and kept in RAM. @@ -25,16 +24,18 @@ impl RemoteChunkReader { crypt_config: Option>, cache_hint: HashMap<[u8; 32], usize>, ) -> Self { - - Self { client, crypt_config, cache_hint, cache: HashMap::new() } + Self { + client, + crypt_config, + cache_hint, + cache: HashMap::new(), + } } } impl ReadChunk for RemoteChunkReader { - - fn read_raw_chunk(&mut self, digest:&[u8; 32]) -> Result { - - let mut chunk_data = Vec::with_capacity(4*1024*1024); + fn read_raw_chunk(&mut self, digest: &[u8; 32]) -> Result { + let mut chunk_data = Vec::with_capacity(4 * 1024 * 1024); //tokio::task::block_in_place(|| futures::executor::block_on(self.client.download_chunk(&digest, &mut chunk_data)))?; block_on(async { @@ -51,15 +52,14 @@ impl ReadChunk for RemoteChunkReader { Ok(chunk) } - fn read_chunk(&mut self, digest:&[u8; 32]) -> Result, Error> { - + fn read_chunk(&mut self, digest: &[u8; 32]) -> Result, Error> { if let Some(raw_data) = self.cache.get(digest) { return Ok(raw_data.to_vec()); } let chunk = self.read_raw_chunk(digest)?; - let raw_data = chunk.decode(self.crypt_config.as_ref().map(Arc::as_ref))?; + let raw_data = chunk.decode(self.crypt_config.as_ref().map(Arc::as_ref))?; // fixme: verify digest? @@ -70,5 +70,4 @@ impl ReadChunk for RemoteChunkReader { Ok(raw_data) } - }