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

[feat-75] applied PR comments 1

Browse Source
This commit is contained in:
silentrald
2024-09-28 21:38:37 +08:00
parent 6a2f982292
commit 9d4acea654
4 changed files with 47 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/services/additional-content/maps/local-maps-manager.service.ts
+22 -26
View File
@@ -328,32 +328,34 @@ export class LocalMapsManagerService {
return null;
}
public importMaps(zipPaths: string[], version?: BSVersion): Observable<Progression> {
const progress: Progression<string> = {
public importMaps(zipPaths: string[], version?: BSVersion): Observable<Progression<BsmLocalMap>> {
const progress: Progression<BsmLocalMap> = {
total: zipPaths.length,
current: 0,
data: "",
};
return new Observable<Progression<string>>(observer => {
return new Observable<Progression<BsmLocalMap>>(observer => {
(async () => {
for (const zipPath of zipPaths) {
++progress.current;
progress.data = zipPath;
observer.next(progress);
try {
observer.next(progress); // 0%
try {
await this.importMap(zipPath, version);
} catch (error: any) {
log.error(`Could not import "${zipPath}"`, error);
this.ipc.send<{map: string, error: string}>(
"map-not-imported",
this.windows.getWindows("index.html").at(0),
{ map: zipPath, error: error.code }
);
for (const zipPath of zipPaths) {
++progress.current;
try {
progress.data = await this.importMap(zipPath, version);
} catch (error: any) {
log.error(`Could not import "${zipPath}"`, error);
progress.data = undefined;
}
observer.next(progress);
}
} catch(error: any) {
observer.error(error);
} finally {
observer.complete();
}
observer.complete();
})();
});
}
@@ -371,8 +373,8 @@ export class LocalMapsManagerService {
log.info(`Importing map "${zipPath}" to "${mapPath}"`);
const zip = await JSZip.loadAsync(await readFile(zipPath));
const infoFile = zip.file("Info.dat");
if (!infoFile) { // Simple check for importing maps
const infoFiles = zip.file(/(I|i)nfo.dat/);
if (infoFiles.length === 0) { // Simple check for importing maps
throw new CustomError(`Invalid zip file "${zipPath}"`, "invalid-zip");
}
@@ -394,12 +396,6 @@ export class LocalMapsManagerService {
const localMap = await this.loadMapInfoFromPath(mapPath);
localMap.songDetails = this.songDetailsCache.getSongDetails(localMap.hash);
this.ipc.send<{map: BsmLocalMap, version?: BSVersion}>(
"map-imported",
this.windows.getWindows("index.html").at(0),
{ map: localMap, version }
);
return localMap;
} catch (error: any) {
throw error instanceof CustomError
src/renderer/components/maps-playlists-panel/maps/local-maps-list-panel.component.tsx
+1 -1
View File
@@ -131,7 +131,7 @@ export const LocalMapsListPanel = forwardRef<LocalMapsListPanelRef, Props>(({ ve
const mapsCopy = maps ? [ ...maps ] : [];
// importMap can collide with existing map
const index = maps.findIndex(map => map.songDetails.name === importMap.songDetails.name);
const index = maps.findIndex(map => map.songDetails?.name === importMap.songDetails.name);
if (index > -1) {
mapsCopy.splice(index, 1);
}
src/renderer/services/maps-manager.service.ts
+23 -34
View File
@@ -39,7 +39,7 @@ export class MapsManagerService {
private readonly lastLinkedVersion$: Subject<BSVersion> = new Subject();
private readonly lastUnlinkedVersion$: Subject<BSVersion> = new Subject();
private importListeners: ((map: BsmLocalMap, version?: BSVersion) => void)[] = [];
private importListeners = new Set<((map: BsmLocalMap, version?: BSVersion) => void)>();
private importCount = 0;
private constructor() {
@@ -49,23 +49,6 @@ export class MapsManagerService {
this.notifications = NotificationService.getInstance();
this.config = ConfigurationService.getInstance();
this.linker = VersionFolderLinkerService.getInstance();
this.ipcService.watch<{map: BsmLocalMap, version?: BSVersion}>("map-imported")
.subscribe(data => {
++this.importCount;
this.importListeners.forEach(listener => listener(data.map, data.version));
});
// NOTE: Generic notify call from server side
this.ipcService.watch<{map: string, error: string}>("map-not-imported")
.subscribe(data => {
this.notifications.notifyError({
title: "notifications.maps.import-map.titles.error",
desc: ["not-found-zip", "invalid-zip"].includes(data.error)
? `notifications.maps.import-map.msgs.${data.error}`
: data.error
});
});
}
public getMaps(version?: BSVersion): Observable<BsmLocalMapsProgress> {
@@ -222,20 +205,29 @@ export class MapsManagerService {
return 0;
}
// Incremented by receiving an ipc call on "map-imported"
this.importCount = 0;
const importProgress$: Observable<ProgressionInterface> = this.ipcService.sendV2(
"bs-maps.import-maps",
{ paths, version }
)
.pipe(map(progress => ({
progression: (progress.current / progress.total) * 100,
label: progress.data
} as ProgressionInterface)));
const importObserver$ = this.ipcService.sendV2(
"bs-maps.import-maps",
{ paths, version }
);
importObserver$.subscribe(progress => {
if (!progress.data) {
return;
}
this.progressBar.show(importProgress$);
await lastValueFrom(importProgress$);
++this.importCount;
this.importListeners.forEach(listeners => listeners(progress.data, version));
});
this.progressBar.show(importObserver$.pipe(
map(progress => ({
progression: (progress.current / progress.total) * 100,
label: progress.data?.songDetails?.name
} as ProgressionInterface))
));
await lastValueFrom(importObserver$);
return this.importCount;
} catch (error: any) {
this.notifications.notifyError({
@@ -264,14 +256,11 @@ export class MapsManagerService {
}
public addImportListener(listener: (map: BsmLocalMap, version?: BSVersion) => void): void {
this.importListeners.push(listener);
this.importListeners.add(listener);
}
public removeImportListener(listener: (map: BsmLocalMap, version?: BSVersion) => void): void {
const index = this.importListeners.indexOf(listener);
if (index > -1) {
this.importListeners.splice(index, 1);
}
this.importListeners.delete(listener);
}
public get versionLinked$(): Observable<BSVersion> {
src/shared/models/ipc/ipc-routes.ts
+1 -1
View File
@@ -58,7 +58,7 @@ export interface IpcChannelMapping {
"load-version-maps": { request: BSVersion, response: BsmLocalMapsProgress};
"delete-maps": { request: BsmLocalMap[], response: DeleteMapsProgress };
"export-maps": { request: { version: BSVersion; maps: BsmLocalMap[]; outPath: string }, response: Progression };
"bs-maps.import-maps": { request: { paths: string[]; version: BSVersion | undefined }, response: Progression };
"bs-maps.import-maps": { request: { paths: string[]; version: BSVersion | undefined }, response: Progression<BsmLocalMap> };
"bs-maps.download-map": { request: { map: BsvMapDetail; version: BSVersion | undefined }, response: BsmLocalMap };
"last-downloaded-map": { request: void, response: { version?: BSVersion, map: BsmLocalMap } };
"one-click-install-map": { request: BsvMapDetail, response: void };