From 44219e7ccccc852da151a90ab105a5ecf33134ac Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 13 Mar 2020 22:23:44 +0100
Subject: [PATCH] do not load the note content during ENEX import again since
 it's already available

---
 src/services/import/enex.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/services/import/enex.js b/src/services/import/enex.js
index 070040a98..86f27b17d 100644
--- a/src/services/import/enex.js
+++ b/src/services/import/enex.js
@@ -235,8 +235,6 @@ async function importEnex(taskContext, file, parentNote) {
 
         taskContext.increaseProgressCount();
 
-        let noteContent = await noteEntity.getContent();
-
         for (const resource of resources) {
             const hash = utils.md5(resource.content);
 
@@ -268,7 +266,7 @@ async function importEnex(taskContext, file, parentNote) {
 
                 const resourceLink = `<a href="#root/${resourceNote.noteId}">${utils.escapeHtml(resource.title)}</a>`;
 
-                noteContent = noteContent.replace(mediaRegex, resourceLink);
+                content = content.replace(mediaRegex, resourceLink);
             };
 
             if (["image/jpeg", "image/png", "image/gif", "image/webp"].includes(resource.mime)) {
@@ -281,12 +279,12 @@ async function importEnex(taskContext, file, parentNote) {
 
                     const imageLink = `<img src="${url}">`;
 
-                    noteContent = noteContent.replace(mediaRegex, imageLink);
+                    content = content.replace(mediaRegex, imageLink);
 
-                    if (!noteContent.includes(imageLink)) {
+                    if (!content.includes(imageLink)) {
                         // if there wasn't any match for the reference, we'll add the image anyway
                         // otherwise image would be removed since no note would include it
-                        noteContent += imageLink;
+                        content += imageLink;
                     }
                 } catch (e) {
                     log.error("error when saving image from ENEX file: " + e);
@@ -298,7 +296,7 @@ async function importEnex(taskContext, file, parentNote) {
         }
 
         // save updated content with links to files/images
-        await noteEntity.setContent(noteContent);
+        await noteEntity.setContent(content);
 
         await noteService.scanForLinks(noteEntity.noteId);