From 81c5a7928aa4773eece6ad295a517fbbea652511 Mon Sep 17 00:00:00 2001
From: MathieuG-P <40181755+Zagrios@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:53:12 +0100
Subject: [PATCH] Merge pull request #645 from
 Zagrios/bugfix/fix-oneclick-download-playlist-broken

[bugfix] Fix broken oneclick playlist download + issue with specials chars in playlists filenames

(cherry picked from commit d5f2ba3b21a3c6db64725b6e6967c48cea0b0195)
---
 .../additional-content/local-playlists-manager.service.ts    | 4 +++-
 src/main/util.ts                                             | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/services/additional-content/local-playlists-manager.service.ts b/src/main/services/additional-content/local-playlists-manager.service.ts
index e6259c03..ba89bdf8 100644
--- a/src/main/services/additional-content/local-playlists-manager.service.ts
+++ b/src/main/services/additional-content/local-playlists-manager.service.ts
@@ -13,6 +13,7 @@ import { BeatSaverService } from "../thrid-party/beat-saver/beat-saver.service";
 import { copy, copyFile, pathExists, realpath } from "fs-extra";
 import { Progression, ensureFolderExist, pathExist } from "../../helpers/fs.helpers";
 import { IpcService } from "../ipc.service";
+import sanitize from "sanitize-filename";
 
 export class LocalPlaylistsManagerService {
     private static instance: LocalPlaylistsManagerService;
@@ -71,12 +72,13 @@ export class LocalPlaylistsManagerService {
     private async installBPListFile(bslistSource: string, version: BSVersion): Promise<string> {
         const playlistFolder = await this.getPlaylistsFolder(version);
         const isLocalFile = await pathExists(bslistSource).catch(e => { log.error(e); return false; });
-        const filename = isLocalFile ? path.basename(bslistSource) :  new URL(bslistSource).pathname.split('/').pop()
+        const filename = isLocalFile ? path.basename(bslistSource) :  sanitize(new URL(bslistSource).pathname.split('/').pop())
         const destFile = path.join(playlistFolder, filename);
 
         if (isLocalFile) {
             return copyFile(bslistSource, destFile).then(() => destFile);
         }
+
         return lastValueFrom(this.request.downloadFile(bslistSource, {
             destFolder: playlistFolder,
             filename,
diff --git a/src/main/util.ts b/src/main/util.ts
index 508c31fa..acfeb6db 100644
--- a/src/main/util.ts
+++ b/src/main/util.ts
@@ -8,8 +8,9 @@ export function resolveHtmlPath (htmlFileName: string) {
         const url = new URL(`http://localhost:${port}/${htmlFileName}`);
         return url.toString();
     }
-    const filePath = path.resolve(__dirname, "..", "renderer", htmlFileName);
-    return pathToFileURL(filePath).toString();
+
+    const filePath = path.resolve(__dirname, "..", "renderer");
+    return pathToFileURL(filePath).toString().concat("/", htmlFileName);
 };