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

src/backup/chunk_stream.rs: simplify code

This commit is contained in:
Dietmar Maurer 2019-05-18 10:54:05 +02:00
parent 8a7cc7565f
commit e058744d8f
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backup/chunk_stream.rs
View File

@ -9,13 +9,12 @@ pub struct ChunkStream<S: Stream<Item=Vec<u8>, Error=Error>> {
input: S, input: S,
chunker: Chunker, chunker: Chunker,
buffer: Option<Vec<u8>>, buffer: Option<Vec<u8>>,
rest: Option<Vec<u8>>,
} }
impl <S: Stream<Item=Vec<u8>, Error=Error>> ChunkStream<S> { impl <S: Stream<Item=Vec<u8>, Error=Error>> ChunkStream<S> {
pub fn new(input: S) -> Self { pub fn new(input: S) -> Self {
Self { input, chunker: Chunker::new(4 * 1024 * 1024), buffer: None, rest: None } Self { input, chunker: Chunker::new(4 * 1024 * 1024), buffer: None }
} }
} }
@ -34,18 +33,9 @@ impl <S: Stream<Item=Vec<u8>, Error=Error>> Stream for ChunkStream<S> {
return Ok(Async::NotReady); return Ok(Async::NotReady);
} }
Ok(Async::Ready(None)) => { Ok(Async::Ready(None)) => {
let mut data = self.buffer.take().or_else(|| Some(vec![])).unwrap(); return Ok(Async::Ready(self.buffer.take()));
if let Some(rest) = self.rest.take() { data.extend(rest); }
if data.len() > 0 {
return Ok(Async::Ready(Some(data)));
} else {
return Ok(Async::Ready(None));
} }
} Ok(Async::Ready(Some(data))) => {
Ok(Async::Ready(Some(mut data))) => {
if let Some(rest) = self.rest.take() { data.extend(rest); }
let buffer = self.buffer.get_or_insert_with(|| Vec::with_capacity(1024*1024)); let buffer = self.buffer.get_or_insert_with(|| Vec::with_capacity(1024*1024));
let boundary = self.chunker.scan(&data); let boundary = self.chunker.scan(&data);
@ -60,10 +50,11 @@ impl <S: Stream<Item=Vec<u8>, Error=Error>> Stream for ChunkStream<S> {
let (left, right) = data.split_at(boundary); let (left, right) = data.split_at(boundary);
buffer.extend(left); buffer.extend(left);
let rest = self.rest.get_or_insert_with(|| Vec::with_capacity(right.len())); let result = self.buffer.take();
rest.extend(right);
return Ok(Async::Ready(self.buffer.take())); self.buffer = Some(Vec::from(right));
return Ok(Async::Ready(result));
} else { } else {
panic!("got unexpected chunk boundary from chunker"); panic!("got unexpected chunk boundary from chunker");
} }