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

Remove comment field from Shared to avoid unnecessary copying

Browse source
This commit is contained in:
Chris Hennick 2024-03-07 14:43:40 -08:00
parent 8efd2339cf
commit e23ba853d3
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/read.rs
View file

@ -14,7 +14,6 @@ use std::borrow::Cow;
use std::collections::HashMap; use std::collections::HashMap;
use std::io::{self, prelude::*}; use std::io::{self, prelude::*};
use std::path::Path; use std::path::Path;
use std::rc::Rc;
use std::sync::Arc; use std::sync::Arc;
#[cfg(any( #[cfg(any(
@ -39,7 +38,7 @@ pub(crate) mod stream;
// Put the struct declaration in a private module to convince rustdoc to display ZipArchive nicely // Put the struct declaration in a private module to convince rustdoc to display ZipArchive nicely
pub(crate) mod zip_archive { pub(crate) mod zip_archive {
use std::rc::Rc; use std::sync::Arc;
/// Extract immutable data from `ZipArchive` to make it cheap to clone /// Extract immutable data from `ZipArchive` to make it cheap to clone
#[derive(Debug)] #[derive(Debug)]
@ -47,7 +46,6 @@ pub(crate) mod zip_archive {
pub(crate) files: Vec<super::ZipFileData>, pub(crate) files: Vec<super::ZipFileData>,
pub(crate) names_map: super::HashMap<String, usize>, pub(crate) names_map: super::HashMap<String, usize>,
pub(super) offset: u64, pub(super) offset: u64,
pub(super) comment: Rc<Vec<u8>>,
pub(super) dir_start: u64, pub(super) dir_start: u64,
pub(super) dir_end: u64, pub(super) dir_end: u64,
} }
@ -75,7 +73,8 @@ pub(crate) mod zip_archive {
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct ZipArchive<R> { pub struct ZipArchive<R> {
pub(super) reader: R, pub(super) reader: R,
pub(super) shared: super::Arc<Shared>, pub(super) shared: Arc<Shared>,
pub(super) comment: Vec<u8>,
} }
} }
@ -426,17 +425,16 @@ impl<R: Read + Seek> ZipArchive<R> {
/// separate function to ease the control flow design. /// separate function to ease the control flow design.
pub(crate) fn get_metadata( pub(crate) fn get_metadata(
reader: &mut R, reader: &mut R,
footer: spec::CentralDirectoryEnd, footer: &spec::CentralDirectoryEnd,
cde_start_pos: u64, cde_start_pos: u64,
) -> ZipResult<Shared> { ) -> ZipResult<Shared> {
// Check if file has a zip64 footer // Check if file has a zip64 footer
let mut results = Self::get_directory_info_zip64(reader, &footer, cde_start_pos) let mut results = Self::get_directory_info_zip64(reader, footer, cde_start_pos)
.unwrap_or_else(|e| vec![Err(e)]); .unwrap_or_else(|e| vec![Err(e)]);
let zip32_result = Self::get_directory_info_zip32(&footer, cde_start_pos); let zip32_result = Self::get_directory_info_zip32(footer, cde_start_pos);
let mut invalid_errors = Vec::new(); let mut invalid_errors = Vec::new();
let mut unsupported_errors = Vec::new(); let mut unsupported_errors = Vec::new();
let mut ok_results = Vec::new(); let mut ok_results = Vec::new();
let comment = Rc::new(footer.zip_file_comment);
results.iter_mut().for_each(|result| { results.iter_mut().for_each(|result| {
if let Ok(central_dir) = result { if let Ok(central_dir) = result {
if let Ok(zip32_central_dir) = &zip32_result { if let Ok(zip32_central_dir) = &zip32_result {
@ -464,7 +462,6 @@ impl<R: Read + Seek> ZipArchive<R> {
*result = Err(ZipError::InvalidArchive( *result = Err(ZipError::InvalidArchive(
"ZIP32 and ZIP64 last-disk numbers don't match", "ZIP32 and ZIP64 last-disk numbers don't match",
)); ));
return;
} }
} }
} }
@ -499,7 +496,6 @@ impl<R: Read + Seek> ZipArchive<R> {
files, files,
names_map, names_map,
offset: dir_info.archive_offset, offset: dir_info.archive_offset,
comment: comment.clone(),
dir_start: dir_info.directory_start, dir_start: dir_info.directory_start,
dir_end, dir_end,
}) })
@ -531,10 +527,11 @@ impl<R: Read + Seek> ZipArchive<R> {
/// This uses the central directory record of the ZIP file, and ignores local file headers /// This uses the central directory record of the ZIP file, and ignores local file headers
pub fn new(mut reader: R) -> ZipResult<ZipArchive<R>> { pub fn new(mut reader: R) -> ZipResult<ZipArchive<R>> {
let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut reader)?; let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut reader)?;
let shared = Self::get_metadata(&mut reader, footer, cde_start_pos)?; let shared = Self::get_metadata(&mut reader, &footer, cde_start_pos)?;
Ok(ZipArchive { Ok(ZipArchive {
reader, reader,
shared: Arc::new(shared), shared: Arc::new(shared),
comment: footer.zip_file_comment,
}) })
} }
/// Extract a Zip archive into a directory, overwriting files if they /// Extract a Zip archive into a directory, overwriting files if they
@ -596,7 +593,7 @@ impl<R: Read + Seek> ZipArchive<R> {
/// Get the comment of the zip archive. /// Get the comment of the zip archive.
pub fn comment(&self) -> &[u8] { pub fn comment(&self) -> &[u8] {
&self.shared.comment &self.comment
} }
/// Returns an iterator over all the file and directory names in this archive. /// Returns an iterator over all the file and directory names in this archive.

5
src/write.rs
View file

@ -435,8 +435,7 @@ impl<A: Read + Write + Seek> ZipWriter<A> {
/// Initializes the archive from an existing ZIP archive, making it ready for append. /// Initializes the archive from an existing ZIP archive, making it ready for append.
pub fn new_append(mut readwriter: A) -> ZipResult<ZipWriter<A>> { pub fn new_append(mut readwriter: A) -> ZipResult<ZipWriter<A>> {
let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut readwriter)?; let (footer, cde_start_pos) = spec::CentralDirectoryEnd::find_and_parse(&mut readwriter)?;
let comment = footer.zip_file_comment.to_owned(); let metadata = ZipArchive::get_metadata(&mut readwriter, &footer, cde_start_pos)?;
let metadata = ZipArchive::get_metadata(&mut readwriter, footer, cde_start_pos)?;
Ok(ZipWriter { Ok(ZipWriter {
inner: Storer(MaybeEncrypted::Unencrypted(readwriter)), inner: Storer(MaybeEncrypted::Unencrypted(readwriter)),
@ -444,7 +443,7 @@ impl<A: Read + Write + Seek> ZipWriter<A> {
files_by_name: metadata.names_map, files_by_name: metadata.names_map,
stats: Default::default(), stats: Default::default(),
writing_to_file: false, writing_to_file: false,
comment, comment: footer.zip_file_comment,
writing_raw: true, // avoid recomputing the last file's header writing_raw: true, // avoid recomputing the last file's header
flush_on_finish_file: false, flush_on_finish_file: false,
}) })