libreoffice-convert 1.3.1 → 1.3.5

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/Readme.md

@@ -1,33 +1,38 @@
-# libreoffice-convert #
+# libreoffice-convert
 
 A simple and fast node.js module for converting office documents to different formats.
 
-## Dependency ##
+## Dependency
 
 Please install libreoffice in /Applications (Mac), with your favorite package manager (Linux), or with the msi (Windows).
 
+## Usage example
 
-## Usage example ##
 ```javascript
-const libre = require('libreoffice-convert');
+'use strict';
 
 const path = require('path');
-const fs = require('fs');
-
-const extend = '.pdf'
-const enterPath = path.join(__dirname, '/resources/example.docx');
-const outputPath = path.join(__dirname, `/resources/example${extend}`);
-
-// Read file
-const file = fs.readFileSync(enterPath);
-// Convert it to pdf format with undefined filter (see Libreoffice doc about filter)
-libre.convert(file, extend, undefined, (err, done) => {
-    if (err) {
-      console.log(`Error converting file: ${err}`);
-    }
+const fs = require('fs').promises;
+
+const libre = require('libreoffice-convert');
+libre.convertAsync = require('util').promisify(libre.convert);
+
+async function main() {
+    const ext = '.pdf'
+    const inputPath = path.join(__dirname, '/resources/example.docx');
+    const outputPath = path.join(__dirname, `/resources/example${ext}`);
+
+    // Read file
+    const docxBuf = await fs.readFile(inputPath);
+
+    // Convert it to pdf format with undefined filter (see Libreoffice docs about filter)
+    let pdfBuf = await libre.convertAsync(docxBuf, ext, undefined);
     
     // Here in done you have pdf file which you can save or transfer in another stream
-    fs.writeFileSync(outputPath, done);
+    await fs.writeFile(outputPath, pdfBuf);
+}
+
+main().catch(function (err) {
+    console.log(`Error converting file: ${err}`);
 });
 ```
-

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,7 +37,7 @@ 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]);
                 }
             );
         },
@@ -55,7 +55,7 @@ const convertWithOptions = (document, format, filter, options, 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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libreoffice-convert",
-  "version": "1.3.1",
+  "version": "1.3.5",
   "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": {