From 3808c08c2db3641b0928f6dc743feb3a31bcbf43 Mon Sep 17 00:00:00 2001 From: Erik Michelson Date: Tue, 2 Feb 2021 00:38:54 +0100 Subject: Fix note creation in FreeURL mode not using template As explained in #391, the previous note creation logic didn't handle the case "alias is set, but it's not a file on disk". The fix introduces a separate if-statement for this scenario at the cost of a doubled filesystem read access. Co-Authored-By: @evanlinde Signed-off-by: Erik Michelson --- lib/models/note.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/models/note.js b/lib/models/note.js index 9fe02359..7418c47e 100644 --- a/lib/models/note.js +++ b/lib/models/note.js @@ -93,11 +93,12 @@ module.exports = function (sequelize, DataTypes) { if (!note.content) { var body = null let filePath = null - if (!note.alias) { - filePath = config.defaultNotePath - } else { + if (note.alias) { filePath = path.join(config.docsPath, note.alias + '.md') } + if (!filePath || !Note.checkFileExist(filePath)) { + filePath = config.defaultNotePath + } if (Note.checkFileExist(filePath)) { var fsCreatedTime = moment(fs.statSync(filePath).ctime) body = fs.readFileSync(filePath, 'utf8') -- cgit v1.2.3