From c14a8c7f5ddf5d6ecea4c5508b4c7120f36a9be2 Mon Sep 17 00:00:00 2001 From: jonpas Date: Sat, 30 Mar 2019 21:06:43 +0100 Subject: [PATCH] Use add_directory in write_dir example Fix compatibility with some unzip tools. --- examples/write_dir.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/examples/write_dir.rs b/examples/write_dir.rs index 5d689eef..8fa757d9 100644 --- a/examples/write_dir.rs +++ b/examples/write_dir.rs @@ -65,14 +65,21 @@ fn zip_dir(it: &mut Iterator, prefix: &str, writer: T, method: .to_str() .unwrap(); + // Write file or directory explicitly + // Some unzip tools unzip files with directory paths correctly, some do not! if path.is_file() { - println!("adding {:?} as {:?} ...", path, name); + println!("adding file {:?} as {:?} ...", path, name); zip.start_file(name, options)?; let mut f = File::open(path)?; f.read_to_end(&mut buffer)?; zip.write_all(&*buffer)?; buffer.clear(); + } else if !name.is_empty() { + // Only if not root! Avoids path spec / warning + // and mapname conversion failed error on unzip + println!("adding dir {:?} as {:?} ...", path, name); + zip.add_directory(name, options)?; } } zip.finish()?; @@ -93,4 +100,4 @@ fn doit(src_dir: &str, dst_file: &str, method: zip::CompressionMethod) -> zip::r zip_dir(&mut it.filter_map(|e| e.ok()), src_dir, file, method)?; Ok(()) -} \ No newline at end of file +}