mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 16:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

LibreOffice: Use async.series to properly handle conversion errors

Browse source
This commit is contained in:
Richard Hansen 2021-03-18 00:19:28 -04:00 • committed by John McLear
parent a6d5611c80
commit b914a46a87
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,23 +110,22 @@ exports.convertFile = (srcFile, destFile, type, callback) => {
// to avoid `Error: no export filter for /tmp/xxxx.doc` error // to avoid `Error: no export filter for /tmp/xxxx.doc` error
if (type === 'doc') { if (type === 'doc') {
const intermediateFile = destFile.replace(/\.doc$/, '.odt'); const intermediateFile = destFile.replace(/\.doc$/, '.odt');
queue.push({ async.series([
(callback) => queue.push({
srcFile, srcFile,
destFile: intermediateFile, destFile: intermediateFile,
type: 'odt', type: 'odt',
fileExtension: 'odt', fileExtension: 'odt',
callback: () => { callback,
queue.push( }),
{ (callback) => queue.push({
srcFile: intermediateFile, srcFile: intermediateFile,
destFile, destFile,
type, type,
callback, callback,
fileExtension, fileExtension,
} }),
); ], callback);
},
});
} else { } else {
queue.push({srcFile, destFile, type, callback, fileExtension}); queue.push({srcFile, destFile, type, callback, fileExtension});
} }