libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

import/export: Use Error objects for errors, not strings

Browse source
This commit is contained in:
Richard Hansen 2021-03-17 18:28:39 -04:00 committed by John McLear
parent 59c167e31b
commit 216aecd433
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/node/handler/ExportHandler.js
View file

@ -102,7 +102,7 @@ exports.doExport = async (req, res, padId, readOnlyId, type) => {
// @TODO no Promise interface for convertors (yet) // @TODO no Promise interface for convertors (yet)
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
convertor.convertFile(srcFile, destFile, type, (err) => { convertor.convertFile(srcFile, destFile, type, (err) => {
err ? reject('convertFailed') : resolve(); err ? reject(new Error('convertFailed')) : resolve();
}); });
}); });
} }

8
src/node/utils/Abiword.js
View file

@ -35,9 +35,7 @@ if (os.type().indexOf('Windows') > -1) {
abiword.stdout.on('data', (data) => { stdoutBuffer += data.toString(); }); abiword.stdout.on('data', (data) => { stdoutBuffer += data.toString(); });
abiword.stderr.on('data', (data) => { stdoutBuffer += data.toString(); }); abiword.stderr.on('data', (data) => { stdoutBuffer += data.toString(); });
abiword.on('exit', (code) => { abiword.on('exit', (code) => {
if (code !== 0) { if (code !== 0) return callback(new Error(`Abiword died with exit code ${code}`));
return callback(`Abiword died with exit code ${code}`);
}
if (stdoutBuffer !== '') { if (stdoutBuffer !== '') {
console.log(stdoutBuffer); console.log(stdoutBuffer);
} }
@ -61,13 +59,13 @@ if (os.type().indexOf('Windows') > -1) {
abiword.stderr.on('data', (data) => { stdoutBuffer += data.toString(); }); abiword.stderr.on('data', (data) => { stdoutBuffer += data.toString(); });
abiword.on('exit', (code) => { abiword.on('exit', (code) => {
spawnAbiword(); spawnAbiword();
stdoutCallback(`Abiword died with exit code ${code}`); stdoutCallback(new Error(`Abiword died with exit code ${code}`));
}); });
abiword.stdout.on('data', (data) => { abiword.stdout.on('data', (data) => {
stdoutBuffer += data.toString(); stdoutBuffer += data.toString();
// we're searching for the prompt, cause this means everything we need is in the buffer // we're searching for the prompt, cause this means everything we need is in the buffer
if (stdoutBuffer.search('AbiWord:>') !== -1) { if (stdoutBuffer.search('AbiWord:>') !== -1) {
const err = stdoutBuffer.search('OK') !== -1 ? null : stdoutBuffer; const err = stdoutBuffer.search('OK') !== -1 ? null : new Error(stdoutBuffer);
stdoutBuffer = ''; stdoutBuffer = '';
if (stdoutCallback != null && !firstPrompt) { if (stdoutCallback != null && !firstPrompt) {
stdoutCallback(err); stdoutCallback(err);

3
src/node/utils/LibreOffice.js
View file

@ -59,7 +59,8 @@ const doConvertTask = (task, callback) => {
soffice.on('exit', (code) => { soffice.on('exit', (code) => {
clearTimeout(hangTimeout); clearTimeout(hangTimeout);
if (code !== 0) { if (code !== 0) {
return callback(`LibreOffice died with exit code ${code} and message: ${stdoutBuffer}`); return callback(
new Error(`LibreOffice died with exit code ${code} and message: ${stdoutBuffer}`));
} }
callback(); callback();
}); });