From 9cf217512fca9625213be25e37da91dfc6c3f3a1 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Wed, 19 Feb 2025 20:32:34 +1100 Subject: [PATCH] fix: updated progress download logging --- ts/components/dialog/debug/components.tsx | 4 ++++ ts/updater/updater.ts | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ts/components/dialog/debug/components.tsx b/ts/components/dialog/debug/components.tsx index 286fbd6bf..35cc694e6 100644 --- a/ts/components/dialog/debug/components.tsx +++ b/ts/components/dialog/debug/components.tsx @@ -79,12 +79,14 @@ export const DebugActions = () => { ?.privKeyBytes; if (!userEd25519SecretKey) { window.log.error('[debugMenu] debugLatestRelease no userEd25519SecretKey'); + setLoadingLatestRelease(false); return; } setLoadingLatestRelease(true); const result = await getLatestReleaseFromFileServer(userEd25519SecretKey, 'latest'); if (!result) { ToastUtils.pushToastError('debugLatestRelease', 'Failed to fetch latest release'); + setLoadingLatestRelease(false); return; } const [versionNumber, releaseChannel] = result; @@ -114,12 +116,14 @@ export const DebugActions = () => { ?.privKeyBytes; if (!userEd25519SecretKey) { window.log.error('[debugMenu] debugAlphaRelease no userEd25519SecretKey'); + setLoadingAlphaRelease(false); return; } setLoadingAlphaRelease(true); const result = await getLatestReleaseFromFileServer(userEd25519SecretKey, 'alpha'); if (!result) { ToastUtils.pushToastError('debugAlphaRelease', 'Failed to fetch alpha release'); + setLoadingAlphaRelease(false); return; } const [versionNumber, releaseChannel] = result; diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts index 5be0261f2..46452e8b5 100644 --- a/ts/updater/updater.ts +++ b/ts/updater/updater.ts @@ -31,9 +31,8 @@ let interval: NodeJS.Timeout | undefined; let stopped = false; autoUpdater.on(DOWNLOAD_PROGRESS, eventDownloadProgress => { - const progress = (eventDownloadProgress.transferred / eventDownloadProgress.total) * 100; console.log( - `[updater] download progress: ${progress} download size ${filesize(eventDownloadProgress.total, { base: 10 })}` + `[updater] download progress: ${filesize(eventDownloadProgress.transferred, { base: 10 })}/${filesize(eventDownloadProgress.total, { base: 10 })}` ); }); @@ -42,7 +41,7 @@ autoUpdater.on(UPDATE_DOWNLOADED, () => { console.log('[updater] update downloaded'); console.info('[updater] calling quitAndInstall...'); autoUpdater.quitAndInstall(); - isUpdating = true; + isUpdating = false; }); export async function start(