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

[feature-107] We can now download playlist's missing maps

Browse Source
This commit is contained in:
MathieuG-P
2024-03-19 18:01:07 +01:00
parent 7237e49c7f
commit 3da5af354e
9 changed files with 118 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/services/additional-content/local-playlists-manager.service.ts
+24 -15
View File
@@ -7,7 +7,7 @@ import { RequestService } from "../request.service";
import { LocalMapsManagerService } from "./maps/local-maps-manager.service";
import log from "electron-log";
import { WindowManagerService } from "../window-manager.service";
import { BPList, DownloadPlaylistProgressionData } from "shared/models/playlists/playlist.interface";
import { BPList, DownloadPlaylistProgressionData, PlaylistSong } from "shared/models/playlists/playlist.interface";
import { readFileSync } from "fs";
import { BeatSaverService } from "../thrid-party/beat-saver/beat-saver.service";
import { copy, copyFile, ensureDir, pathExists, pathExistsSync, readdirSync, realpath } from "fs-extra";
@@ -185,28 +185,23 @@ export class LocalPlaylistsManagerService {
});
}
public downloadPlaylist(bpListUrl: string, version: BSVersion): Observable<Progression<DownloadPlaylistProgressionData>> {
public downloadPlaylistSongs(bpList: PlaylistSong[], version: BSVersion): Observable<Progression<DownloadPlaylistProgressionData>> {
return new Observable<Progression<DownloadPlaylistProgressionData>>(obs => {
(async () => {
const bpListFilePath = await this.installBPListFile(bpListUrl, version);
const bpList = await this.readPlaylistFile(bpListFilePath);
const progress: Progression<DownloadPlaylistProgressionData> = {
total: bpList.songs.length,
total: bpList.length,
current: 0,
data: {
downloadedMaps: [],
currentDownload: null,
playlistInfos: bpList,
playlistPath: bpListFilePath,
playlistInfos: null,
playlistPath: null,
}
};
obs.next(progress);
for (const song of bpList.songs) {
for (const song of bpList) {
const [ mapDetail ] = await this.bsaver.getMapDetailsFromHashs([song.hash]);
if(!mapDetail) {
@@ -225,13 +220,29 @@ export class LocalPlaylistsManagerService {
.catch(err => obs.error(err))
.finally(() => obs.complete());
});
}
public downloadPlaylist(bpListUrl: string, version: BSVersion): Observable<Progression<DownloadPlaylistProgressionData>> {
return new Observable<Progression<DownloadPlaylistProgressionData>>(obs => {
(async () => {
const bpListFilePath = await this.installBPListFile(bpListUrl, version);
const bpList = await this.readPlaylistFile(bpListFilePath);
await lastValueFrom(this.downloadPlaylistSongs(bpList.songs, version).pipe(
tap({ next: p => obs.next(p) }),
));
})()
.catch(err => obs.error(err))
.finally(() => obs.complete());
});
}
public deletePlaylist(opt: {path: string, deleteMaps?: boolean}): Observable<Progression>{
console.log("AAAAAA");
return new Observable<Progression>(obs => {
(async () => {
@@ -247,8 +258,6 @@ export class LocalPlaylistsManagerService {
progress.current += 1
obs.next(progress);
},
error: err => obs.error(err),
complete: () => obs.next(progress),
}),
));
}
src/main/services/additional-content/maps/local-maps-manager.service.ts
+2
View File
@@ -302,6 +302,8 @@ export class LocalMapsManagerService {
const localMap = await this.loadMapInfoFromPath(mapPath);
localMap.songDetails = this.songDetailsCache.getSongDetails(localMap.hash);
this.ipc.send<{map: BsmLocalMap, version?: BSVersion}>("map-downloaded", this.windows.getWindows("index.html").at(0), { map: localMap, version });
return localMap;
}