From b321267e663f1c9465449c4b1549bafca187cad1 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Wed, 17 Mar 2021 19:14:36 -0400
Subject: [PATCH] LibreOffice: Use the async-provided callback to signal errors

This avoids having two callbacks, which improves readability.
---
 src/node/utils/LibreOffice.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/node/utils/LibreOffice.js b/src/node/utils/LibreOffice.js
index 168c376ec..7d5416dcf 100644
--- a/src/node/utils/LibreOffice.js
+++ b/src/node/utils/LibreOffice.js
@@ -73,10 +73,7 @@ const doConvertTask = (task, callback) => {
       libreOfficeLogger.debug(`Renaming ${sourcePath} to ${task.destFile}`);
       fs.rename(sourcePath, task.destFile, callback);
     },
-  ], (err) => {
-    callback();
-    task.callback(err);
-  });
+  ], callback);
 };
 
 // Conversion tasks will be queued up, so we don't overload the system
@@ -116,17 +113,15 @@ exports.convertFile = (srcFile, destFile, type, callback) => {
         destFile: intermediateFile,
         type: 'odt',
         fileExtension: 'odt',
-        callback,
-      }),
+      }, callback),
       (callback) => queue.push({
         srcFile: intermediateFile,
         destFile,
         type,
-        callback,
         fileExtension,
-      }),
+      }, callback),
     ], callback);
   } else {
-    queue.push({srcFile, destFile, type, callback, fileExtension});
+    queue.push({srcFile, destFile, type, fileExtension}, callback);
   }
 };