DevComp/zip-rs-wasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename ZipContainer to ZipReader

Browse source
This commit is contained in:
Mathijs van de Nes 2014-09-10 16:34:57 +02:00
parent 916dc6c6e5
commit e9d42a9dc9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bin/extract.rs
View file

@ -6,7 +6,7 @@ fn main()
let fname = Path::new(args[1].as_slice()); let fname = Path::new(args[1].as_slice());
let file = std::io::File::open(&fname); let file = std::io::File::open(&fname);
let zipcontainer = zip::reader::ZipContainer::new(file).unwrap(); let zipcontainer = zip::reader::ZipReader::new(file).unwrap();
for file in zipcontainer.files() for file in zipcontainer.files()
{ {

12
src/reader.rs
View file

@ -7,7 +7,7 @@ use std::io::{IoResult, IoError};
use std::cell::RefCell; use std::cell::RefCell;
use flate2::FlateReader; use flate2::FlateReader;
pub struct ZipContainer<T> pub struct ZipReader<T>
{ {
inner: RefCell<T>, inner: RefCell<T>,
files: Vec<ZipFile>, files: Vec<ZipFile>,
@ -23,11 +23,11 @@ fn unsupported_zip_error<T>(detail: &str) -> IoResult<T>
}) })
} }
impl<T: Reader+Seek> ZipContainer<T> impl<T: Reader+Seek> ZipReader<T>
{ {
pub fn new(inner: T) -> IoResult<ZipContainer<T>> pub fn new(inner: T) -> IoResult<ZipReader<T>>
{ {
let mut result = ZipContainer { inner: RefCell::new(inner), files: Vec::new() }; let mut result = ZipReader { inner: RefCell::new(inner), files: Vec::new() };
{ {
let reader = &mut *result.inner.borrow_mut(); let reader = &mut *result.inner.borrow_mut();
@ -43,7 +43,7 @@ impl<T: Reader+Seek> ZipContainer<T>
try!(reader.seek(directory_start, io::SeekSet)); try!(reader.seek(directory_start, io::SeekSet));
for i in range(0, number_of_files) for i in range(0, number_of_files)
{ {
files.push(try!(ZipContainer::parse_directory(reader))); files.push(try!(ZipReader::parse_directory(reader)));
} }
result.files = files; result.files = files;
@ -57,7 +57,7 @@ impl<T: Reader+Seek> ZipContainer<T>
let cdh = try!(spec::CentralDirectoryHeader::parse(reader)); let cdh = try!(spec::CentralDirectoryHeader::parse(reader));
// Remember position // Remember position
let pos = try!(reader.tell()) as i64; let pos = try!(reader.tell()) as i64;
let result = ZipContainer::parse_file(reader, cdh); let result = ZipReader::parse_file(reader, cdh);
// Jump back for next directory // Jump back for next directory
try!(reader.seek(pos, io::SeekSet)); try!(reader.seek(pos, io::SeekSet));
result result