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

Merge branch 'master' into Pr0methean-patch-1

Browse source
This commit is contained in:
Chris Hennick 2023-04-25 16:30:13 -07:00 • committed by GitHub
commit 4a95e12a5d
Signed by: DevComp
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/write.rs
View file

@ -1,7 +1,10 @@
//! Types for creating ZIP archives
use crate::compression::CompressionMethod;
use crate::read::{central_header_to_zip_file, find_content, ZipArchive, ZipFile, ZipFileReader};
use crate::read::{
central_header_to_zip_file, find_content, make_crypto_reader, make_reader, ZipArchive, ZipFile,
ZipFileReader,
};
use crate::result::{ZipError, ZipResult};
use crate::spec;
use crate::types::{AtomicU64, DateTime, System, ZipFileData, DEFAULT_VERSION};
@ -295,12 +298,17 @@ impl<A: Read + Write + Seek> ZipWriter<A> {
}
impl<A: Read + Write + Seek> ZipWriter<A> {
fn reader_by_name<'a>(&'a mut self, name: &str) -> ZipResult<io::Take<&'a mut dyn Read>> {
let data = self.data_by_name(name)?.to_owned();
find_content(&data, self.inner.get_plain())
}
/// Adds another copy of a file already in this archive. This will produce a larger but more
/// widely-compatible archive compared to [shallow_copy_file].
pub fn deep_copy_file(&mut self, src_name: &str, dest_name: &str) -> ZipResult<()> {
self.finish_file()?;
let write_position = self.inner.get_plain().stream_position()?;
let src_data = self.data_by_name(src_name)?.to_owned();
let src_data = self.data_by_name(src_name)?;
let data_start = src_data.data_start.load();
let real_size = src_data.compressed_size.max(write_position - data_start);
let mut options = FileOptions::default()
@ -310,14 +318,12 @@ impl<A: Read + Write + Seek> ZipWriter<A> {
if let Some(perms) = src_data.unix_mode() {
options = options.unix_permissions(perms);
}
let raw_values = ZipRawValues {
crc32: src_data.crc32,
compressed_size: real_size,
uncompressed_size: src_data.uncompressed_size,
};
let reader = self.inner.get_plain();
let mut reader = BufReader::new(ZipFileReader::Raw(find_content(&src_data, reader)?));
let mut reader = BufReader::new(ZipFileReader::Raw(self.reader_by_name(src_name)?));
let mut copy = Vec::with_capacity(real_size as usize);
reader.read_to_end(&mut copy)?;
drop(reader);
@ -877,8 +883,7 @@ impl<W: Write + Seek> ZipWriter<W> {
Ok(())
}
fn data_by_name(&mut self, name: &str) -> ZipResult<&ZipFileData> {
self.finish_file()?;
fn data_by_name(&self, name: &str) -> ZipResult<&ZipFileData> {
for file in self.files.iter() {
if file.file_name == name {
return Ok(file);