lint: Run eslint --fix on src/

src/node/utils/LibreOffice.js

@@ -16,18 +16,18 @@
  * limitations under the License.
  */
 
-var async = require("async");
-var fs = require("fs");
-var log4js = require('log4js');
-var os = require("os");
-var path = require("path");
-var settings = require("./Settings");
-var spawn = require("child_process").spawn;
+const async = require('async');
+const fs = require('fs');
+const log4js = require('log4js');
+const os = require('os');
+const path = require('path');
+const settings = require('./Settings');
+const spawn = require('child_process').spawn;
 
 // Conversion tasks will be queued up, so we don't overload the system
-var queue = async.queue(doConvertTask, 1);
+const queue = async.queue(doConvertTask, 1);
 
-var libreOfficeLogger = log4js.getLogger('LibreOffice');
+const libreOfficeLogger = log4js.getLogger('LibreOffice');
 
 /**
  * Convert a file from one type to another
@@ -37,18 +37,18 @@ var libreOfficeLogger = log4js.getLogger('LibreOffice');
  * @param  {String}     type        The type to convert into
  * @param  {Function}   callback    Standard callback function
  */
-exports.convertFile = function(srcFile, destFile, type, callback) {
+exports.convertFile = function (srcFile, destFile, type, callback) {
   // Used for the moving of the file, not the conversion
-  var fileExtension = type;
+  const fileExtension = type;
 
-  if (type === "html") {
+  if (type === 'html') {
     // "html:XHTML Writer File:UTF8" does a better job than normal html exports
-    if (path.extname(srcFile).toLowerCase() === ".doc") {
-      type = "html";
+    if (path.extname(srcFile).toLowerCase() === '.doc') {
+      type = 'html';
     }
     // PDF files need to be converted with LO Draw ref https://github.com/ether/etherpad-lite/issues/4151
-    if (path.extname(srcFile).toLowerCase() === ".pdf") {
-      type = "html:XHTML Draw File"
+    if (path.extname(srcFile).toLowerCase() === '.pdf') {
+      type = 'html:XHTML Draw File';
     }
   }
 
@@ -57,58 +57,60 @@ exports.convertFile = function(srcFile, destFile, type, callback) {
   // to avoid `Error: no export filter for /tmp/xxxx.doc` error
   if (type === 'doc') {
     queue.push({
-      "srcFile": srcFile,
-      "destFile": destFile.replace(/\.doc$/, '.odt'),
-      "type": 'odt',
-      "callback": function () {
-        queue.push({"srcFile": srcFile.replace(/\.html$/, '.odt'), "destFile": destFile, "type": type, "callback": callback, "fileExtension": fileExtension });
-      }
+      srcFile,
+      destFile: destFile.replace(/\.doc$/, '.odt'),
+      type: 'odt',
+      callback() {
+        queue.push({srcFile: srcFile.replace(/\.html$/, '.odt'), destFile, type, callback, fileExtension});
+      },
     });
   } else {
-    queue.push({"srcFile": srcFile, "destFile": destFile, "type": type, "callback": callback, "fileExtension": fileExtension});
+    queue.push({srcFile, destFile, type, callback, fileExtension});
   }
 };
 
 function doConvertTask(task, callback) {
-  var tmpDir = os.tmpdir();
+  const tmpDir = os.tmpdir();
 
   async.series([
     /*
      * use LibreOffice to convert task.srcFile to another format, given in
      * task.type
      */
-    function(callback) {
+    function (callback) {
       libreOfficeLogger.debug(`Converting ${task.srcFile} to format ${task.type}. The result will be put in ${tmpDir}`);
-      var soffice = spawn(settings.soffice, [
+      const soffice = spawn(settings.soffice, [
         '--headless',
         '--invisible',
         '--nologo',
         '--nolockcheck',
         '--writer',
-        '--convert-to', task.type,
+        '--convert-to',
+        task.type,
         task.srcFile,
-        '--outdir', tmpDir
+        '--outdir',
+        tmpDir,
       ]);
       // Soffice/libreoffice is buggy and often hangs.
       // To remedy this we kill the spawned process after a while.
       const hangTimeout = setTimeout(() => {
         soffice.stdin.pause(); // required to kill hanging threads
         soffice.kill();
-      }, 120000); 
-      
-      var stdoutBuffer = '';
+      }, 120000);
+
+      let stdoutBuffer = '';
 
       // Delegate the processing of stdout to another function
-      soffice.stdout.on('data', function(data) {
+      soffice.stdout.on('data', (data) => {
         stdoutBuffer += data.toString();
       });
 
       // Append error messages to the buffer
-      soffice.stderr.on('data', function(data) {
+      soffice.stderr.on('data', (data) => {
         stdoutBuffer += data.toString();
       });
 
-      soffice.on('exit', function(code) {
+      soffice.on('exit', (code) => {
         clearTimeout(hangTimeout);
         if (code != 0) {
           // Throw an exception if libreoffice failed
@@ -117,18 +119,18 @@ function doConvertTask(task, callback) {
 
         // if LibreOffice exited succesfully, go on with processing
         callback();
-      })
+      });
     },
 
     // Move the converted file to the correct place
-    function(callback) {
-      var filename = path.basename(task.srcFile);
-      var sourceFilename = filename.substr(0, filename.lastIndexOf('.')) + '.' + task.fileExtension;
-      var sourcePath = path.join(tmpDir, sourceFilename);
+    function (callback) {
+      const filename = path.basename(task.srcFile);
+      const sourceFilename = `${filename.substr(0, filename.lastIndexOf('.'))}.${task.fileExtension}`;
+      const sourcePath = path.join(tmpDir, sourceFilename);
       libreOfficeLogger.debug(`Renaming ${sourcePath} to ${task.destFile}`);
       fs.rename(sourcePath, task.destFile, callback);
-    }
-  ], function(err) {
+    },
+  ], (err) => {
     // Invoke the callback for the local queue
     callback();