zedcode/bs-manager
1
0
Fork 0
mirror of https://github.com/Zagrios/bs-manager.git synced 2026-07-03 14:08:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #357 from Zagrios/bugfix/unable-to-start-oculus-version-after-moving-installation-path

Browse Source 
[bugfix] Unable to start Oculus version after moving installation directory
This commit is contained in:
MathieuG-P
2023-11-18 12:57:16 +01:00
committed by GitHub
parent a837310518 d74008b109
commit 713b50a49d
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/services/bs-launcher/oculus-launcher.service.ts
+16 -11
View File
@@ -51,28 +51,33 @@ export class OculusLauncherService extends AbstractLauncherService implements St
throw new Error("Oculus library not found, deleteBsSymlinks");
}
const libContents = await readdir(oculusLibPath, { withFileTypes: true});
const symlinks = (await Promise.all(libContents.map(async dirent => {
return (await lstat(path.join(oculusLibPath, dirent.name))).isSymbolicLink() ? dirent : null;
const libContents = await readdir(oculusLibPath);
const symlinks = (await Promise.all(libContents.map(async dir => {
return (await lstat(path.join(oculusLibPath, dir))).isSymbolicLink() ? dir : null;
}))).filter(Boolean);
const bsSymlinks = symlinks.filter(dirent => dirent.name.startsWith(OCULUS_BS_DIR));
const versionsFolderPath = await this.pathsService.versionsDirectory();
log.info("Symlinks found in Oculus library", symlinks);
const bsSymlinks = symlinks.filter(dirent => dirent.startsWith(OCULUS_BS_DIR));
// get only symlinks created by BSM (with metadata.config)
const bsmSymlinks = (await Promise.all(bsSymlinks.map(async symlink => {
const symlinkPath = path.join(oculusLibPath, symlink.name);
const targetPath = await readlink(symlinkPath).catch(err => { log.error(err); return undefined; });
const symlinkPath = path.join(oculusLibPath, symlink);
const targetPath = await readlink(symlinkPath).catch(err => log.error(err));
log.info("Oculus Symlink", symlink, "target", targetPath);
if(!targetPath){ return null; }
if(!targetPath.startsWith(versionsFolderPath)){ return null; }
const bsmVersionsDir = path.join(this.pathsService.INSTALLATION_FOLDER, this.pathsService.VERSIONS_FOLDER);
if(!targetPath.includes(bsmVersionsDir)){ return null; }
return symlink;
}))).filter(Boolean);
await Promise.all(bsmSymlinks.map(symlink => {
log.info("Deleting symlink", symlink.name);
return unlink(path.join(oculusLibPath, symlink.name));
log.info("Delete symlink", symlink);
return unlink(path.join(oculusLibPath, symlink));
}));
}
src/main/services/installation-location.service.ts
+2 -2
View File
@@ -13,8 +13,8 @@ export class InstallationLocationService {
return InstallationLocationService.instance;
}
private readonly INSTALLATION_FOLDER = "BSManager";
private readonly VERSIONS_FOLDER = "BSInstances";
public readonly INSTALLATION_FOLDER = "BSManager";
public readonly VERSIONS_FOLDER = "BSInstances";
private readonly SHARED_CONTENT_FOLDER = "SharedContent";