From 831de003e01c24cc28a76c3d7a26ae0f97090386 Mon Sep 17 00:00:00 2001 From: Michael-F-Bryan Date: Tue, 22 Nov 2022 21:20:09 +0800 Subject: [PATCH 1/2] Fetch the pirita download URL --- lib/registry/graphql/queries/get_package_by_command.graphql | 3 ++- lib/registry/graphql/queries/get_package_version.graphql | 3 ++- lib/registry/src/lib.rs | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/registry/graphql/queries/get_package_by_command.graphql b/lib/registry/graphql/queries/get_package_by_command.graphql index 36c64eb19bb..f201f0190b4 100644 --- a/lib/registry/graphql/queries/get_package_by_command.graphql +++ b/lib/registry/graphql/queries/get_package_by_command.graphql @@ -7,10 +7,11 @@ query GetPackageByCommandQuery ($commandName: String!) { manifest distribution { downloadUrl + piritaDownloadUrl } package { displayName } } } -} \ No newline at end of file +} diff --git a/lib/registry/graphql/queries/get_package_version.graphql b/lib/registry/graphql/queries/get_package_version.graphql index 6fdd84c9ba4..b6b09d4b854 100644 --- a/lib/registry/graphql/queries/get_package_version.graphql +++ b/lib/registry/graphql/queries/get_package_version.graphql @@ -7,7 +7,8 @@ query GetPackageVersionQuery ($name: String!, $version: String) { isLastVersion distribution { downloadUrl + piritaDownloadUrl } manifest } -} \ No newline at end of file +} diff --git a/lib/registry/src/lib.rs b/lib/registry/src/lib.rs index 2045fe0d470..72b01a6c301 100644 --- a/lib/registry/src/lib.rs +++ b/lib/registry/src/lib.rs @@ -47,6 +47,7 @@ pub struct PackageDownloadInfo { pub commands: String, pub manifest: String, pub url: String, + pub pirita_url: Option, } pub fn get_package_local_dir( @@ -317,6 +318,7 @@ pub fn query_command_from_registry( let package = command.package_version.package.display_name; let version = command.package_version.version; let url = command.package_version.distribution.download_url; + let pirita_url = command.package_version.distribution.pirita_download_url; Ok(PackageDownloadInfo { registry: registry_url.to_string(), @@ -326,6 +328,7 @@ pub fn query_command_from_registry( manifest: command.package_version.manifest, commands: command_name.to_string(), url, + pirita_url, }) } @@ -612,6 +615,7 @@ pub fn query_package_from_registry( .join(", "), url: v.distribution.download_url.clone(), + pirita_url: v.distribution.pirita_download_url.clone(), }) } From c1b2b08bd19a4d524d056be86e2ad8ef193a60ca Mon Sep 17 00:00:00 2001 From: Michael-F-Bryan Date: Tue, 22 Nov 2022 21:26:29 +0800 Subject: [PATCH 2/2] Install wai-bindgen from crates.io instead of using the broken wit-bindgen link --- lib/wasi-types/regenerate.sh | 9 +++------ lib/wasi-types/wit-bindgen | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 160000 lib/wasi-types/wit-bindgen diff --git a/lib/wasi-types/regenerate.sh b/lib/wasi-types/regenerate.sh index b7b976bd7e7..b6d14be02f2 100755 --- a/lib/wasi-types/regenerate.sh +++ b/lib/wasi-types/regenerate.sh @@ -8,13 +8,10 @@ rm -f \ cat "$BASEDIR"/wit-clean/typenames.wit "$BASEDIR"/wit-clean/wasi_unstable.wit > "$BASEDIR"/wit-clean/output.wit -git clone https://github.com/wasmerio/wit-bindgen --branch force-generate-structs --single-branch +cargo install --force wai-bindgen git pull origin force-generate-structs -cd wit-bindgen -cargo build -cd .. -./wit-bindgen/target/debug/wit-bindgen rust-wasm \ +wai-bindgen rust-wasm \ --import "$BASEDIR"/wit-clean/output.wit \ --force-generate-structs \ --out-dir "$BASEDIR"/src/wasi \ @@ -30,4 +27,4 @@ pwd `pwd`/target/debug/wasi-types-generator-extra cd .. -cargo fmt --all \ No newline at end of file +cargo fmt --all diff --git a/lib/wasi-types/wit-bindgen b/lib/wasi-types/wit-bindgen deleted file mode 160000 index 095d295be63..00000000000 --- a/lib/wasi-types/wit-bindgen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 095d295be6392259924e48488af188d3ed3e4102