lightling/gallery-dl-archive-manager
1
0
Fork 0
Code Activity

fix /search mode prematurely starting

Browse source 
sometimes 'exit' would be called before 'close', and 'close' didn't do the safety check 'exit' did, making `--running` run twice; additionally, proc.exitCode was always null, check codeOrError instead from the proc.on callback
This commit is contained in:
lightling 2024-02-14 22:32:00 -05:00
parent 352bb03a90
commit cb4effa348
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/dl.js
View file

@ -46,16 +46,16 @@ export const getMany = (userDb, threadMax, directory, mode) => new Promise((reso
let index = 0; let index = 0;
const get = () => { const get = () => {
const checkError = (proc, currentIndex, type, codeOrError) => { const checkError = (currentIndex, type, codeOrError) => {
userDb[currentIndex].logs.push(codeOrError.toString()) userDb[currentIndex].logs.push(codeOrError.toString())
if (!!proc.exitCode && userDb[currentIndex].running) { if (typeof codeOrError === 'number' && userDb[currentIndex].running) {
userDb[currentIndex].running = false; userDb[currentIndex].running = false;
onFinish(currentIndex, type); onFinish(currentIndex, type);
} }
}; };
const onFinish = (currentIndex, type) => { const onFinish = (currentIndex, type) => {
log(ctx, `Finished ${userDb[currentIndex].user} under ${mode} mode.${type === 'close' ? '' : ' (Closed due to ' + type}`); log(ctx, `Finished ${userDb[currentIndex].user} under ${mode} mode.${type === 'close' ? '' : ' (Closed due to ' + type + ')'}`);
--running; --running;
get(); get();
}; };
@ -73,10 +73,10 @@ export const getMany = (userDb, threadMax, directory, mode) => new Promise((reso
proc.stdout.on('data', data => { proc.stdout.on('data', data => {
userDb[currentIndex].logs.push(trimNewlinesEnd(data)); userDb[currentIndex].logs.push(trimNewlinesEnd(data));
}); });
proc.stderr.on('data', data => checkError(proc, currentIndex, 'stderr', trimNewlinesEnd(data))); proc.stderr.on('data', data => checkError(currentIndex, 'stderr', trimNewlinesEnd(data)));
proc.on('close', code => onFinish(currentIndex, 'close', code)); proc.on('close', code => checkError(currentIndex, 'close', code));
proc.on('error', err => checkError(proc, currentIndex, 'error', trimNewlinesEnd(err))); proc.on('error', err => checkError(currentIndex, 'error', trimNewlinesEnd(err)));
proc.on('exit', code => checkError(proc, currentIndex, 'exit', code)); proc.on('exit', code => checkError(currentIndex, 'exit', code));
} }
if (running === 0) { if (running === 0) {