libreoffice-convert 1.5.1 → 1.6.1

package/Readme.md

@@ -4,7 +4,8 @@ A simple and fast node.js module for converting office documents to different fo
 
 ## Dependency
 
-Please install libreoffice in /Applications (Mac), with your favorite package manager (Linux), or with the msi (Windows).
+Please install libreoffice in /Applications (Mac), with your favorite package manager (Linux), or with the msi (Windows)
+(On Windows, add `PROGRAMFILES` environment variable for Windows program files path to your local project)
 
 ## Usage example
 

package/index.d.ts

@@ -14,6 +14,7 @@ declare module "libreoffice-convert" {
       tmpOptions?: Record<string | number | symbol, unknown>;
       asyncOptions?: { times?: number; interval?: number };
       sofficeBinaryPaths?: string[];
+      fileName?: string;
     },
     callback: (err: NodeJS.ErrnoException | null, data: Buffer) => void
   ): void;

package/index.js

@@ -11,6 +11,7 @@ const convertWithOptions = (document, format, filter, options, callback) => {
     const tmpOptions = (options || {}).tmpOptions || {};
     const asyncOptions = (options || {}).asyncOptions || {};
     const execOptions = (options || {}).execOptions || {};
+    const fileName = (options || {}).fileName || 'source';
     const tempDir = tmp.dirSync({prefix: 'libreofficeConvert_', unsafeCleanup: true, ...tmpOptions});
     const installDir = tmp.dirSync({prefix: 'soffice', unsafeCleanup: true, ...tmpOptions});
     return async.auto({
@@ -23,9 +24,12 @@ const convertWithOptions = (document, format, filter, options, callback) => {
                     break;
                 case 'win32': paths = [
                     ...paths,
-                    path.join(process.env['PROGRAMFILES(X86)'], 'LIBREO~1/program/soffice.exe'),
-                    path.join(process.env['PROGRAMFILES(X86)'], 'LibreOffice/program/soffice.exe'),
-                    path.join(process.env.PROGRAMFILES, 'LibreOffice/program/soffice.exe'),
+                    path.join(process.env['PROGRAMFILES(X86)'] || '', 'LIBREO~1/program/soffice.exe'),
+                    path.join(process.env['PROGRAMFILES(X86)'] || '', 'LibreOffice/program/soffice.exe'),
+                    path.join(process.env.PROGRAMFILES_X86 || '', 'LibreOffice/program/soffice.exe'),
+                    path.join(process.env.PROGRAMFILES || '', 'LibreOffice/program/soffice.exe'),  
+                    process.env.LIBRE_OFFICE_EXE || '',
+                     'C:/Program Files/LibreOffice/program/soffice.exe'
                 ];
                     break;
                 default:
@@ -44,7 +48,7 @@ const convertWithOptions = (document, format, filter, options, callback) => {
                 }
             );
         },
-        saveSource: callback => fs.writeFile(path.join(tempDir.name, 'source'), document, callback),
+        saveSource: callback => fs.writeFile(path.join(tempDir.name, fileName), document, callback),
         convert: ['soffice', 'saveSource', (results, callback) => {
             let filterParam = filter?.length ? `:${filter}` : "";
             let fmt = !(filter ?? "").includes(" ") ? `${format}${filterParam}` : `"${format}${filterParam}"`;
@@ -55,7 +59,7 @@ const convertWithOptions = (document, format, filter, options, callback) => {
             args.push(fmt);
             args.push('--outdir');
             args.push(tempDir.name);
-            args.push(path.join(tempDir.name, 'source'));
+            args.push(path.join(tempDir.name, fileName));
           
             return execFile(results.soffice, args, execOptions, callback);
         }],
@@ -63,7 +67,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.split(":")[0]}`), callback), callback)
+            }, (callback) => fs.readFile(path.join(tempDir.name, `${fileName}.${format.split(":")[0]}`), callback), callback)
         ]
     }).then( (res) => {
         return callback(null, res.loadDestination);

package/package.json

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