Skip to content

Commit

Permalink
Add zip extract support for Windows (zed-industries#11156)
Browse files Browse the repository at this point in the history
Release Notes:

- [x] Fixed install Node.js runtime and NPM lsp installation on Windows.
- [x] Update Node runtime command to execute on Windows with no window
popup.

Ref zed-industries#9619, zed-industries#9424

---------

Co-authored-by: Marshall Bowers <elliott.codes@gmail.com>
  • Loading branch information
2 people authored and osiewicz committed May 18, 2024
1 parent ea1e57a commit 16b53c4
Show file tree
Hide file tree
Showing 5 changed files with 228 additions and 20 deletions.
29 changes: 27 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ members = [
"crates/anthropic",
"crates/assets",
"crates/assistant",
"crates/assistant_tooling",
"crates/assistant2",
"crates/assistant_tooling",
"crates/audio",
"crates/auto_update",
"crates/breadcrumbs",
Expand Down Expand Up @@ -257,6 +257,7 @@ async-fs = "1.6"
async-recursion = "1.0.0"
async-tar = "0.4.2"
async-trait = "0.1"
async_zip = { version = "0.0.17", features = ["deflate", "deflate64"] }
bitflags = "2.4.2"
blade-graphics = { git = "https://github.com/kvark/blade", rev = "e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" }
blade-macros = { git = "https://github.com/kvark/blade", rev = "e35b2d41f221a48b75f7cf2e78a81e7ecb7a383c" }
Expand Down
13 changes: 13 additions & 0 deletions crates/node_runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,28 @@ workspace = true
path = "src/node_runtime.rs"
doctest = false

[features]
test-support = ["tempfile"]

[dependencies]
anyhow.workspace = true
async-compression.workspace = true
async-tar.workspace = true
async-trait.workspace = true
async_zip.workspace = true
futures.workspace = true
log.workspace = true
semver.workspace = true
serde.workspace = true
serde_json.workspace = true
smol.workspace = true
tempfile = { workspace = true, optional = true }
util.workspace = true
walkdir = "2.5.0"
windows.workspace = true

[target.'cfg(windows)'.dependencies]
async-std = { version = "1.12.0", features = ["unstable"] }

[dev-dependencies]
tempfile.workspace = true
118 changes: 118 additions & 0 deletions crates/node_runtime/src/archive.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
use std::path::Path;

use anyhow::Result;
use async_zip::base::read::stream::ZipFileReader;
use futures::{io::BufReader, AsyncRead};

pub async fn extract_zip<R: AsyncRead + Unpin>(destination: &Path, reader: R) -> Result<()> {
let mut reader = ZipFileReader::new(BufReader::new(reader));

let destination = &destination
.canonicalize()
.unwrap_or_else(|_| destination.to_path_buf());

while let Some(mut item) = reader.next_with_entry().await? {
let entry_reader = item.reader_mut();
let entry = entry_reader.entry();
let path = destination.join(entry.filename().as_str().unwrap());

if entry.dir().unwrap() {
std::fs::create_dir_all(&path)?;
} else {
let parent_dir = path.parent().expect("failed to get parent directory");
std::fs::create_dir_all(&parent_dir)?;
let mut file = smol::fs::File::create(&path).await?;
futures::io::copy(entry_reader, &mut file).await?;
}

reader = item.skip().await?;
}

Ok(())
}

#[cfg(test)]
mod tests {
use std::path::PathBuf;

use async_zip::base::write::ZipFileWriter;
use async_zip::ZipEntryBuilder;
use futures::AsyncWriteExt;
use smol::io::Cursor;
use tempfile::TempDir;

use super::*;

async fn compress_zip(src_dir: &Path, dst: &Path) -> Result<()> {
let mut out = smol::fs::File::create(dst).await?;
let mut writer = ZipFileWriter::new(&mut out);

for entry in walkdir::WalkDir::new(src_dir) {
let entry = entry?;
let path = entry.path();

if path.is_dir() {
continue;
}

let relative_path = path.strip_prefix(src_dir)?;
let data = smol::fs::read(&path).await?;

let filename = relative_path.display().to_string();
let builder = ZipEntryBuilder::new(filename.into(), async_zip::Compression::Deflate);

writer.write_entry_whole(builder, &data).await?;
}

writer.close().await?;
out.flush().await?;

Ok(())
}

#[track_caller]
fn assert_file_content(path: &Path, content: &str) {
assert!(path.exists(), "file not found: {:?}", path);
let actual = std::fs::read_to_string(path).unwrap();
assert_eq!(actual, content);
}

#[track_caller]
fn make_test_data() -> TempDir {
let dir = tempfile::tempdir().unwrap();
let dst = dir.path();

std::fs::write(&dst.join("test"), "Hello world.").unwrap();
std::fs::create_dir_all(&dst.join("foo/bar")).unwrap();
std::fs::write(&dst.join("foo/bar.txt"), "Foo bar.").unwrap();
std::fs::write(&dst.join("foo/dar.md"), "Bar dar.").unwrap();
std::fs::write(&dst.join("foo/bar/dar你好.txt"), "你好世界").unwrap();

dir
}

async fn read_archive(path: &PathBuf) -> impl AsyncRead + Unpin {
let data = smol::fs::read(&path).await.unwrap();
Cursor::new(data)
}

#[test]
fn test_extract_zip() {
let test_dir = make_test_data();
let zip_file = test_dir.path().join("test.zip");

smol::block_on(async {
compress_zip(&test_dir.path(), &zip_file).await.unwrap();
let reader = read_archive(&zip_file).await;

let dir = tempfile::tempdir().unwrap();
let dst = dir.path();
extract_zip(dst, reader).await.unwrap();

assert_file_content(&dst.join("test"), "Hello world.");
assert_file_content(&dst.join("foo/bar.txt"), "Foo bar.");
assert_file_content(&dst.join("foo/dar.md"), "Bar dar.");
assert_file_content(&dst.join("foo/bar/dar你好.txt"), "你好世界");
});
}
}

0 comments on commit 16b53c4

Please sign in to comment.