profxadke/OpenAsar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Splash > Backend] Minor source cleanup (remove v1 timeout checks and unneeded simple listeners)

Browse source
This commit is contained in:
Ducko 2022-04-05 22:31:55 +01:00
parent 14e3111875
commit d817954187
1 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/splash/index.js
View file

@ -10,7 +10,7 @@ let splashState = {};
let modulesListeners = {}; let modulesListeners = {};
let launchedMainWindow = false; let launchedMainWindow = false;
let updateAttempt = 0; let updateAttempt = 0;
let splashWindow, updateTimeout, newUpdater; let splashWindow, newUpdater;
exports.initSplash = (startMin = false) => { exports.initSplash = (startMin = false) => {
@ -43,7 +43,6 @@ exports.pageReady = () => destroySplash() || process.nextTick(() => events.emit(
const destroySplash = () => { const destroySplash = () => {
log('Splash', 'Destroy'); log('Splash', 'Destroy');
v1_timeoutStop();
if (!splashWindow) return; if (!splashWindow) return;
splashWindow.setSkipTaskbar(true); splashWindow.setSkipTaskbar(true);
@ -223,14 +222,7 @@ const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only)
sendState('fail'); sendState('fail');
}; };
add(CHECKING_FOR_UPDATES, () => {
v1_timeoutStart();
sendState(CHECKING_FOR_UPDATES);
});
add('update-check-finished', ({ succeeded, updateCount }) => { add('update-check-finished', ({ succeeded, updateCount }) => {
v1_timeoutStop();
installs.reset(); installs.reset();
downloads.reset(); downloads.reset();
@ -242,8 +234,6 @@ const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only)
}); });
add('downloading-module', ({ name }) => { add('downloading-module', ({ name }) => {
v1_timeoutStop();
downloads.record(name, 'Waiting'); downloads.record(name, 'Waiting');
installs.record(name, 'Waiting'); installs.record(name, 'Waiting');
}); });
@ -279,10 +269,9 @@ const initModuleUpdater = () => { // "Old" (not v2 / new, win32 only)
splashState.newVersion = e.newVersion; splashState.newVersion = e.newVersion;
sendState('update-manually'); sendState('update-manually');
}); });
};
const v1_timeoutStart = () => !updateTimeout && (updateTimeout = setTimeout(scheduleNextUpdate, 10000)); sendState(CHECKING_FOR_UPDATES);
const v1_timeoutStop = () => updateTimeout && (updateTimeout = clearTimeout(updateTimeout)); };
const scheduleNextUpdate = (callback = moduleUpdater.checkForUpdates) => { // Used by v1 and v2, default to v1 as used more widely in it const scheduleNextUpdate = (callback = moduleUpdater.checkForUpdates) => { // Used by v1 and v2, default to v1 as used more widely in it
updateAttempt++; updateAttempt++;