mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

import/export: Promisify Abiword and LibreOffice conversion

Browse source
This commit is contained in:
Richard Hansen 2021-03-18 01:01:47 -04:00 • committed by John McLear
parent b321267e66
commit b2c0837cf5
4 changed files with 67 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/node/handler/ImportHandler.js
View file

@ -179,17 +179,12 @@ const doImport = async (req, res, padId) => {
// if no converter only rename
await fs.rename(srcFile, destFile);
} else {
// @TODO - no Promise interface for converters (yet)
await new Promise((resolve, reject) => {
converter.convertFile(srcFile, destFile, exportExtension, (err) => {
// catch convert errors
if (err) {
logger.warn(`Converting Error: ${err.stack || err}`);
return reject(new ImportError('convertFailed'));
}
resolve();
});
});
try {
await converter.convertFile(srcFile, destFile, exportExtension);
} catch (err) {
logger.warn(`Converting Error: ${err.stack || err}`);
throw new ImportError('convertFailed');
}
}
}