浏览代码

Update index.js

master
yosef langer 4 年前
父节点
当前提交
718a47e954
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 10 次插入5 次删除
  1. 10
    5
      index.js

+ 10
- 5
index.js 查看文件

@@ -19,7 +19,7 @@ function fileExist(file) {
return new Promise((resolve, reject) => {
fs.access(file, fs.constants.F_OK, (err) => {
if (err && err.code === "ENOENT") {
reject(new Error(`${file} does not exist`));
resolve(false);
} else {
resolve(true);
}
@@ -116,21 +116,26 @@ exports.convert = async ({
`${outputDir}${outputImg}`,
];
const libreOfficeBins = [
libreofficeBin,
...(libreofficeBin ? [libreofficeBin] : []),
...(Array.isArray(libreofficeBins) ? libreofficeBins : [])

];
if (!libreofficeBin) {
libreOfficeBins.push(path.resolve("C:\\\\Program Files\\\\LibreOffice\\\\program\\\\soffice.exe"));
libreOfficeBins.push(path.resolve("C:\\\\Program Files (x86)\\\\LibreOffice\\\\program\\\\soffice.exe"));
libreOfficeBins.push(path.resolve("C:\\\\Program Files (x86)\\\\LIBREO~1\\\\program\\\\soffice.exe"));
libreOfficeBins.push(path.resolve("/usr/bin/libreoffice"));
libreOfficeBins.push(path.resolve("/usr/bin/soffice"));
libreOfficeBins.push(path.resolve("/Applications/LibreOffice.app/Contents/MacOS/soffice"));
libreOfficeBins.push(path.resolve("C:\\\\Program Files\\\\LibreOffice\\\\program\\\\soffice.exe"));
libreOfficeBins.push(path.resolve("C:\\\\Program Files (x86)\\\\LibreOffice\\\\program\\\\soffice.exe"));
libreOfficeBins.push(path.resolve("C:\\\\Program Files (x86)\\\\LIBREO~1\\\\program\\\\soffice.exe"));
}

return getFileThatExist(...libreOfficeBins).then((libreofficeBin) => {
if (libreofficeBin) {
//Re arrange the array for more efficient future runs
if (libreOfficeBins[0] !== libreofficeBin) {
libreOfficeBins.splice(libreOfficeBins.indexOf(libreofficeBin), 1);
libreOfficeBins.unshift(libreofficeBin);
}
return filesExist(sourceFile).then((srcExist) => {
if (srcExist) {
if (ext === ".pdf")

正在加载...
取消
保存