fix: normalize game path handling for macOS installation and improve path verification

Author: Haerbin23456

src/celemod-ui/src/states.ts

@@ -141,7 +141,7 @@ const createPersistedStateByKey = <T>(key: string, defaultValue: T) => createPer
 export const [initMirror, useMirror, currentMirror] = createPersistedStateByKey('mirror', 'wegfan')
 export const [initGamePath, useGamePath] = createPersistedState<string>('', storage => {
     if (storage?.root?.lastGamePath)
-        return storage.root.lastGamePath
+        return callRemote("normalize_game_path", storage.root.lastGamePath)
     const paths = callRemote("get_celeste_dirs").split("\n").filter((v: string | null) => v);
     return paths[0]
 }, (storage, data, save) => {
@@ -157,4 +157,4 @@ export const [initSearchSort, useSearchSort] = createPersistedStateByKey<'new' |
 
 export const [initAutoDisableNewMods, useAutoDisableNewMods] = createPersistedStateByKey('autoDisableNewMods', false)
 
-export const [initModComments, useModComments] = createPersistedStateByKey('modComments', {})
+export const [initModComments, useModComments] = createPersistedStateByKey('modComments', {})

src/celemod-ui/src/utils.ts

@@ -134,7 +134,11 @@ export const selectGamePath = (successCallback) => {
     // strip file:// and Celeste.exe
     const prefix = "file://".length;
     const decoded = decodeURI(res);
-    const path = dirname(decoded.slice(prefix));
+    const path = callRemote("normalize_game_path", dirname(decoded.slice(prefix)));
+    if (!callRemote("verify_celeste_install", path)) {
+      alert("Invalid Celeste install path.");
+      return;
+    }
     console.log("Selected", path);
     successCallback(path);
     return path;

src/everest.rs

@@ -116,7 +116,7 @@ pub fn get_everest_version(game_path: &str) -> Option<i32> {
         Some(str)
     }
 
-    let game_path = resolve_everest_install_path(Path::new(game_path));
+    let game_path = Path::new(game_path);
 
     check_file(game_path.join("Celeste.exe"))
         .or_else(|| {
@@ -205,26 +205,6 @@ fn run_command(
     Ok(())
 }
 
-fn resolve_everest_install_path(game_path: &Path) -> PathBuf {
-    #[cfg(target_os = "macos")]
-    {
-        let bundled_resources = game_path
-            .join("Celeste.app")
-            .join("Contents")
-            .join("Resources");
-        if bundled_resources.exists() {
-            return bundled_resources;
-        }
-
-        let resources = game_path.join("Contents").join("Resources");
-        if resources.exists() {
-            return resources;
-        }
-    }
-
-    game_path.to_path_buf()
-}
-
 #[cfg(target_os = "windows")]
 fn installer_name() -> anyhow::Result<&'static str> {
     match std::env::consts::ARCH {
@@ -253,7 +233,7 @@ pub fn download_and_install_everest(
 
     let temp_path = std::env::temp_dir().join("everest.zip");
     let temp_path = temp_path.to_str().unwrap();
-    let game_path = resolve_everest_install_path(std::path::Path::new(game_path));
+    let game_path = std::path::Path::new(game_path);
     let cancel_flag = Arc::new(AtomicBool::new(false));
 
     ureq::download_file_with_progress(