diff --git a/src/main/ipcs/beat-saver-ipcs.ts b/src/main/ipcs/beat-saver-ipcs.ts index 980666b1..1c9b6c9f 100644 --- a/src/main/ipcs/beat-saver-ipcs.ts +++ b/src/main/ipcs/beat-saver-ipcs.ts @@ -3,6 +3,7 @@ import { UtilsService } from "../services/utils.service"; import { IpcRequest } from "shared/models/ipc"; import { SearchParams } from "shared/models/maps/beat-saver.model"; import { BeatSaverService } from "../services/thrid-party/beat-saver/beat-saver.service"; +import log from "electron-log"; ipcMain.on("bsv-search-map", async (event, request: IpcRequest) => { const utlis = UtilsService.getInstance(); @@ -22,6 +23,7 @@ ipcMain.on("bsv-get-map-details-from-hashs", async (event, request: IpcRequest { utlis.ipcSend(request.responceChannel, {success: true, data: maps}); }).catch(e => { + log.error(e); utlis.ipcSend(request.responceChannel, {success: false, error: e}); }) }); diff --git a/src/main/services/additional-content/local-maps-manager.service.ts b/src/main/services/additional-content/local-maps-manager.service.ts index a8b03122..859b3d54 100644 --- a/src/main/services/additional-content/local-maps-manager.service.ts +++ b/src/main/services/additional-content/local-maps-manager.service.ts @@ -135,8 +135,6 @@ export class LocalMapsManagerService { return new Observable(observer => { (async () => { - console.time() - const levelsFolder = await this.getMapsFolderPath(version); const levelsPaths = (await this.utils.pathExist(levelsFolder)) ? this.utils.listDirsInDir(levelsFolder, true) : []; @@ -151,14 +149,18 @@ export class LocalMapsManagerService { return mapInfo; }); - const mapsInfo = (await Promise.all(promises)).filter(info => info); + const mapsInfo = (await Promise.allSettled(promises)).reduce((acc, mapInfo) => { + if(mapInfo.status === "fulfilled" && mapInfo.value){ + acc.push(mapInfo.value); + } + return acc; + } ,[] as BsmLocalMap[]); + progression.maps = mapsInfo; observer.next(progression); observer.complete(); - - console.timeEnd(); })(); }); } diff --git a/src/main/services/ipc.service.ts b/src/main/services/ipc.service.ts index 7f7665ea..e6b64796 100644 --- a/src/main/services/ipc.service.ts +++ b/src/main/services/ipc.service.ts @@ -47,7 +47,6 @@ export class IpcService { observable.subscribe(data => { this.send(channel, window, data); }, error => { - console.log("LAAAA 2", error); this.send(this.getErrorChannel(channel), window, error); }, () => { this.send(this.getCompleteChannel(channel), window); diff --git a/src/main/services/thrid-party/beat-saver/beat-saver.service.ts b/src/main/services/thrid-party/beat-saver/beat-saver.service.ts index 087f2861..619293ed 100644 --- a/src/main/services/thrid-party/beat-saver/beat-saver.service.ts +++ b/src/main/services/thrid-party/beat-saver/beat-saver.service.ts @@ -32,7 +32,7 @@ export class BeatSaverService { return res; }, [] as BsvMapDetail[]); - await Promise.all(chunkHash.map(async hashs => { + await Promise.allSettled(chunkHash.map(async hashs => { const res = await this.bsaverApi.getMapsDetailsByHashs(hashs); if(res.status === 200){ diff --git a/src/renderer/services/thrird-partys/beat-saver.service.ts b/src/renderer/services/thrird-partys/beat-saver.service.ts index 9ab1fa2d..6c238d13 100644 --- a/src/renderer/services/thrird-partys/beat-saver.service.ts +++ b/src/renderer/services/thrird-partys/beat-saver.service.ts @@ -17,8 +17,8 @@ export class BeatSaverService { } public async getMapDetailsFromHashs(hashs: string[]): Promise{ - //const res = await this.ipc.send("bsv-get-map-details-from-hashs", {args: hashs}); - return []; + const res = await this.ipc.send("bsv-get-map-details-from-hashs", {args: hashs}); + return res.data ?? []; }