libreoffice-convert 1.4.1 → 1.5.1

package/index.js

@@ -10,6 +10,7 @@ const { execFile } = require('child_process');
 const convertWithOptions = (document, format, filter, options, callback) => {
     const tmpOptions = (options || {}).tmpOptions || {};
     const asyncOptions = (options || {}).asyncOptions || {};
+    const execOptions = (options || {}).execOptions || {};
     const tempDir = tmp.dirSync({prefix: 'libreofficeConvert_', unsafeCleanup: true, ...tmpOptions});
     const installDir = tmp.dirSync({prefix: 'soffice', unsafeCleanup: true, ...tmpOptions});
     return async.auto({
@@ -18,7 +19,7 @@ const convertWithOptions = (document, format, filter, options, callback) => {
             switch (process.platform) {
                 case 'darwin': paths = [...paths, '/Applications/LibreOffice.app/Contents/MacOS/soffice'];
                     break;
-                case 'linux': paths = [...paths, '/usr/bin/libreoffice', '/usr/bin/soffice', '/snap/bin/libreoffice'];
+                case 'linux': paths = [...paths, '/usr/bin/libreoffice', '/usr/bin/soffice', '/snap/bin/libreoffice', '/opt/libreoffice/program/soffice', '/opt/libreoffice7.6/program/soffice'];
                     break;
                 case 'win32': paths = [
                     ...paths,
@@ -45,13 +46,18 @@ const convertWithOptions = (document, format, filter, options, callback) => {
         },
         saveSource: callback => fs.writeFile(path.join(tempDir.name, 'source'), document, callback),
         convert: ['soffice', 'saveSource', (results, callback) => {
-            let command = `-env:UserInstallation=${url.pathToFileURL(installDir.name)} --headless --convert-to ${format}`;
-            if (filter !== undefined) {
-                command += `:"${filter}"`;
-            }
-            command += ` --outdir ${tempDir.name} ${path.join(tempDir.name, 'source')}`;
-            const args = command.split(' ');
-            return execFile(results.soffice, args, callback);
+            let filterParam = filter?.length ? `:${filter}` : "";
+            let fmt = !(filter ?? "").includes(" ") ? `${format}${filterParam}` : `"${format}${filterParam}"`;
+            let args = [];
+            args.push(`-env:UserInstallation=${url.pathToFileURL(installDir.name)}`);
+            args.push('--headless');
+            args.push('--convert-to');
+            args.push(fmt);
+            args.push('--outdir');
+            args.push(tempDir.name);
+            args.push(path.join(tempDir.name, 'source'));
+          
+            return execFile(results.soffice, args, execOptions, callback);
         }],
         loadDestination: ['convert', (results, callback) =>
             async.retry({
@@ -59,15 +65,13 @@ const convertWithOptions = (document, format, filter, options, callback) => {
                 interval: asyncOptions.interval || 200
             }, (callback) => fs.readFile(path.join(tempDir.name, `source.${format.split(":")[0]}`), callback), callback)
         ]
-    }, (err, res) => {
+    }).then( (res) => {
+        return callback(null, res.loadDestination);
+    }).catch( (err) => {
+        return callback(err);
+    }).finally( () => {
         tempDir.removeCallback();
         installDir.removeCallback();
-
-        if (err) {
-            return callback(err);
-        }
-
-        return callback(null, res.loadDestination);
     });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreoffice-convert",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "description": "A simple and fast node.js module for converting office documents to different formats",
   "main": "index.js",
   "types": "index.d.ts",