Merge pull request 'chore: prune old update files, fix update dialog' (#17) from dev into master

Reviewed-on: #17

electron/osuUtil.js

@@ -264,33 +264,24 @@ async function getEZPPLauncherUpdateFiles(osuPath) {
       filesToDownload.push(updateFile);
     }
   }
-  return [filesToDownload, updateFiles];
+  return filesToDownload;
 }
 
-async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles, allFiles) {
+async function downloadEZPPLauncherUpdateFiles(osuPath, updateFiles) {
   const eventEmitter = new EventEmitter();
 
   const startDownload = async () => {
     //NOTE: delete files that are not in the updateFiles array
-    const foldersToPrune = allFiles.map(file => path.dirname(path.join(osuPath, ...file.folder.split("/"), file.name))).filter((folder, index, self) => self.indexOf(folder) === index);
+    const foldersToPrune = updateFiles.map(file => path.dirname(path.join(osuPath, ...file.folder.split("/"), file.name))).filter((folder, index, self) => self.indexOf(folder) === index);
     for (const pruneFolder of foldersToPrune) {
       //NOTE: check if the folder is not the osu root folder.
       if (path.basename(pruneFolder) == "osu!")
         continue;
-      if (fs.existsSync(pruneFolder)) {
-        for (const files of await fs.promises.readdir(pruneFolder)) {
-          const filePath = path.join(pruneFolder, files);
-          const validFolder = allFiles.find(file => path.dirname(filePath).endsWith(file.folder));
-          if (!validFolder) {
-            if (allFiles.find(file => file.name == path.basename(filePath)) === undefined) {
-              eventEmitter.emit("data", {
-                fileName: path.basename(filePath),
-              });
-              try {
-                await fs.promises.rm(filePath, { recursive: true, force: true });
-              } catch { }
-            }
-          }
+      for (const files of await fs.promises.readdir(pruneFolder)) {
+        const filePath = path.join(pruneFolder, files);
+        if (!updateFiles.some(file => path.join(osuPath, ...file.folder.split("/"), file.name) === filePath)) {
+
+          await fs.promises.rm(filePath, { recursive: true, force: true });
         }
       }
     }

main.js

@@ -557,13 +557,12 @@ function registerIPCPipes() {
           status: "Looking for patcher updates...",
         });
         await new Promise((res) => setTimeout(res, 1000));
-        const [patchFiles, allUpdateFiles] = await getEZPPLauncherUpdateFiles(osuPath);
+        const patchFiles = await getEZPPLauncherUpdateFiles(osuPath);
         if (patchFiles.length > 0) {
           logger.log("EZPPLauncher updates found.");
           const patcherDownloader = await downloadEZPPLauncherUpdateFiles(
             osuPath,
             patchFiles,
-            allUpdateFiles
           );
           let errored = false;
           patcherDownloader.eventEmitter.on("error", (data) => {
@@ -588,15 +587,6 @@ function registerIPCPipes() {
                 }/${formatBytes(data.total)})...`,
             });
           });
-          patcherDownloader.eventEmitter.on("delete", (data) => {
-            logger.log(`Deleting ${data.fileName}!`);
-            mainWindow.webContents.send("ezpplauncher:launchprogress", {
-              progress: -1,
-            });
-            mainWindow.webContents.send("ezpplauncher:launchstatus", {
-              status: `Deleting ${data.fileName}...`,
-            });
-          });
           await patcherDownloader.startDownload();
           mainWindow.webContents.send("ezpplauncher:launchprogress", {
             progress: -1,
@@ -674,7 +664,7 @@ function registerIPCPipes() {
           if (fs.existsSync(updateFile)) {
             await fs.promises.rm(updateFile, {
               force: true,
-              recursive: (await fs.promises.lstat(updateFile)).isDirectory(),
+              recursive: (await fs.promises.lstat(updateFile)).isDirectory,
             });
           }
         }