From 2ffbd2fddc01f1568568e43e800ad840f9acc693 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Mon, 2 Dec 2019 00:27:15 +0800 Subject: [PATCH] ok ? --- src/zip_util.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/zip_util.rs b/src/zip_util.rs index 6d23a1e..474c95e 100644 --- a/src/zip_util.rs +++ b/src/zip_util.rs @@ -43,24 +43,23 @@ pub fn zip_file(target: &str, zip_file: &str) -> XResult<()> { let zip_fn = get_file_name(target_path); zip.start_file(zip_fn, options)?; copy_io_with_head(&mut File::open(target_path)?, &mut zip, -1, "Compressing")?; + + zip.finish()?; } else { - // TODO dir let mut_zip = RefCell::new(zip); walk_dir(&target_path, &|p, e| { print_message(MessageType::WARN, &format!("Compress {} failed: {}", &p.display(), &e)); }, &|f| { let options = FileOptions::default().compression_method(CompressionMethod::Stored); let mut m_zip = mut_zip.borrow_mut(); - match m_zip.start_file("", options) { + match m_zip.start_file("", options) { // TODO filename Ok(_) => (), Err(e) => print_message(MessageType::WARN, &format!("Compress {} failed: {}", &f.display(), &e)), }; - // mut_zip.replace(m_zip); }, &|_| { true })?; - } - // TODO finish - // zip.finish()?; + mut_zip.borrow_mut().finish()?; + } Ok(()) }