From 1edcb55c90ac0f1daf982f4826edbd1cd3c7d7eb Mon Sep 17 00:00:00 2001 From: MathieuG-P <40181755+Zagrios@users.noreply.github.com> Date: Sun, 16 Jul 2023 16:31:58 +0200 Subject: [PATCH] [chore-245] remove some code smells --- src/main/ipcs/bs-model-ipcs.ts | 2 -- src/main/ipcs/bs-version-ipcs.ts | 1 - src/main/ipcs/os-controls-ipcs.ts | 2 -- src/main/services/auto-updater.service.ts | 2 +- src/main/services/mods/bs-mods-manager.service.ts | 10 ++++++---- src/main/services/steam.service.ts | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/ipcs/bs-model-ipcs.ts b/src/main/ipcs/bs-model-ipcs.ts index 4b9b4415..223b3884 100644 --- a/src/main/ipcs/bs-model-ipcs.ts +++ b/src/main/ipcs/bs-model-ipcs.ts @@ -5,8 +5,6 @@ import { MSModel, MSModelType } from "shared/models/models/model-saber.model"; import { LocalModelsManagerService } from "../services/additional-content/local-models-manager.service"; import { IpcService } from "../services/ipc.service"; import { BSVersion } from "shared/bs-version.interface"; -import { BsmLocalMap } from "shared/models/maps/bsm-local-map.interface"; -import { from } from "rxjs"; import { BsmLocalModel } from "shared/models/models/bsm-local-model.interface"; import { ModelDownload } from "renderer/services/models-management/models-downloader.service"; diff --git a/src/main/ipcs/bs-version-ipcs.ts b/src/main/ipcs/bs-version-ipcs.ts index 540a2dec..0c317096 100644 --- a/src/main/ipcs/bs-version-ipcs.ts +++ b/src/main/ipcs/bs-version-ipcs.ts @@ -2,7 +2,6 @@ import { ipcMain, shell } from "electron"; import { UtilsService } from "../services/utils.service"; import { BSVersionLibService } from "../services/bs-version-lib.service"; import { BSVersion } from "shared/bs-version.interface"; -import { exec } from "child_process"; import { IpcRequest } from "shared/models/ipc"; import { BSLocalVersionService } from "../services/bs-local-version.service"; import { BsmException } from "shared/models/bsm-exception.model"; diff --git a/src/main/ipcs/os-controls-ipcs.ts b/src/main/ipcs/os-controls-ipcs.ts index 84de249c..be8ae628 100644 --- a/src/main/ipcs/os-controls-ipcs.ts +++ b/src/main/ipcs/os-controls-ipcs.ts @@ -6,8 +6,6 @@ import { NotificationService } from "../services/notification.service"; import { SteamService } from "../services/steam.service"; import { IpcService } from "../services/ipc.service"; import { from } from "rxjs"; -import { fstat, lstat } from "fs"; -import { pathExist } from "../helpers/fs.helpers"; // TODO IMPROVE WINDOW CONTROL BY USING WINDOW SERVICE diff --git a/src/main/services/auto-updater.service.ts b/src/main/services/auto-updater.service.ts index d4bc1370..667e26cf 100644 --- a/src/main/services/auto-updater.service.ts +++ b/src/main/services/auto-updater.service.ts @@ -28,7 +28,7 @@ export class AutoUpdaterService { .checkForUpdates() .then(info => { const needUpdate = (() => { - if (!info || !info.updateInfo) { + if (!info?.updateInfo) { return false; } return gt(info.updateInfo.version, autoUpdater.currentVersion.version); diff --git a/src/main/services/mods/bs-mods-manager.service.ts b/src/main/services/mods/bs-mods-manager.service.ts index bc7929e5..4e15c53d 100644 --- a/src/main/services/mods/bs-mods-manager.service.ts +++ b/src/main/services/mods/bs-mods-manager.service.ts @@ -68,12 +68,14 @@ export class BsModsManagerService { private async getModsInDir(version: BSVersion, modsDir: ModsInstallFolder): Promise { const bsPath = await this.bsLocalService.getVersionPath(version); const modsPath = path.join(bsPath, modsDir); + if (!(await pathExist(modsPath))) { return []; } + const files = await recursiveReadDir(modsPath); - const promises = files.map(filePath => { - return (async () => { + + const promises = files.map(async filePath => { const ext = path.extname(filePath); if (ext !== ".dll" && ext !== ".exe" && ext !== ".manifest") { @@ -100,10 +102,10 @@ export class BsModsManagerService { } } return mod; - })(); }); + const mods = await Promise.all(promises); - return mods.filter(m => !!m); + return mods.filter(Boolean); } private async getBsipaInstalled(version: BSVersion): Promise { diff --git a/src/main/services/steam.service.ts b/src/main/services/steam.service.ts index 6c1d7b44..3f988dea 100644 --- a/src/main/services/steam.service.ts +++ b/src/main/services/steam.service.ts @@ -84,7 +84,7 @@ export class SteamService { libraryFolders = libraryFolders.libraryfolders; for (const libKey in Object.keys(libraryFolders)) { - if (!libraryFolders[libKey] || !libraryFolders[libKey].apps) { continue; } + if (!libraryFolders?.[libKey]?.apps) { continue; } if (libraryFolders[libKey].apps[gameId] != null) { return path.join(libraryFolders[libKey].path, "steamapps", "common", gameFolder);