fix grammars fetching, allow zstd archives

CodSpeedHQ · Jul 13, 2024 · ae6e654 · ae6e654
1 parent a53a3e4
commit ae6e654
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,6 +65,7 @@ thiserror         = { version = "1.0" }
 toml              = { version = "*" }
 toml_edit         = { version = "0.20.2", features = ["serde"] }
 url               = { version = "2.5.0" }
+zstd              = { version = "0.11.2" }                                                                         # follow same version wasmtime-cache in lockfile
 
 lsp-types = { version = "0.95.1", features = ["proposed"] }                                                  # not following semver, so should be locked to patch version updates only
 psp-types = { git = "https://github.com/lapce/psp-types", rev = "f7fea28f59e7b2d6faa1034a21679ad49b3524ad" }

diff --git a/lapce-app/Cargo.toml b/lapce-app/Cargo.toml
@@ -47,6 +47,7 @@ tracing-log        = { workspace = true }
 tracing-subscriber = { workspace = true }
 tracing-appender   = { workspace = true }
 url                = { workspace = true }
+zstd               = { workspace = true }
 floem              = { workspace = true }
 
 pulldown-cmark   = { version = "0.11.0" }

diff --git a/lapce-app/src/app.rs b/lapce-app/src/app.rs
@@ -3764,16 +3764,16 @@ pub fn launch() {
         });
         std::thread::spawn(move || {
             use self::grammars::*;
-            match find_release().map(|r| describe_release(&r.tag_name)) {
-                Ok(Ok(release)) => {
+            match find_release() {
+                Ok(release) => {
                     if let Err(e) = fetch_grammars(&release) {
                         trace!(TraceLevel::ERROR, "failed to fetch grammars: {e}");
                     }
                     if let Err(e) = fetch_queries(&release) {
                         trace!(TraceLevel::ERROR, "failed to fetch grammars: {e}");
                     }
                 }
-                Err(e) | Ok(Err(e)) => {
+                Err(e) => {
                     trace!(TraceLevel::ERROR, "failed to obtain release info: {e}");
                 }
             }

diff --git a/lapce-app/src/app/grammars.rs b/lapce-app/src/app/grammars.rs
@@ -1,13 +1,14 @@
 use std::{
     env,
-    fs::{self, File},
+    fs::{self},
+    io::{Seek, Write},
     path::PathBuf,
 };
 
 use anyhow::{anyhow, Context, Result};
 use lapce_core::directory::Directory;
 
-use crate::{tracing::*, update::ReleaseInfo};
+use crate::update::ReleaseInfo;
 
 fn get_github_api(url: &str) -> Result<String> {
     let resp = reqwest::blocking::ClientBuilder::new()
@@ -61,24 +62,11 @@ pub fn find_release() -> Result<ReleaseInfo> {
     Ok(release.to_owned())
 }
 
-pub fn describe_release(id: &str) -> Result<ReleaseInfo> {
-    let url = format!(
-        "https://api.github.com/repos/lapce/tree-sitter-grammars/releases/{id}"
-    );
-
-    let resp =
-        get_github_api(&url).context(format!("failed to find release {id}"))?;
-    let release: ReleaseInfo = serde_json::from_str(&resp)?;
-
-    Ok(release)
-}
-
 pub fn fetch_grammars(release: &ReleaseInfo) -> Result<()> {
     let dir =
         Directory::grammars_directory().context("can't get grammars directory")?;
 
-    let file_name =
-        format!("grammars-{}-{}.zip", env::consts::OS, env::consts::ARCH);
+    let file_name = format!("grammars-{}-{}", env::consts::OS, env::consts::ARCH);
 
     download_release(dir, release, &file_name)?;
 
@@ -89,7 +77,7 @@ pub fn fetch_queries(release: &ReleaseInfo) -> Result<()> {
     let dir =
         Directory::queries_directory().context("can't get queries directory")?;
 
-    let file_name = "queries.zip";
+    let file_name = "queries";
 
     download_release(dir, release, file_name)?;
 
@@ -113,22 +101,30 @@ fn download_release(
     }
 
     for asset in &release.assets {
-        if asset.name == file_name {
+        if asset.name.starts_with(file_name) {
             let mut resp = reqwest::blocking::get(&asset.browser_download_url)?;
             if !resp.status().is_success() {
                 return Err(anyhow!("download file error {}", resp.text()?));
             }
+
+            let file = tempfile::tempfile()?;
+
             {
-                let mut out = File::create(dir.join(file_name))?;
-                resp.copy_to(&mut out)?;
+                let file = &mut &file;
+                resp.copy_to(file)?;
+                file.flush()?;
+                file.rewind()?;
+            }
+
+            if asset.name.ends_with(".zip") {
+                let mut archive = zip::ZipArchive::new(file)?;
+                archive.extract(&dir)?;
+            } else if asset.name.ends_with(".tar.zst") {
+                let mut archive =
+                    tar::Archive::new(zstd::stream::read::Decoder::new(file)?);
+                archive.unpack(&dir)?;
             }
 
-            let mut archive =
-                zip::ZipArchive::new(File::open(dir.join(file_name))?)?;
-            archive.extract(&dir)?;
-            if let Err(err) = fs::remove_file(dir.join(file_name)) {
-                trace!(TraceLevel::ERROR, "Failed to remove file: {err}");
-            };
             fs::write(dir.join("version"), release.tag_name.clone())?;
         }
     }

diff --git a/lapce-proxy/Cargo.toml b/lapce-proxy/Cargo.toml
@@ -28,6 +28,7 @@ toml               = { workspace = true }
 tracing            = { workspace = true }
 tracing-log        = { workspace = true }
 url                = { workspace = true }
+zstd               = { workspace = true }
 
 lsp-types = { workspace = true }
 psp-types = { workspace = true }
@@ -39,7 +40,6 @@ floem-editor-core = { workspace = true }
 
 # proxy specific dependencies
 
-zstd          = "0.11.2" # follow same version wasmtime-cache in lockfile
 dyn-clone     = "1.0.16"
 walkdir       = "2.4.0"
 locale_config = "0.3.0"