fix: archive type (.zip instead of tar.gz) on windows

CCBlueX · Jun 16, 2024 · 71dfc5a · 71dfc5a
1 parent d61eb34
commit 71dfc5a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/src-tauri/src/minecraft/java/distribution.rs b/src-tauri/src/minecraft/java/distribution.rs
@@ -18,7 +18,13 @@ impl Default for JavaDistribution {
 }
 
 impl JavaDistribution {
-    pub fn get_url(&self, jre_version: &u32, os_name: &str, os_arch: &str) -> String {
+    pub fn get_url(
+        &self, 
+        jre_version: &u32, 
+        os_name: &str, 
+        os_arch: &str,
+        archive_type: &str
+    ) -> String {
         match self {
             JavaDistribution::Temurin => {
                 format!(
@@ -28,17 +34,17 @@ impl JavaDistribution {
             }
             JavaDistribution::GraalVM => {
                 format!(
-                    "https://download.oracle.com/graalvm/{}/latest/graalvm-jdk-{}_{}-{}_bin.tar.gz",
-                    jre_version, jre_version, os_name, os_arch
+                    "https://download.oracle.com/graalvm/{}/latest/graalvm-jdk-{}_{}-{}_bin.{}",
+                    jre_version, jre_version, os_name, os_arch, archive_type
                 )
             }
             JavaDistribution::OpenJDK => {
                 // use microsoft openjdk
                 // https://aka.ms/download-jdk/microsoft-jdk-21-linux-x64.tar.gz
 
                 format!(
-                    "https://aka.ms/download-jdk/microsoft-jdk-{}_{}-{}.tar.gz",
-                    jre_version, os_name, os_arch
+                    "https://aka.ms/download-jdk/microsoft-jdk-{}_{}-{}.{}",
+                    jre_version, os_name, os_arch, archive_type
                 )
             }
         }

diff --git a/src-tauri/src/minecraft/java/jre_downloader.rs b/src-tauri/src/minecraft/java/jre_downloader.rs
@@ -99,7 +99,8 @@ where
     // OS details
     let os_name = OS.get_graal_name()?;
     let os_arch = ARCHITECTURE.get_simple_name()?;
-    let url = jre_distribution.get_url(jre_version, os_name, os_arch);
+    let archive_type = OS.get_archive_type()?;
+    let url = jre_distribution.get_url(jre_version, os_name, os_arch, archive_type);
 
     // Download from JRE source and extract runtime files
     fs::create_dir_all(&runtime_path).await?;

diff --git a/src-tauri/src/utils/sys.rs b/src-tauri/src/utils/sys.rs
@@ -109,6 +109,14 @@ impl OperatingSystem {
         })
     }
 
+    pub fn get_archive_type(&self) -> Result<&'static str> {
+        Ok(match self {
+            OperatingSystem::WINDOWS => "zip",
+            OperatingSystem::LINUX | OperatingSystem::OSX => "tar.gz",
+            _ => bail!("Invalid OS")
+        })
+    }
+
 }
 
 impl Display for OperatingSystem {