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

src/pxar/decoder.rs: use trait object as reader

Browse Source 
So that the Decoder is no longer genertic.
This commit is contained in:
Dietmar Maurer
2019-11-26 10:45:11 +01:00
parent f701d0335e
commit 99b5b6cba9
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pxar/decoder.rs
View File

@ -26,9 +26,13 @@ pub struct DirectoryEntry {
pub entry: PxarEntry,
}
/// Trait to create ReadSeek Decoder trait objects.
trait ReadSeek: Read + Seek {}
impl <R: Read + Seek> ReadSeek for R {}
// This one needs Read+Seek
pub struct Decoder<R: Read + Seek> {
inner: SequentialDecoder<R>,
pub struct Decoder {
inner: SequentialDecoder<Box<dyn ReadSeek>>,
root_start: u64,
root_end: u64,
}
@ -36,10 +40,11 @@ pub struct Decoder<R: Read + Seek> {
const HEADER_SIZE: u64 = std::mem::size_of::<PxarHeader>() as u64;
const GOODBYE_ITEM_SIZE: u64 = std::mem::size_of::<PxarGoodbyeItem>() as u64;
impl<R: Read + Seek> Decoder<R> {
pub fn new(mut reader: R) -> Result<Self, Error> {
impl Decoder {
pub fn new<R: Read + Seek + 'static>(mut reader: R) -> Result<Self, Error> {
let root_end = reader.seek(SeekFrom::End(0))?;
let inner = SequentialDecoder::new(reader, super::flags::DEFAULT);
let boxed_reader: Box<dyn ReadSeek + 'static> = Box::new(reader);
let inner = SequentialDecoder::new(boxed_reader, super::flags::DEFAULT);
Ok(Self { inner, root_start: 0, root_end })
}