clean code

This commit is contained in:
MathieuG-P
2022-07-17 19:47:07 +02:00
parent e203fb603d
commit 4fd3a1da2f
27 changed files with 137 additions and 158 deletions
+8 -8
View File
@@ -1,7 +1,7 @@
import { ipcMain } from 'electron';
import { BSVersion } from '../services/bs-version-manager.service';
import { BSVersion } from '../services/bs-version-lib.service';
import { BSInstallerService, DownloadEventType } from '../services/bs-installer.service';
import { IpcRequest } from '../../shared/models/ipc-models.model';
import { IpcRequest } from 'shared/models/ipc';
import { InstallationLocationService } from '../services/installation-location.service';
import { UtilsService } from '../services/utils.service';
@@ -25,9 +25,9 @@ export interface DownloadInfo {
ipcMain.on('bs-download.start', async (event, request: IpcRequest<DownloadInfo>) => {
BSInstallerService.getInstance().downloadBsVersion(request.args).then(res => {
UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: true, data: res});
UtilsService.getInstance().ipcSend(request.responceChannel, {success: true, data: res});
}).catch(e => {
UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: false, data: e});
UtilsService.getInstance().ipcSend(request.responceChannel, {success: false, data: e});
});
});
@@ -37,22 +37,22 @@ ipcMain.on(`bs-download.${"[2FA]" as DownloadEventType}`, async (event, args: Ip
ipcMain.on('bs-download.kill', async (event, request: IpcRequest<void>) => {
const res = await BSInstallerService.getInstance().killDownloadProcess();
if(request.responceChannel){ UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: res}); }
if(request.responceChannel){ UtilsService.getInstance().ipcSend(request.responceChannel, {success: res}); }
});
ipcMain.on('bs-download.installation-folder', async (event, request: IpcRequest<void>) => {
const installationFolder = InstallationLocationService.getInstance().installationDirectory;
UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: true, data: installationFolder});
UtilsService.getInstance().ipcSend(request.responceChannel, {success: true, data: installationFolder});
});
ipcMain.on('bs-download.set-installation-folder', (event, request: IpcRequest<string>) => {
const installerService = InstallationLocationService.getInstance();
installerService.setInstallationDirectory(request.args).then(res => {
console.log("déplacement terminer");
UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: true, data: res});
UtilsService.getInstance().ipcSend(request.responceChannel, {success: true, data: res});
}).catch(err => {
console.log(err);
UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: false, error: {title: err, type: 'error'}});
UtilsService.getInstance().ipcSend(request.responceChannel, {success: false, error: {title: err, type: 'error'}});
});
})
+3 -3
View File
@@ -2,15 +2,15 @@ import { ipcMain } from 'electron';
import { UtilsService } from '../services/utils.service'
import { LauchOption } from "../../shared/models/launch-models.model";
import { BSLauncherService } from "../services/bs-launcher.service"
import { IpcRequest } from 'shared/models/ipc-models.model';
import { IpcRequest } from 'shared/models/ipc';
ipcMain.on('bs-launch.launch', (event, request: IpcRequest<LauchOption>) => {
const launcherService = BSLauncherService.getInstance();
const utilsService = UtilsService.getInstance();
launcherService.launch(request.args).then(res => {
utilsService.newIpcSenc(request.responceChannel, {success: true, data: res});
utilsService.ipcSend(request.responceChannel, {success: true, data: res});
}).catch(err => {
utilsService.newIpcSenc(request.responceChannel, {success: false, error: {title: err, type: 'error'}});
utilsService.ipcSend(request.responceChannel, {success: false, error: {title: err, type: 'error'}});
})
});
+4 -4
View File
@@ -1,7 +1,7 @@
import { ipcMain } from "electron";
import { BSVersion } from "main/services/bs-version-manager.service";
import { BSVersion } from "main/services/bs-version-lib.service";
import { UtilsService } from "../services/utils.service";
import { IpcRequest } from "shared/models/ipc-models.model";
import { IpcRequest } from "shared/models/ipc";
import { BSLocalVersionService } from "../services/bs-local-version.service";
ipcMain.on('bs.uninstall', async (event, request: IpcRequest<BSVersion>) => {
@@ -9,8 +9,8 @@ ipcMain.on('bs.uninstall', async (event, request: IpcRequest<BSVersion>) => {
const bsLocalVersionService = BSLocalVersionService.getInstance();
const utilsService = UtilsService.getInstance();
if(!request.args){ utilsService.newIpcSenc(request.responceChannel, {success: false}); }
if(!request.args){ utilsService.ipcSend(request.responceChannel, {success: false}); }
const res = await bsLocalVersionService.deleteVersion(request.args);
utilsService.newIpcSenc(request.responceChannel, {success: res});
utilsService.ipcSend(request.responceChannel, {success: res});
});
+10 -10
View File
@@ -1,33 +1,33 @@
import { ipcMain } from 'electron';
import { UtilsService } from '../services/utils.service';
import { BSVersionManagerService } from '../services/bs-version-manager.service'
import { BSVersion } from "main/services/bs-version-manager.service";
import { BSVersionLibService } from '../services/bs-version-lib.service'
import { BSVersion } from "main/services/bs-version-lib.service";
import path from 'path';
import { exec } from 'child_process';
import { SteamService } from '../services/steam.service';
import { BS_APP_ID } from '../constants';
import { IpcRequest } from 'shared/models/ipc-models.model';
import { IpcRequest } from 'shared/models/ipc';
import { BSLocalVersionService } from '../services/bs-local-version.service';
import { InstallationLocationService } from '../services/installation-location.service';
ipcMain.on('bs-version.get-version-dict', (event, req: IpcRequest<void>) => {
BSVersionManagerService.getInstance().getAvailableVersions().then(versions => {
UtilsService.getInstance().newIpcSenc(req.responceChannel, {success: true, data: versions});
BSVersionLibService.getInstance().getAvailableVersions().then(versions => {
UtilsService.getInstance().ipcSend(req.responceChannel, {success: true, data: versions});
}).catch(() => {
UtilsService.getInstance().newIpcSenc(req.responceChannel, {success: false});
UtilsService.getInstance().ipcSend(req.responceChannel, {success: false});
})
});
ipcMain.on('bs-version.installed-versions', async (event, req: IpcRequest<void>) => {
BSLocalVersionService.getInstance().getInstalledVersions().then(versions => {
UtilsService.getInstance().newIpcSenc(req.responceChannel, {success: true, data: versions});
UtilsService.getInstance().ipcSend(req.responceChannel, {success: true, data: versions});
}).catch(() => {
UtilsService.getInstance().newIpcSenc(req.responceChannel, {success: false});
UtilsService.getInstance().ipcSend(req.responceChannel, {success: false});
})
});
ipcMain.on("bs-version.open-folder", async (event, args: BSVersion) => {
ipcMain.on("bs-version.open-folder", async (event, req: IpcRequest<BSVersion>) => {
const locationService = InstallationLocationService.getInstance();
const versionFolder = args.steam ? await SteamService.getInstance().getGameFolder(BS_APP_ID, "Beat Saber") : path.join(locationService.versionsDirectory, args.BSVersion);
const versionFolder = req.args.steam ? await SteamService.getInstance().getGameFolder(BS_APP_ID, "Beat Saber") : path.join(locationService.versionsDirectory, req.args.BSVersion);
UtilsService.getInstance().folderExist(versionFolder) && exec(`start "" "${versionFolder}"`);
});
+2 -3
View File
@@ -1,8 +1,7 @@
import { ipcMain, shell, dialog } from 'electron';
import { UtilsService } from '../services/utils.service';
import { IpcRequest } from '../../shared/models/ipc-models.model';
import { IpcRequest } from 'shared/models/ipc';
import { getMainWindow } from '../main';
import { request } from 'http';
ipcMain.on('window.close', async () => {
getMainWindow()?.close();
@@ -26,7 +25,7 @@ ipcMain.on('new-window', async (event, request: IpcRequest<string>) => {
ipcMain.on('choose-folder', async (event, request: IpcRequest<void>) => {
dialog.showOpenDialog({properties: ['openDirectory']}).then(res => {
UtilsService.getInstance().newIpcSenc(request.responceChannel, {success: true, data: res});
UtilsService.getInstance().ipcSend(request.responceChannel, {success: true, data: res});
});
});