From fd888b9502d2ee1cd8b60ba8b3b0455e021bb9b8 Mon Sep 17 00:00:00 2001 From: pingfanh <89574481+pingfanH@users.noreply.github.com> Date: Thu, 26 Oct 2023 22:12:36 +0800 Subject: [PATCH 1/3] Update write_zip.rs --- crossbundle/tools/src/commands/android/common/write_zip.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crossbundle/tools/src/commands/android/common/write_zip.rs b/crossbundle/tools/src/commands/android/common/write_zip.rs index 9d32eec3..917694ca 100644 --- a/crossbundle/tools/src/commands/android/common/write_zip.rs +++ b/crossbundle/tools/src/commands/android/common/write_zip.rs @@ -1,12 +1,13 @@ use std::path::Path; use zip::ZipWriter; +use zip::write::FileOptions; use zip_extensions::write::ZipWriterExtensions; /// Writing files into archive pub fn zip_write(source_path: &Path, archive_file: &Path) -> zip::result::ZipResult<()> { let file = std::fs::File::create(archive_file)?; let mut zip = ZipWriter::new(file); - zip.create_from_directory(&source_path.to_path_buf())?; + zip.add_directory_from_path(&source_path.to_path_buf(),FileOptions::default())?; Ok(()) } From 41f9194bdb08cf8ec509571462b6a28132e539af Mon Sep 17 00:00:00 2001 From: pingfanh <89574481+pingfanH@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:51:18 +0800 Subject: [PATCH 2/3] Update write_zip.rs --- crossbundle/tools/src/commands/android/common/write_zip.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossbundle/tools/src/commands/android/common/write_zip.rs b/crossbundle/tools/src/commands/android/common/write_zip.rs index 917694ca..4d1bd163 100644 --- a/crossbundle/tools/src/commands/android/common/write_zip.rs +++ b/crossbundle/tools/src/commands/android/common/write_zip.rs @@ -7,7 +7,7 @@ use zip_extensions::write::ZipWriterExtensions; pub fn zip_write(source_path: &Path, archive_file: &Path) -> zip::result::ZipResult<()> { let file = std::fs::File::create(archive_file)?; let mut zip = ZipWriter::new(file); - zip.add_directory_from_path(&source_path.to_path_buf(),FileOptions::default())?; + zip.add_directory(&source_path.to_path_buf(),FileOptions::default())?; Ok(()) } From 99e7f2033a4bd9ddbdb9eeab963d57c069dc1f04 Mon Sep 17 00:00:00 2001 From: pingfanh <89574481+pingfanH@users.noreply.github.com> Date: Thu, 30 Nov 2023 10:58:12 +0800 Subject: [PATCH 3/3] Update write_zip.rs --- crossbundle/tools/src/commands/android/common/write_zip.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crossbundle/tools/src/commands/android/common/write_zip.rs b/crossbundle/tools/src/commands/android/common/write_zip.rs index 4d1bd163..0946ce6a 100644 --- a/crossbundle/tools/src/commands/android/common/write_zip.rs +++ b/crossbundle/tools/src/commands/android/common/write_zip.rs @@ -7,7 +7,7 @@ use zip_extensions::write::ZipWriterExtensions; pub fn zip_write(source_path: &Path, archive_file: &Path) -> zip::result::ZipResult<()> { let file = std::fs::File::create(archive_file)?; let mut zip = ZipWriter::new(file); - zip.add_directory(&source_path.to_path_buf(),FileOptions::default())?; + zip.add_directory(source_path.to_str().unwrap(),FileOptions::default())?; Ok(()) }