pub fn new_read(file: T) -> Self {
FileReader { file: Box::new(file), eof : false }
}
+ /// Constructs a new instance of `FileReader` using a boxed resource.
+ pub fn new_read_boxed(file: Box<T>) -> Self {
+ FileReader { file, eof : false }
+ }
+ /// Destroys the reader and releases the reader resource for a further use.
+ pub fn finish(self) -> Box<T> { self.file }
}
impl<T: Read+Seek> ByteIO for FileReader<T> {
if ret.is_err() { return Err(ByteIOError::ReadError); }
let sz = ret.unwrap();
if sz < buf.len() {
- if let Err(_err) = self.file.read(&mut buf[sz..][..1]) {
+ if let Err(_err) = self.file.read_exact(&mut buf[sz..][..1]) {
self.eof = true;
+ if sz == 0 {
+ return Err(ByteIOError::EOF);
+ }
} else {
return Ok(sz + 1);
}
}
fn tell(&mut self) -> u64 {
- self.file.seek(SeekFrom::Current(0)).unwrap()
+ self.file.stream_position().unwrap()
}
fn seek(&mut self, pos: SeekFrom) -> ByteIOResult<u64> {
/// Destroys the reader and releases the reader resource for a further use.
pub fn finish(self) -> Box<T> { self.file }
fn real_tell(&mut self) -> u64 {
- self.file.seek(SeekFrom::Current(0)).unwrap()
+ self.file.stream_position().unwrap()
}
fn max_read_len(&mut self, len: usize) -> usize {
if let Some(epos) = self.end {
}
fn read_buf(&mut self, buf: &mut [u8]) -> ByteIOResult<usize> {
+ if let Some(epos) = self.end {
+ if self.real_tell() >= epos {
+ self.eof = true;
+ return Err(ByteIOError::EOF);
+ }
+ }
let len = self.max_read_len(buf.len());
match self.file.read_exact(&mut buf[..len]) {
Ok(()) if len == buf.len() => Ok(buf.len()),
}
fn read_buf_some(&mut self, buf: &mut [u8]) -> ByteIOResult<usize> {
+ if let Some(epos) = self.end {
+ if self.real_tell() >= epos {
+ self.eof = true;
+ return Err(ByteIOError::EOF);
+ }
+ }
let len = self.max_read_len(buf.len());
let ret = self.file.read(&mut buf[..len]);
if ret.is_err() { return Err(ByteIOError::ReadError); }
let sz = ret.unwrap();
if sz < len {
- if let Err(_err) = self.file.read(&mut buf[sz..][..1]) {
- self.eof = true;
- } else {
+ if let Ok(1) = self.file.read(&mut buf[sz..][..1]) {
return Ok(sz + 1);
}
+ self.eof = true;
+ if sz == 0 {
+ return Err(ByteIOError::EOF);
+ }
}
Ok(sz)
}
}
fn tell(&mut self) -> u64 {
- self.file.seek(SeekFrom::Current(0)).unwrap() - self.start
+ self.file.stream_position().unwrap() - self.start
}
fn seek(&mut self, pos: SeekFrom) -> ByteIOResult<u64> {
}
fn tell(&mut self) -> u64 {
- self.file.seek(SeekFrom::Current(0)).unwrap()
+ self.file.stream_position().unwrap()
}
fn seek(&mut self, pos: SeekFrom) -> ByteIOResult<u64> {