first step towards supporting skipping the header in the stream

Sebastian Thiel committed 6 years ago

Commit 8e45f531 parent f10ed752 files · +28 −4Browse files

Unified · Split

2 files

@@ -4,5 +4,29 @@ const HEADER_READ_UNCOMPRESSED_BYTES: usize = 512; · 3 unmodified lines
4	mod db;	4	mod db;
5	mod object;	5	mod object;
6		6
		7	pub mod io {
		8	use crate::zlib::stream::InflateReader;
		9	use std::io::{BufReader, Bytes, Read};
		10	use std::iter::Skip;
		11
		12	pub enum ObjectReader {
		13	File(InflateReader<BufReader<std::fs::File>>),
		14	}
		15
		16	impl ObjectReader {
		17	pub fn from_read(header_size: usize, file: std::fs::File) -> ObjectReader {
		18	ObjectReader::File(InflateReader::new(file))
		19	}
		20	}
		21
		22	impl std::io::Read for ObjectReader {
		23	fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
		24	match self {
		25	ObjectReader::File(r) => r.read(buf),
		26	}
		27	}
		28	}
		29	}
		30
7	pub use db::{Db, Error as DbError};	31	pub use db::{Db, Error as DbError};
8	pub use object::*;	32	pub use object::*;

-use crate::zlib::stream::InflateReader;
 use crate::{
+    loose::io::ObjectReader,
     loose::{HEADER_READ_COMPRESSED_BYTES, HEADER_READ_UNCOMPRESSED_BYTES},
     zlib,
 };
 use object::borrowed;
 use quick_error::quick_error;
 use smallvec::SmallVec;
-use std::io::BufReader;
 use std::{io::Read, path::PathBuf};
 quick_error! {
         })
     }
-    pub fn stream(&self) -> Result<InflateReader<BufReader<std::fs::File>>, Error> {
+    pub fn stream(&self) -> Result<ObjectReader, Error> {
         match &self.path {
-            Some(path) => Ok(InflateReader::new(
+            Some(path) => Ok(ObjectReader::from_read(
+                self.header_size,
                 std::fs::File::open(path).map_err(|e| Error::Io(e, "open", path.to_owned()))?,
             )),
             None => unimplemented!("stream with buffer"),

Keyboard shortcuts