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

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	src/read.rs
This commit is contained in:
Wyatt Herkamp 2022-10-13 07:51:43 -04:00
commit efd7f934ca
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/read.rs
View file

@ -448,21 +448,24 @@ 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;
fn inner(file: &mut ZipFile<'_>, directory: &Path) -> ZipResult<()> { for i in 0..self.len() {
let mut file = self.by_index(i)?;
let filepath = file let filepath = file
.enclosed_name() .enclosed_name()
.ok_or(ZipError::InvalidArchive("Invalid file path"))?; .ok_or(ZipError::InvalidArchive("Invalid file path"))?;
let outpath = directory.join(filepath); let outpath = directory.as_ref().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() {
if !p.exists() {
fs::create_dir_all(p)?; fs::create_dir_all(p)?;
} }
}
let mut outfile = fs::File::create(&outpath)?; let mut outfile = fs::File::create(&outpath)?;
io::copy(file, &mut outfile)?; io::copy(&mut file, &mut outfile)?;
} }
// Get and Set permissions // Get and Set permissions
#[cfg(unix)] #[cfg(unix)]
@ -472,15 +475,7 @@ impl<R: Read + io::Seek> ZipArchive<R> {
fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?; fs::set_permissions(&outpath, fs::Permissions::from_mode(mode))?;
} }
} }
Ok(())
} }
for i in 0..self.len() {
let mut file = self.by_index(i)?;
inner(&mut file, directory.as_ref())?;
}
Ok(()) Ok(())
} }