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

reduce padding in output

Browse source
This commit is contained in:
lightling 2024-02-12 17:01:13 -05:00
parent 04d110d8fe
commit ef16b61219
4 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/dl.js
View file

@ -2,6 +2,7 @@ import { spawn } from 'child_process';
import { getArg } from './args.js';
import { error, log } from './log.js';
import { trimNewlinesEnd } from './str.js';
const ctx = 'getUser.js';
const loggedDateRegex = new RegExp('[a-zA-Z0-9]+\-[0-9]+\-([0-9]{4})([0-9]{2})([0-9]{2})_([0-9]{2})([0-9]{2})([0-9]{2})', 'gm');
@ -47,7 +48,7 @@ export const getMany = (userDb, threadMax, directory, mode) => new Promise((reso
const get = () => {
const checkError = (proc, currentIndex, type, codeOrError) => {
userDb[currentIndex].logs.push(codeOrError.toString())
if (!!proc.exitCode && !userDb[currentIndex].running) {
if (!!proc.exitCode && userDb[currentIndex].running) {
userDb[currentIndex].running = false;
onFinish(currentIndex, type);
}
@ -70,11 +71,11 @@ export const getMany = (userDb, threadMax, directory, mode) => new Promise((reso
let proc = getUser(userDb[currentIndex].user, directory, modeParams);
userDb[currentIndex].running = true;
proc.stdout.on('data', data => {
userDb[currentIndex].logs.push(data);
userDb[currentIndex].logs.push(trimNewlinesEnd(data));
});
proc.stderr.on('data', data => checkError(proc, currentIndex, 'stderr', data));
proc.stderr.on('data', data => checkError(proc, currentIndex, 'stderr', trimNewlinesEnd(data)));
proc.on('close', code => onFinish(currentIndex, 'close', code));
proc.on('error', err => checkError(proc, currentIndex, 'error', err));
proc.on('error', err => checkError(proc, currentIndex, 'error', trimNewlinesEnd(err)));
proc.on('exit', code => checkError(proc, currentIndex, 'exit', code));
}

6
lib/log.js
View file

@ -17,7 +17,7 @@ export const getTime = () => {
*/
export const log = (src, msg) => {
const time = getTime();
console.log(`${time} : ${src} : ${msg}`);
console.log(`${time} : ${src} : ${msg.toString().trim()}`);
};
/**
@ -26,6 +26,6 @@ export const log = (src, msg) => {
* @param {string} msg the message to log
*/
export const error = (src, msg) => {
const time = new Date().toISOString();
console.error(`\x1b[33m${time} : ${src} : ${msg}\x1b[0m`);
const time = getTime();
console.error(`\x1b[33m${time} : ${src} : ${msg.toString().trim()}\x1b[0m`);
}

10
lib/str.js Normal file
View file

@ -0,0 +1,10 @@
/** https://github.com/sindresorhus/trim-newlines */
export const trimNewlinesEnd = (str) => {
let end = str.length;
while (end > 0 && (str[end - 1] === '\r' || str[end - 1] === '\n')) {
end--;
}
return end < str.length ? str.slice(0, end) : str;
}

9
run-downloadDb.js
View file

@ -49,9 +49,13 @@ const downloadDb = async () => {
processes.forEach(entry => {
entry.logs.forEach(log => {
if (log.includes('NotFoundError')) {
error(ctx, `${entry.user} wasn't found: "${log.replace('\n', '')}". You may want to remove them from the db.json file or update their username.`);
const strOut = `${entry.user} wasn't found: "${log.replace('\n', '')}". You may want to remove them from the db.json file or update their username.`;
error(ctx, strOut);
entry.lastError = strOut;
} else if (log.includes('AuthorizationError')) {
error(ctx, `There was an authorization error for user ${entry.user}: "${log.replace('\n', '')}"`);
const strOut = `There was an authorization error for user ${entry.user}: "${log.replace('\n', '')}"`;
error(ctx, strOut);
entry.lastError = strOut;
}
});
});
@ -61,6 +65,7 @@ const downloadDb = async () => {
let updated = processes.map(entry => ({
user: entry.user,
lastUpdated: entry.lastUpdated,
lastError: entry.lastError,
}));
await writeFile(`${directory}/db.json`, JSON.stringify(updated, null, 2));
} catch (err) {