Compare commits

...

7 Commits

Author SHA1 Message Date
MathieuG-P b841d067c7 bumb version 2023-04-12 20:39:20 +02:00
MathieuG-P 27e5d79bf7 Merge pull request #215 from Zagrios/hotfix/unable-to-launch
[hotfix] fix unable to launch due to tasklist returning nothing
2023-04-12 20:37:08 +02:00
MathieuG-P 28a5576ef9 [hotfix] fix unable to launch due to tasklist returning nothing 2023-04-12 20:35:10 +02:00
MathieuG-P 3b6e908352 Merge pull request #214 from XCraftTM/patch-2
Changed from "Sie" to "Du"
2023-04-12 14:27:58 +02:00
XCraftTM 004d335eda Changed from "Sie" to "Du"
The Whole Translation was written in "Du" so the new Changes need to be also written in "Du" and not in "Sie".
2023-04-12 13:53:51 +02:00
MathieuG-P ef8662edca add supporters 2023-04-11 01:37:03 +02:00
MathieuG-P f2153f3d0b bumb version 2023-04-11 01:36:40 +02:00
7 changed files with 21 additions and 13 deletions
+3 -1
View File
@@ -1,5 +1,7 @@
[
{"username": "Shidorien"},
{"username": "Doloro", "type": "gold"},
{"username": "iPixelGalaxy", "type": "diamond", "link": "https://twitch.tv/ipixelgalaxy"}
{"username": "iPixelGalaxy", "type": "diamond", "link": "https://twitch.tv/ipixelgalaxy"},
{"username": "Emyte", "type": "gold"},
{"username": "GoodOldNervy"}
]
+1 -1
View File
@@ -282,7 +282,7 @@
},
"descs": {
"COPY_TO_SUBPATH": "Der Zielordner darf kein Unterordner des Quellordners sein.",
"restore-linked-folders": "Beim Wiederherstellen von freigegebenen Ordnern ist ein Fehler aufgetreten. Sie können sie dennoch manuell über das Menü 'Freigegebene Ordner' auf der Versionsseite wiederherstellen."
"restore-linked-folders": "Beim Wiederherstellen von freigegebenen Ordnern ist ein Fehler aufgetreten. Du kannst sie dennoch manuell über das Menü 'Freigegebene Ordner' auf der Versionsseite wiederherstellen."
}
}
},
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "bs-manager",
"version": "1.1.0",
"version": "1.1.1",
"description": "A foundation for scalable desktop apps",
"main": "./dist/main/main.js",
"author": {
+4 -4
View File
@@ -52,13 +52,13 @@ export class BSLauncherService{
}
public isBsRunning(): boolean{
return this.bsProcess?.connected || this.utilsService.taskRunning(BS_EXECUTABLE);
return this.bsProcess?.connected || this.utilsService.taskRunning(BS_EXECUTABLE) === true;
}
public async launch(launchOptions: LauchOption): Promise<LaunchResult>{
if(launchOptions.version.oculus && !this.oculusService.oculusRunning()){ return "OCULUS_NOT_RUNNING" }
if(!launchOptions.version.oculus && !this.steamService.steamRunning()){ return "STEAM_NOT_RUNNING" }
if(this.isBsRunning()){ return "BS_ALREADY_RUNNING" }
if(launchOptions.version.oculus && this.oculusService.oculusRunning() === false){ return "OCULUS_NOT_RUNNING" }
if(!launchOptions.version.oculus && this.steamService.steamRunning() === false){ return "STEAM_NOT_RUNNING" }
if(this.isBsRunning() === true){ return "BS_ALREADY_RUNNING" }
const cwd = await this.localVersionService.getVersionPath(launchOptions.version);
const exePath = path.join(cwd, BS_EXECUTABLE);
+1 -1
View File
@@ -20,7 +20,7 @@ export class OculusService {
this.utils = UtilsService.getInstance();
}
public oculusRunning(): boolean{
public oculusRunning(): boolean | null{
return this.utils.taskRunning("OculusClient.exe");
}
+1 -1
View File
@@ -25,7 +25,7 @@ export class SteamService{
return SteamService.instance;
}
public steamRunning(): boolean{
public steamRunning(): boolean | null{
return this.utils.taskRunning('steam.exe');
}
+10 -4
View File
@@ -33,10 +33,16 @@ export class UtilsService{
public setMainWindows(windows: Map<AppWindow, BrowserWindow>){ this.windows = windows; }
public getMainWindows(win: AppWindow){ return this.windows.get(win); }
public taskRunning(task: string): boolean{
const tasks = spawnSync('tasklist').stdout.toString();
return tasks.includes(task);
}
public taskRunning(task: string): boolean | null{
try{
const tasks = spawnSync('tasklist').stdout;
return tasks.toString().includes(task);
}
catch(error){
log.error(error);
return null;
}
}
public ipcSend<T = any>(channel: string, response: IpcResponse<T>): void{
try {