libreoffice-convert 1.3.0 → 1.3.4

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 René Rössler
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/index.js

@@ -17,7 +17,7 @@ const convertWithOptions = (document, format, filter, options, callback) => {
             switch (process.platform) {
                 case 'darwin': paths = ['/Applications/LibreOffice.app/Contents/MacOS/soffice'];
                     break;
-                case 'linux': paths = ['/usr/bin/libreoffice', '/usr/bin/soffice'];
+                case 'linux': paths = ['/usr/bin/libreoffice', '/usr/bin/soffice', '/snap/bin/libreoffice'];
                     break;
                 case 'win32': paths = [
                     path.join(process.env['PROGRAMFILES(X86)'], 'LIBREO~1/program/soffice.exe'),
@@ -37,25 +37,25 @@ const convertWithOptions = (document, format, filter, options, callback) => {
                         return callback(new Error('Could not find soffice binary'));
                     }
 
-                    return callback(null, process.platform === 'win32' ? `"${res[0]}"` : res[0]);
+                    return callback(null, res[0]);
                 }
             );
         },
         saveSource: callback => fs.writeFile(path.join(tempDir.name, 'source'), document, callback),
         convert: ['soffice', 'saveSource', (results, callback) => {
-            let command = `${results.soffice} -env:UserInstallation=file://${installDir.name} --headless --convert-to ${format}`;
+            let command = `-env:UserInstallation=file://${installDir.name} --headless --convert-to ${format}`;
             if (filter !== undefined) {
                 command += `:"${filter}"`;
             }
             command += ` --outdir ${tempDir.name} ${path.join(tempDir.name, 'source')}`;
-            command = command.split(' ');
-            return execFile(command[0], command.slice(1), callback);
+            const args = command.split(' ');
+            return execFile(results.soffice, args, callback);
         }],
         loadDestination: ['convert', (results, callback) =>
             async.retry({
                 times: asyncOptions.times || 3,
                 interval: asyncOptions.interval || 200
-            }, (callback) => fs.readFile(path.join(tempDir.name, `source.${format}`), callback), callback)
+            }, (callback) => fs.readFile(path.join(tempDir.name, `source.${format.split(":")[0]}`), callback), callback)
         ]
     }, (err, res) => {
         tempDir.removeCallback();
@@ -76,4 +76,4 @@ const convert = (document, format, filter, callback) => {
 module.exports = {
     convert,
     convertWithOptions
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreoffice-convert",
-  "version": "1.3.0",
+  "version": "1.3.4",
   "description": "A simple and fast node.js module for converting office documents to different formats",
   "main": "index.js",
   "repository": "https://github.com/elwerene/libreoffice-convert",
@@ -18,7 +18,8 @@
   "contributors": [
     "René Rössler <rene@freshx.de>",
     "Dmitrii Kosinov <dnk@kakveselo.ru>",
-    "Brian Chong <bgorhoball@protonmail.com>"
+    "Brian Chong <bgorhoball@protonmail.com>",
+    "Võ Văn Khoa"
   ],
   "license": "MIT",
   "dependencies": {