Merge branch 'master' into feature/add-changelog-modal/178

src/main/helpers/fs.helpers.ts

@@ -5,6 +5,8 @@ import { Observable, concatMap, from } from "rxjs";
 import log from "electron-log";
 import { BsmException } from "shared/models/bsm-exception.model";
 import crypto from "crypto";
+import { execSync } from "child_process";
+import { tryit } from "../../shared/helpers/error.helpers";
 
 export async function pathExist(path: string): Promise<boolean> {
     try {
@@ -232,6 +234,16 @@ export async function isJunction(path: string): Promise<boolean>{
     return lstats.isSymbolicLink() && stats.isDirectory();
 }
 
+export function resolveGUIDPath(guidPath: string): string {
+    const guidVolume = path.parse(guidPath).root;
+    const command = `powershell -command "(Get-WmiObject -Class Win32_Volume | Where-Object { $_.DeviceID -like '${guidVolume}' }).DriveLetter"`;
+    const {result: driveLetter, error} = tryit(() => execSync(command).toString().trim());
+    if (!driveLetter || error) {
+        throw new Error("Unable to resolve GUID path", error);
+    }
+    return path.join(driveLetter, path.relative(guidVolume, guidPath));
+}
+
 export interface Progression<T = unknown> {
     total: number;
     current: number;

src/main/services/additional-content/local-maps-manager.service.ts

@@ -7,7 +7,7 @@ import { InstallationLocationService } from "../installation-location.service";
 import { UtilsService } from "../utils.service";
 import crypto from "crypto";
 import { lstatSync } from "fs";
-import { copy, createReadStream, ensureDir, realpath, unlink } from "fs-extra";
+import { copy, createReadStream, ensureDir, pathExists, realpath, unlink } from "fs-extra";
 import StreamZip from "node-stream-zip";
 import { RequestService } from "../request.service";
 import sanitize from "sanitize-filename";
@@ -255,10 +255,12 @@ export class LocalMapsManagerService {
         const mapFolderName = sanitize(`${map.id}-${map.name}`);
         const mapsFolder = await this.getMapsFolderPath(version);
 
-        const installedMap = await this.loadMapInfoFromPath(path.join(mapsFolder, mapFolderName)).catch(e => {
-            log.error("loadMapInfoFromPath", e);
-            return null;
-        });
+        const mapPath = path.join(mapsFolder, mapFolderName);
+
+        const installedMap = await pathExists(mapPath).then(exists => {
+            if(!exists){ return null; }
+            return this.loadMapInfoFromPath(mapPath);
+        }).catch(() => null);
         
         if(map.versions.every(version => version.hash === installedMap?.hash)) {
             return installedMap;
@@ -270,8 +272,6 @@ export class LocalMapsManagerService {
             throw `Cannot download ${zipUrl}`;
         }
 
-        const mapPath = path.join(mapsFolder, mapFolderName);
-
         await ensureFolderExist(mapPath);
 
         await zip.extract(null, mapPath);

src/main/services/bs-launcher/oculus-launcher.service.ts

@@ -34,7 +34,9 @@ export class OculusLauncherService extends AbstractLauncherService implements St
         this.pathsService = InstallationLocationService.getInstance();
 
         this.oculus.tryGetGameFolder([OCULUS_BS_DIR, OCULUS_BS_BACKUP_DIR]).then(async dirPath => {
-            if(dirPath){ return this.oculusLib$.next( path.join(dirPath, "..") ); }
+            if(dirPath){
+                return this.oculusLib$.next( path.join(dirPath, "..") );
+            }
             const defaultLib = ((await this.oculus.getOculusLibs()) || []).find(lib => lib.isDefault);
             if(defaultLib?.path){ return this.oculusLib$.next(path.join(defaultLib.path, "Software")); }
             this.oculusLib$.next(null);

src/main/services/oculus.service.ts

@@ -1,8 +1,9 @@
 import { list } from "regedit-rs";
 import path from "path";
-import { pathExist } from "../helpers/fs.helpers";
+import { pathExist, resolveGUIDPath } from "../helpers/fs.helpers";
 import log from "electron-log";
 import { lstat } from "fs-extra";
+import { tryit } from "../../shared/helpers/error.helpers";
 
 export class OculusService {
     private static instance: OculusService;
@@ -42,11 +43,16 @@ export class OculusService {
             await Promise.all(libsRegData.keys.map(async key => {
                 const originalPath = await list([`${oculusLibsRegKey}\\${key}`]).then(res => res[`${oculusLibsRegKey}\\${key}`]);
                 
-                if (!originalPath.values?.OriginalPath) {
-                    return null;
+                if (originalPath.values?.OriginalPath) {
+                    return { id: key, path: originalPath.values.OriginalPath.value, isDefault: defaultLibraryId === key } as OculusLibrary;
+                } 
+                
+                if(originalPath.values?.Path) {
+                    const { result } = tryit(() => resolveGUIDPath(originalPath.values.Path.value as string));
+                    return result ? { id: key, path: result, isDefault: defaultLibraryId === key } as OculusLibrary : null;
                 }
 
-                return { id: key, path: originalPath.values.OriginalPath.value, isDefault: defaultLibraryId === key } as OculusLibrary
+                return null;
             }, []))
         ).filter(Boolean);