From 6515dd7b2352049e7b3900667244266d0b9af634 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 12 Nov 2023 23:57:21 +0100 Subject: [PATCH] fix assigning extension to attachment export filenames, closes #4415 --- src/services/export/zip.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/services/export/zip.js b/src/services/export/zip.js index 704b94b6f..9fb9cd59f 100644 --- a/src/services/export/zip.js +++ b/src/services/export/zip.js @@ -75,15 +75,14 @@ async function exportToZip(taskContext, branch, format, res, setHeaders = true) * @return {string} */ function getDataFileName(type, mime, baseFileName, existingFileNames) { - let fileName = baseFileName; + let fileName = baseFileName.trim(); + if (fileName.length > 30) { + fileName = fileName.substr(0, 30).trim(); + } let existingExtension = path.extname(fileName).toLowerCase(); let newExtension; - if (fileName.length > 30) { - fileName = fileName.substr(0, 30); - } - // the following two are handled specifically since we always want to have these extensions no matter the automatic detection // and/or existing detected extensions in the note name if (type === 'text' && format === 'markdown') { @@ -108,7 +107,7 @@ async function exportToZip(taskContext, branch, format, res, setHeaders = true) } } - // if the note is already named with extension (e.g. "jquery"), then it's silly to append the exact same extension again + // if the note is already named with the extension (e.g. "image.jpg"), then it's silly to append the exact same extension again if (newExtension && existingExtension !== `.${newExtension.toLowerCase()}`) { fileName += `.${newExtension}`; }