fix: normalize mod folder paths on macOS

Author: Haerbin23456

src/celemod-ui/src/states.ts

@@ -145,6 +145,7 @@ export const [initGamePath, useGamePath] = createPersistedState<string>('', stor
     const paths = callRemote("get_celeste_dirs").split("\n").filter((v: string | null) => v);
     return paths[0]
 }, (storage, data, save) => {
+    data = callRemote("normalize_game_path", data)
     storage.root.lastGamePath = data
     save()
 })

src/main.rs

@@ -540,6 +540,20 @@ fn normalize_game_path(path: &str) -> String {
         .to_string()
 }
 
+fn normalize_mods_folder_path(path: &str) -> String {
+    let path = Path::new(path);
+    if path.file_name().and_then(|v| v.to_str()) == Some("Mods") {
+        if let Some(game_path) = path.parent() {
+            return normalize_game_path_buf(game_path)
+                .join("Mods")
+                .to_string_lossy()
+                .to_string();
+        }
+    }
+
+    path.to_string_lossy().to_string()
+}
+
 fn normalize_game_path_buf(path: &Path) -> PathBuf {
     #[cfg(target_os = "macos")]
     {
@@ -654,6 +668,7 @@ impl Handler {
         _use_cn_proxy: bool,
         multi_thread: bool,
     ) {
+        let mods_dir = normalize_mods_folder_path(&mods_dir);
         if let Err(e) = std::fs::create_dir_all(&mods_dir) {
             eprintln!("Failed to create mods dir {}: {}", mods_dir, e);
         }
@@ -1044,6 +1059,7 @@ impl Handler {
 
     fn get_installed_miaonet(&self, mods_folder_path: String, callback: sciter::Value) {
         std::thread::spawn(move || {
+            let mods_folder_path = normalize_mods_folder_path(&mods_folder_path);
             let installed = get_installed_mods_sync(mods_folder_path)
                 .into_iter()
                 .any(|p| p.name == "MiaoNet");
@@ -1053,6 +1069,7 @@ impl Handler {
 
     fn get_installed_mods(&self, mods_folder_path: String, callback: sciter::Value) {
         std::thread::spawn(move || {
+            let mods_folder_path = normalize_mods_folder_path(&mods_folder_path);
             let installed_mods = get_installed_mods_sync(mods_folder_path);
             callback
                 .call(
@@ -1066,6 +1083,7 @@ impl Handler {
 
     fn get_invalid_zip_mod_files(&self, mods_folder_path: String, callback: sciter::Value) {
         std::thread::spawn(move || {
+            let mods_folder_path = normalize_mods_folder_path(&mods_folder_path);
             let invalid_mods = get_invalid_zip_mod_files(&mods_folder_path);
             callback
                 .call(
@@ -1079,6 +1097,7 @@ impl Handler {
 
     fn check_all_mod_contents(&self, mods_folder_path: String, callback: sciter::Value) {
         std::thread::spawn(move || {
+            let mods_folder_path = normalize_mods_folder_path(&mods_folder_path);
             check_all_mod_contents(&mods_folder_path, &mut |progress| {
                 callback
                     .call(
@@ -1334,6 +1353,7 @@ impl Handler {
 
     fn rm_mod(&self, mods_folder_path: String, mod_name: String) {
         std::thread::spawn(move || {
+            let mods_folder_path = normalize_mods_folder_path(&mods_folder_path);
             if let Err(e) = rm_mod(&mods_folder_path, &mod_name) {
                 eprintln!("Failed to remove mod: {}", e);
             }
@@ -1375,6 +1395,7 @@ impl Handler {
         callback: sciter::Value,
     ) {
         std::thread::spawn(move || {
+            let mods_folder_path = normalize_mods_folder_path(&mods_folder_path);
             let file_names: Vec<String> = serde_json::from_str(&file_names).unwrap_or_default();
             let result = match delete_mod_files(&mods_folder_path, &file_names) {
                 Ok(()) => "Success".to_string(),