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

Avoid dup monomorphization in ZipArchive::extract

Browse source 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
This commit is contained in:
Jiahao XU 2022-07-20 23:50:34 +10:00
parent 199796cbbf
commit 6402eb0d22
No known key found for this signature in database
GPG key ID: 591C0B03040416D6
1 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/read.rs
View file

@ -448,33 +448,37 @@ impl<R: Read + io::Seek> ZipArchive<R> {
pub fn extract<P: AsRef<Path>>(&mut self, directory: P) -> ZipResult<()> { pub fn extract<P: AsRef<Path>>(&mut self, directory: P) -> ZipResult<()> {
use std::fs; use std::fs;
for i in 0..self.len() { fn inner(this: &mut ZipArchive<impl Read + io::Seek>, directory: &Path) -> ZipResult<()> {
let mut file = self.by_index(i)?; for i in 0..this.len() {
let filepath = file let mut file = this.by_index(i)?;
.enclosed_name() let filepath = file
.ok_or(ZipError::InvalidArchive("Invalid file path"))?; .enclosed_name()
.ok_or(ZipError::InvalidArchive("Invalid file path"))?;
let outpath = directory.as_ref().join(filepath); let outpath = directory.join(filepath);
if file.name().ends_with('/') { if file.name().ends_with('/') {
fs::create_dir_all(&outpath)?; fs::create_dir_all(&outpath)?;
} else { } else {
if let Some(p) = outpath.parent() { if let Some(p) = outpath.parent() {
fs::create_dir_all(&p)?; fs::create_dir_all(&p)?;
}
let mut outfile = fs::File::create(&outpath)?;
io::copy(&mut file, &mut outfile)?;
} }
let mut outfile = fs::File::create(&outpath)?; // Get and Set permissions
io::copy(&mut file, &mut outfile)?; #[cfg(unix)]
} {
// Get and Set permissions use std::os::unix::fs::PermissionsExt;
#[cfg(unix)] if let Some(mode) = file.unix_mode() {
{ fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?;
use std::os::unix::fs::PermissionsExt; }
if let Some(mode) = file.unix_mode() {
fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?;
} }
} }
Ok(())
} }
Ok(())
inner(self, directory.as_ref())
} }
/// Number of files contained in this zip. /// Number of files contained in this zip.