From 02221212888ca7584b36f2ee15e907df0ba5af15 Mon Sep 17 00:00:00 2001 From: Chubby Granny Chaser Date: Sat, 5 Oct 2024 07:12:47 +0100 Subject: [PATCH] fix: fixing multiple folders --- .../cloud-save/download-game-artifact.ts | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/events/cloud-save/download-game-artifact.ts b/src/main/events/cloud-save/download-game-artifact.ts index 7a92dc85..d0e8d845 100644 --- a/src/main/events/cloud-save/download-game-artifact.ts +++ b/src/main/events/cloud-save/download-game-artifact.ts @@ -36,10 +36,20 @@ const replaceLudusaviBackupWithCurrentUser = ( // TODO: Only works on Windows const usersDirPath = path.join(gameBackupPath, "drive-C", "Users"); - fs.renameSync( - path.join(usersDirPath, path.basename(backupHomeDir)), - path.join(usersDirPath, path.basename(currentHomeDir)) - ); + const oldPath = path.join(usersDirPath, path.basename(backupHomeDir)); + const newPath = path.join(usersDirPath, path.basename(currentHomeDir)); + + // Directories are different, rename + if (backupHomeDir !== currentHomeDir) { + if (fs.existsSync(newPath)) { + fs.rmSync(newPath, { + recursive: true, + force: true, + }); + } + + fs.renameSync(oldPath, newPath); + } const backups = manifest.backups.map((backup: LudusaviBackup) => { const files = Object.entries(backup.files).reduce((prev, [key, value]) => {