From 0a7fd0288cd80fffbdbcc0f30098db43aba499e5 Mon Sep 17 00:00:00 2001 From: Evan Miller Date: Mon, 3 Dec 2018 16:14:28 -0500 Subject: [PATCH] Use promises for outputFormatter --- browser/main/lib/dataApi/exportNote.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/browser/main/lib/dataApi/exportNote.js b/browser/main/lib/dataApi/exportNote.js index b358e548..c6569730 100755 --- a/browser/main/lib/dataApi/exportNote.js +++ b/browser/main/lib/dataApi/exportNote.js @@ -44,13 +44,16 @@ function exportNote (nodeKey, storageKey, noteContent, targetPath, outputFormatt if (outputFormatter) { exportedData = outputFormatter(exportedData, exportTasks) + } else { + exportedData = Promise.resolve(exportedData) } const tasks = prepareTasks(exportTasks, storagePath, path.dirname(targetPath)) return Promise.all(tasks.map((task) => copyFile(task.src, task.dst))) - .then(() => { - return saveToFile(exportedData, targetPath) + .then(() => exportedData) + .then(data => { + return saveToFile(data, targetPath) }).catch((err) => { rollbackExport(tasks) throw err