support dataPathOverrides to fix osx path bug

pydt · Dec 13, 2023 · 42708c0 · 42708c0
1 parent 0e15b5c
commit 42708c0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
     "pako": "^2.1.0",
     "prettier": "^3.1.1",
     "prettier-eslint": "^16.1.2",
-    "pydt-shared": "file:../shared/dist/pydt-shared-lib",
+    "pydt-shared": "^1.8.12",
     "rimraf": "^5.0.5",
     "rollbar": "^2.26.2",
     "rxjs": "^7.8.1",

diff --git a/ui/shared/pydtSettings.ts b/ui/shared/pydtSettings.ts
@@ -61,12 +61,13 @@ export class PydtSettingsData {
 
   getDefaultDataPath(civGame: CivGame, gameStore?: GameStore): string {
     const location: PlatformSaveLocation = civGame.saveLocations[window.pydtApi.platform];
+    const finalStore = gameStore || this.getGameStore(civGame);
 
     let result = window.pydtApi.path.normalize(
       window.pydtApi.path.join(
         this.basePaths[location.basePath],
         location.prefix,
-        civGame.dataPaths[gameStore || this.getGameStore(civGame)],
+        location.dataPathOverrides?.[finalStore] || civGame.dataPaths[finalStore],
       ),
     );
 
@@ -79,7 +80,7 @@ export class PydtSettingsData {
           window.pydtApi.path.join(
             this.basePaths[protonLocation.basePath],
             protonLocation.prefix,
-            civGame.dataPaths[gameStore || this.getGameStore(civGame)],
+            protonLocation.dataPathOverrides?.[finalStore] || civGame.dataPaths[finalStore],
           ),
         );