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

Merge branch 'srijs-file-info-perf-improvements'

Browse source
This commit is contained in:
Mathijs van de Nes 2018-11-12 20:40:36 +01:00
commit 7171b496d0
4 changed files with 65 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/file_info.rs
View file

@ -1,6 +1,7 @@
extern crate zip;
use std::fs;
use std::io::BufReader;
fn main() {
std::process::exit(real_main());
@ -14,8 +15,9 @@ fn real_main() -> i32 {
}
let fname = std::path::Path::new(&*args[1]);
let file = fs::File::open(&fname).unwrap();
let reader = BufReader::new(file);
let mut archive = zip::ZipArchive::new(file).unwrap();
let mut archive = zip::ZipArchive::new(reader).unwrap();
for i in 0..archive.len() {
let file = archive.by_index(i).unwrap();

63
src/read.rs
View file

@ -10,9 +10,9 @@ use std::collections::HashMap;
use std::borrow::Cow;
use podio::{ReadPodExt, LittleEndian};
use types::{ZipFileData, System};
use types::{ZipFileData, System, DateTime};
use cp437::FromCp437;
use msdos_time::{TmMsDosExt, MsDosDateTime};
use msdos_time::MsDosDateTime;
#[cfg(feature = "flate2")]
use flate2;
@ -27,20 +27,6 @@ mod ffi {
pub const S_IFREG: u32 = 0o0100000;
}
const TM_1980_01_01 : ::time::Tm = ::time::Tm {
tm_sec: 0,
tm_min: 0,
tm_hour: 0,
tm_mday: 1,
tm_mon: 0,
tm_year: 80,
tm_wday: 2,
tm_yday: 0,
tm_isdst: -1,
tm_utcoff: 0,
tm_nsec: 0
};
/// Wrapper for reading the contents of a ZIP file.
///
/// ```
@ -282,15 +268,28 @@ impl<R: Read+io::Seek> ZipArchive<R>
pub fn by_index<'a>(&'a mut self, file_number: usize) -> ZipResult<ZipFile<'a>>
{
if file_number >= self.files.len() { return Err(ZipError::FileNotFound); }
let ref data = self.files[file_number];
let pos = data.data_start;
let ref mut data = self.files[file_number];
if data.encrypted
{
return unsupported_zip_error("Encrypted files are not supported")
}
self.reader.seek(io::SeekFrom::Start(pos))?;
// Parse local header
self.reader.seek(io::SeekFrom::Start(data.header_start))?;
let signature = self.reader.read_u32::<LittleEndian>()?;
if signature != spec::LOCAL_FILE_HEADER_SIGNATURE
{
return Err(ZipError::InvalidArchive("Invalid local file header"))
}
self.reader.seek(io::SeekFrom::Current(22))?;
let file_name_length = self.reader.read_u16::<LittleEndian>()? as u64;
let extra_field_length = self.reader.read_u16::<LittleEndian>()? as u64;
let magic_and_header = 4 + 22 + 2 + 2;
data.data_start = data.header_start + magic_and_header + file_name_length + extra_field_length;
self.reader.seek(io::SeekFrom::Start(data.data_start))?;
let limit_reader = (self.reader.by_ref() as &mut Read).take(data.compressed_size);
Ok(ZipFile { reader: make_reader(data.compression_method, data.crc32, limit_reader)?, data: Cow::Borrowed(data) })
@ -354,7 +353,7 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R, archive_offset:
version_made_by: version_made_by as u8,
encrypted: encrypted,
compression_method: CompressionMethod::from_u16(compression_method),
last_modified_time: ::time::Tm::from_msdos(MsDosDateTime::new(last_mod_time, last_mod_date)).unwrap_or(TM_1980_01_01),
last_modified_time: DateTime::MsDos(MsDosDateTime::new(last_mod_time, last_mod_date)),
crc32: crc32,
compressed_size: compressed_size as u64,
uncompressed_size: uncompressed_size as u64,
@ -374,26 +373,6 @@ fn central_header_to_zip_file<R: Read+io::Seek>(reader: &mut R, archive_offset:
// Account for shifted zip offsets.
result.header_start += archive_offset;
// Remember end of central header
let return_position = reader.seek(io::SeekFrom::Current(0))?;
// Parse local header
reader.seek(io::SeekFrom::Start(result.header_start))?;
let signature = reader.read_u32::<LittleEndian>()?;
if signature != spec::LOCAL_FILE_HEADER_SIGNATURE
{
return Err(ZipError::InvalidArchive("Invalid local file header"))
}
reader.seek(io::SeekFrom::Current(22))?;
let file_name_length = reader.read_u16::<LittleEndian>()? as u64;
let extra_field_length = reader.read_u16::<LittleEndian>()? as u64;
let magic_and_header = 4 + 22 + 2 + 2;
result.data_start = result.header_start + magic_and_header + file_name_length + extra_field_length;
// Go back after the central header
reader.seek(io::SeekFrom::Start(return_position))?;
Ok(result)
}
@ -487,7 +466,7 @@ impl<'a> ZipFile<'a> {
}
/// Get the time the file was last modified
pub fn last_modified(&self) -> ::time::Tm {
self.data.last_modified_time
self.data.last_modified_time.to_tm()
}
/// Get unix mode for the file
pub fn unix_mode(&self) -> Option<u32> {
@ -615,7 +594,7 @@ pub fn read_zipfile_from_stream<'a, R: io::Read>(reader: &'a mut R) -> ZipResult
version_made_by: version_made_by as u8,
encrypted: encrypted,
compression_method: compression_method,
last_modified_time: ::time::Tm::from_msdos(MsDosDateTime::new(last_mod_time, last_mod_date)).unwrap_or(TM_1980_01_01),
last_modified_time: DateTime::MsDos(MsDosDateTime::new(last_mod_time, last_mod_date)),
crc32: crc32,
compressed_size: compressed_size as u64,
uncompressed_size: uncompressed_size as u64,

41
src/types.rs
View file

@ -1,6 +1,7 @@
//! Types that specify what is contained in a ZIP.
use time;
use msdos_time::{TmMsDosExt, MsDosDateTime};
#[derive(Clone, Copy, Debug, PartialEq)]
pub enum System
@ -25,6 +26,42 @@ impl System {
}
}
const TM_1980_01_01 : time::Tm = time::Tm {
tm_sec: 0,
tm_min: 0,
tm_hour: 0,
tm_mday: 1,
tm_mon: 0,
tm_year: 80,
tm_wday: 2,
tm_yday: 0,
tm_isdst: -1,
tm_utcoff: 0,
tm_nsec: 0
};
#[derive(Debug, Clone)]
pub enum DateTime {
Tm(time::Tm),
MsDos(MsDosDateTime)
}
impl DateTime {
pub fn to_tm(&self) -> time::Tm {
match self {
&DateTime::Tm(ref tm) => *tm,
&DateTime::MsDos(ref ms) => time::Tm::from_msdos(*ms).unwrap_or(TM_1980_01_01)
}
}
pub fn to_msdos(&self) -> Result<MsDosDateTime, ::std::io::Error> {
match self {
&DateTime::Tm(ref tm) => tm.to_msdos(),
&DateTime::MsDos(ref ms) => Ok(*ms)
}
}
}
pub const DEFAULT_VERSION: u8 = 46;
/// Structure representing a ZIP file.
@ -40,7 +77,7 @@ pub struct ZipFileData
/// Compression method used to store the file
pub compression_method: ::compression::CompressionMethod,
/// Last modified time. This will only have a 2 second precision.
pub last_modified_time: time::Tm,
pub last_modified_time: DateTime,
/// CRC32 checksum
pub crc32: u32,
/// Size of the file in the ZIP
@ -120,7 +157,7 @@ mod test {
version_made_by: 0,
encrypted: false,
compression_method: ::compression::CompressionMethod::Stored,
last_modified_time: time::empty_tm(),
last_modified_time: DateTime::Tm(time::empty_tm()),
crc32: 0,
compressed_size: 0,
uncompressed_size: 0,

5
src/write.rs
View file

@ -1,7 +1,7 @@
//! Structs for creating a new zip archive
use compression::CompressionMethod;
use types::{ZipFileData, System, DEFAULT_VERSION};
use types::{ZipFileData, System, DEFAULT_VERSION, DateTime};
use spec;
use crc32;
use result::{ZipResult, ZipError};
@ -11,7 +11,6 @@ use std::io::prelude::*;
use std::mem;
use time;
use podio::{WritePodExt, LittleEndian};
use msdos_time::TmMsDosExt;
#[cfg(feature = "flate2")]
use flate2;
@ -204,7 +203,7 @@ impl<W: Write+io::Seek> ZipWriter<W>
version_made_by: DEFAULT_VERSION,
encrypted: false,
compression_method: options.compression_method,
last_modified_time: options.last_modified_time,
last_modified_time: DateTime::Tm(options.last_modified_time),
crc32: 0,
compressed_size: 0,
uncompressed_size: 0,