Merge pull request #317 from NobodyXu/optimize

Optimize `ZipArchive::extract`

src/read.rs

@@ -448,24 +448,21 @@ impl<R: Read + io::Seek> ZipArchive<R> {
     pub fn extract<P: AsRef<Path>>(&mut self, directory: P) -> ZipResult<()> {
         use std::fs;
 
-        for i in 0..self.len() {
+        fn inner(file: &mut ZipFile<'_>, directory: &Path) -> ZipResult<()> {
-            let mut file = self.by_index(i)?;
             let filepath = file
                 .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('/') {
                 fs::create_dir_all(&outpath)?;
             } else {
                 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)?;
-                io::copy(&mut file, &mut outfile)?;
+                io::copy(file, &mut outfile)?;
             }
             // Get and Set permissions
             #[cfg(unix)]
@@ -475,7 +472,15 @@ impl<R: Read + io::Seek> ZipArchive<R> {
                     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(())
     }