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

Improve extra field support.

Browse source 
- Switch to compression method only once as was before extra data
  support allowing future encoders to do early writes when created.
- Reduce seeks by calculating offsets.
- Use `Stored` instead of feature dependent default for example.
  There is a 2-byte pad length difference with deflate disabled.
This commit is contained in:
Rouven Spreckels 2020-10-01 09:41:32 +02:00
parent d1d4326bff
commit ba8307abc7
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/write.rs
View file

@ -260,8 +260,6 @@ impl<W: Write + io::Seek> ZipWriter<W> {
self.files.push(file); self.files.push(file);
} }
self.inner.switch_to(options.compression_method)?;
Ok(()) Ok(())
} }
@ -302,6 +300,7 @@ impl<W: Write + io::Seek> ZipWriter<W> {
} }
*options.permissions.as_mut().unwrap() |= 0o100000; *options.permissions.as_mut().unwrap() |= 0o100000;
self.start_entry(name, options)?; self.start_entry(name, options)?;
self.inner.switch_to(options.compression_method)?;
self.writing_to_file = true; self.writing_to_file = true;
Ok(()) Ok(())
} }
@ -363,7 +362,8 @@ impl<W: Write + io::Seek> ZipWriter<W> {
/// ///
/// ``` /// ```
/// use byteorder::{LittleEndian, WriteBytesExt}; /// use byteorder::{LittleEndian, WriteBytesExt};
/// use zip::{ZipArchive, ZipWriter, write::FileOptions, result::ZipResult}; /// use zip::{ZipArchive, ZipWriter, result::ZipResult};
/// use zip::{write::FileOptions, CompressionMethod};
/// use std::io::{Write, Cursor}; /// use std::io::{Write, Cursor};
/// ///
/// # fn main() -> ZipResult<()> { /// # fn main() -> ZipResult<()> {
@ -371,7 +371,8 @@ impl<W: Write + io::Seek> ZipWriter<W> {
/// ///
/// { /// {
/// let mut zip = ZipWriter::new(&mut archive); /// let mut zip = ZipWriter::new(&mut archive);
/// let options = FileOptions::default(); /// let options = FileOptions::default()
/// .compression_method(CompressionMethod::Stored);
/// ///
/// zip.start_file_with_extra_data("identical_extra_data.txt", options)?; /// zip.start_file_with_extra_data("identical_extra_data.txt", options)?;
/// let extra_data = b"local and central extra data"; /// let extra_data = b"local and central extra data";
@ -389,7 +390,7 @@ impl<W: Write + io::Seek> ZipWriter<W> {
/// let data_start = data_start as usize + 4 + extra_data.len() + 4; /// let data_start = data_start as usize + 4 + extra_data.len() + 4;
/// let align = 64; /// let align = 64;
/// let pad_length = (align - data_start % align) % align; /// let pad_length = (align - data_start % align) % align;
/// assert_eq!(pad_length, 17); /// assert_eq!(pad_length, 19);
/// zip.write_u16::<LittleEndian>(0x0000)?; /// zip.write_u16::<LittleEndian>(0x0000)?;
/// zip.write_u16::<LittleEndian>(pad_length as u16)?; /// zip.write_u16::<LittleEndian>(pad_length as u16)?;
/// zip.write_all(&vec![0; pad_length])?; /// zip.write_all(&vec![0; pad_length])?;
@ -462,15 +463,13 @@ impl<W: Write + io::Seek> ZipWriter<W> {
} }
if !self.writing_to_central_extra_field_only { if !self.writing_to_central_extra_field_only {
self.inner.switch_to(CompressionMethod::Stored)?;
let writer = self.inner.get_plain(); let writer = self.inner.get_plain();
// Append extra data to local file header and keep it for central file header. // Append extra data to local file header and keep it for central file header.
writer.seek(io::SeekFrom::Start(file.data_start))?;
writer.write_all(&file.extra_field)?; writer.write_all(&file.extra_field)?;
// Update final `data_start` as done in `start_entry()`. // Update final `data_start`.
let header_end = writer.seek(io::SeekFrom::Current(0))?; let header_end = file.data_start + file.extra_field.len() as u64;
self.stats.start = header_end; self.stats.start = header_end;
file.data_start = header_end; file.data_start = header_end;