From db03ed552fc68985b4b39a9484e8a405e17251b1 Mon Sep 17 00:00:00 2001 From: HorizonCode Date: Tue, 23 Apr 2024 08:51:16 +0200 Subject: [PATCH] fix update dialog --- main.js | 23 +++++++++++------------ preload.js | 4 ++++ src/App.svelte | 2 ++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/main.js b/main.js index e7e0a3d..7fd6650 100644 --- a/main.js +++ b/main.js @@ -430,6 +430,12 @@ function registerIPCPipes() { return config.all(); }); + ipcMain.handle("ezpplauncher:checkUpdate", async (e) => { + const updateInfo = await updateAvailable(); + if (updateInfo.update) + mainWindow.webContents.send("ezpplauncher:update", updateInfo.release); + }); + ipcMain.handle("ezpplauncher:exitAndUpdate", async (e) => { await shell.openExternal(releasesUrl); app.exit(); @@ -523,9 +529,8 @@ function registerIPCPipes() { progress: Math.ceil(data.progress), }); mainWindow.webContents.send("ezpplauncher:launchstatus", { - status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${ - formatBytes(data.total) - })...`, + status: `Downloading ${data.fileName}(${formatBytes(data.loaded)}/${formatBytes(data.total) + })...`, }); }); await updateDownloader.startDownload(); @@ -578,9 +583,8 @@ function registerIPCPipes() { progress: Math.ceil(data.progress), }); mainWindow.webContents.send("ezpplauncher:launchstatus", { - status: `Downloading ${data.fileName}(${ - formatBytes(data.loaded) - }/${formatBytes(data.total)})...`, + status: `Downloading ${data.fileName}(${formatBytes(data.loaded) + }/${formatBytes(data.total)})...`, }); }); await patcherDownloader.startDownload(); @@ -714,8 +718,7 @@ function registerIPCPipes() { const osuGameplayFile = path.join(osuPath, "osu!gameplay.dll"); if (isWritable(osuUIFile) && isWritable(osuGameplayFile)) { logger.log( - `Cleanup complete, took ${ - ((performance.now() - timeStart) / 1000).toFixed(3) + `Cleanup complete, took ${((performance.now() - timeStart) / 1000).toFixed(3) } seconds.`, ); clearInterval(cleanup); @@ -819,10 +822,6 @@ function createWindow() { // Emitted when the window is ready to be shown // This helps in showing the window gracefully. mainWindow.once("ready-to-show", async () => { - const updateInfo = await updateAvailable(); - if (updateInfo.update) { - mainWindow.webContents.send("ezpplauncher:update", updateInfo.release); - } mainWindow.show(); mainWindow.focus(); }); diff --git a/preload.js b/preload.js index 3270108..966e88e 100644 --- a/preload.js +++ b/preload.js @@ -82,6 +82,10 @@ window.addEventListener("settings-set", async (e) => { await ipcRenderer.invoke("ezpplauncher:settings-set", e.detail); }); +window.addEventListener("updateCheck", async () => { + await ipcRenderer.invoke("ezpplauncher:checkUpdate"); +}) + window.addEventListener("updateExit", async () => { await ipcRenderer.invoke("ezpplauncher:exitAndUpdate"); }); diff --git a/src/App.svelte b/src/App.svelte index baf18b7..be07f01 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -66,6 +66,8 @@ window.dispatchEvent(new CustomEvent("updateExit")); }); + window.dispatchEvent(new CustomEvent("updateCheck")); + window.addEventListener("open-settings", (e) => { currentPage.set(Page.Settings); });