w

Author: kuruk-mm

src/install_dependency.rs

@@ -2,6 +2,7 @@ use directories::ProjectDirs;
 use flate2::read::GzDecoder;
 use reqwest::blocking::Client;
 use serde_json::Value;
+use std::collections::HashMap;
 use std::env;
 use std::fs::{self, File};
 use std::io::{self};
@@ -13,8 +14,7 @@ use crate::download_file::download_file;
 use crate::export::prepare_templates;
 
 use crate::consts::{
-    BIN_FOLDER, GODOT4_BIN_BASE_URL, GODOT_CURRENT_VERSION, PROTOC_BASE_URL,
-    RUST_LIB_PROJECT_FOLDER,
+    BIN_FOLDER, GODOT_CURRENT_VERSION, GODOT_EDITOR_URL, PROTOC_BASE_URL, RUST_LIB_PROJECT_FOLDER
 };
 
 fn create_directory_all(path: &Path) -> io::Result<()> {
@@ -161,16 +161,13 @@ pub fn download_and_extract_zip(
 
 fn get_godot_url() -> Option<String> {
     let os = env::consts::OS;
-    let arch = env::consts::ARCH;
 
-    let os_url = match (os, arch) {
-        ("linux", "x86_64") => Some("linux.x86_64.zip".to_string()),
-        ("windows", "x86_64") => Some("win64.exe.zip".to_string()),
-        ("macos", _) => Some("macos.universal.zip".to_string()),
-        _ => None,
-    }?;
+    let file_map: HashMap<&str, &str> = GODOT_EDITOR_URL
+        .iter()
+        .cloned()
+        .collect();
 
-    Some(format!("{GODOT4_BIN_BASE_URL}{os_url}"))
+    file_map.get(os).map(|&url| url.to_string())
 }
 
 pub fn set_executable_permission(_file_path: &Path) -> std::io::Result<()> {