From de8e31660bf8b93afa56c63fc42faa5adbcdfb7d Mon Sep 17 00:00:00 2001 From: biluohc Date: Sat, 28 Oct 2017 10:51:46 +0800 Subject: [PATCH 1/3] Modify examples/extract.rs, reduce code. --- examples/extract.rs | 81 ++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 53 deletions(-) diff --git a/examples/extract.rs b/examples/extract.rs index c4ce4c3c..9ae080a1 100644 --- a/examples/extract.rs +++ b/examples/extract.rs @@ -3,15 +3,11 @@ extern crate zip; use std::io; use std::fs; -#[cfg(unix)] -use std::os::unix::fs::PermissionsExt; - fn main() { std::process::exit(real_main()); } -fn real_main() -> i32 -{ +fn real_main() -> i32 { let args: Vec<_> = std::env::args().collect(); if args.len() < 2 { println!("Usage: {} ", args[0]); @@ -22,66 +18,45 @@ fn real_main() -> i32 let mut archive = zip::ZipArchive::new(file).unwrap(); - for i in 0..archive.len() - { + for i in 0..archive.len() { let mut file = archive.by_index(i).unwrap(); let outpath = sanitize_filename(file.name()); - println!("{}", outpath.display()); { let comment = file.comment(); - if comment.len() > 0 { println!(" File comment: {}", comment); } + if !comment.is_empty() { + println!("${} comment: {}", i, comment); + } } - create_directory(outpath.parent().unwrap_or(std::path::Path::new("")), None); - - let perms = convert_permissions(file.unix_mode()); - - if (&*file.name()).ends_with("/") { - create_directory(&outpath, perms); - + if (&*file.name()).ends_with('/') { + println!("${}-> {}", i, outpath.as_path().display()); + fs::create_dir_all(&outpath).unwrap(); + } else { + println!("${}-> {}: {}", i, outpath.as_path().display(), file.size()); + if let Some(p) = outpath.parent() { + if !p.exists() { + fs::create_dir_all(&p).unwrap(); + } + } + let mut outfile = fs::File::create(&outpath).unwrap(); + io::copy(&mut file, &mut outfile).unwrap(); } - else { - write_file(&mut file, &outpath, perms); + + // Get and Set permissions + #[cfg(unix)] + { + use std::os::unix::fs::PermissionsExt; + + if let Some(mode) = file.unix_mode() { + fs::set_permissions(&outpath, fs::Permissions::from_mode(mode)).unwrap(); + } } } - return 0; } -#[cfg(unix)] -fn convert_permissions(mode: Option) -> Option -{ - match mode { - Some(mode) => Some(fs::Permissions::from_mode(mode)), - None => None, - } -} -#[cfg(not(unix))] -fn convert_permissions(_mode: Option) -> Option -{ - None -} - -fn write_file(file: &mut zip::read::ZipFile, outpath: &std::path::Path, perms: Option) -{ - let mut outfile = fs::File::create(&outpath).unwrap(); - io::copy(file, &mut outfile).unwrap(); - if let Some(perms) = perms { - fs::set_permissions(outpath, perms).unwrap(); - } -} - -fn create_directory(outpath: &std::path::Path, perms: Option) -{ - fs::create_dir_all(&outpath).unwrap(); - if let Some(perms) = perms { - fs::set_permissions(outpath, perms).unwrap(); - } -} - -fn sanitize_filename(filename: &str) -> std::path::PathBuf -{ +fn sanitize_filename(filename: &str) -> std::path::PathBuf { let no_null_filename = match filename.find('\0') { Some(index) => &filename[0..index], None => filename, @@ -91,7 +66,7 @@ fn sanitize_filename(filename: &str) -> std::path::PathBuf .components() .filter(|component| match *component { std::path::Component::Normal(..) => true, - _ => false + _ => false, }) .fold(std::path::PathBuf::new(), |mut path, ref cur| { path.push(cur.as_os_str()); From 36146f0f2a11be8d2245414a22ec6af3da96a7c7 Mon Sep 17 00:00:00 2001 From: biluohc Date: Sat, 28 Oct 2017 23:45:07 +0800 Subject: [PATCH 2/3] fix output format style for examples/extract.rs --- examples/extract.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/extract.rs b/examples/extract.rs index 9ae080a1..ffee4837 100644 --- a/examples/extract.rs +++ b/examples/extract.rs @@ -25,15 +25,15 @@ fn real_main() -> i32 { { let comment = file.comment(); if !comment.is_empty() { - println!("${} comment: {}", i, comment); + println!("File {} comment: {}", i, comment); } } if (&*file.name()).ends_with('/') { - println!("${}-> {}", i, outpath.as_path().display()); + println!("Dir {} extracted to \"{}\"", i, outpath.as_path().display()); fs::create_dir_all(&outpath).unwrap(); } else { - println!("${}-> {}: {}", i, outpath.as_path().display(), file.size()); + println!("File {} extracted to \"{}\" ({} bytes)", i, outpath.as_path().display(), file.size()); if let Some(p) = outpath.parent() { if !p.exists() { fs::create_dir_all(&p).unwrap(); From 09f728e71aad100aa541bcc48a3b2dc73438bc73 Mon Sep 17 00:00:00 2001 From: biluohc Date: Sat, 28 Oct 2017 23:48:02 +0800 Subject: [PATCH 3/3] fix output format style for examples/extract.rs --- examples/extract.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/extract.rs b/examples/extract.rs index ffee4837..6fa80e27 100644 --- a/examples/extract.rs +++ b/examples/extract.rs @@ -30,7 +30,7 @@ fn real_main() -> i32 { } if (&*file.name()).ends_with('/') { - println!("Dir {} extracted to \"{}\"", i, outpath.as_path().display()); + println!("File {} extracted to \"{}\"", i, outpath.as_path().display()); fs::create_dir_all(&outpath).unwrap(); } else { println!("File {} extracted to \"{}\" ({} bytes)", i, outpath.as_path().display(), file.size());