From 399727845b347346b8e6bcfb5d703c7ebdefcb4e Mon Sep 17 00:00:00 2001 From: Oj Date: Sat, 19 Mar 2022 12:31:39 +0000 Subject: [PATCH] [Updater > Module] Minor source cleanup --- src/updater/moduleUpdater.js | 57 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/src/updater/moduleUpdater.js b/src/updater/moduleUpdater.js index c8f764d..2727930 100644 --- a/src/updater/moduleUpdater.js +++ b/src/updater/moduleUpdater.js @@ -298,37 +298,36 @@ const installModule = (name, ver, path) => { finishInstall(name, ver, success); }; - const processZipfile = (e, zip) => { - if (e) return handleErr(e); - - const total = zip.entryCount; - let entries = 0; - zip.on('entry', () => { - entries++; - const progress = Math.min(100, Math.floor(entries / total * 100)); - - events.emit('installing-module-progress', { - name, - progress, - entries, - total - }); - }); - - zip.on('error', handleErr); - - zip.on('end', () => { - if (!success) return; - - installed[name].installedVersion = ver; - commitManifest(); - - finishInstall(name, ver, success); - }); - }; try { - yauzl.open(path, {}, processZipfile); + yauzl.open(path, {}, (e, zip) => { + if (e) return handleErr(e); + + const total = zip.entryCount; + let entries = 0; + zip.on('entry', () => { + entries++; + const progress = Math.min(100, Math.floor(entries / total * 100)); + + events.emit('installing-module-progress', { + name, + progress, + entries, + total + }); + }); + + zip.on('error', handleErr); + + zip.on('end', () => { + if (!success) return; + + installed[name].installedVersion = ver; + commitManifest(); + + finishInstall(name, ver, success); + }); + }); } catch (e) { onError(e); }