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 = `${utils.escapeHtml(resource.title)}`; - 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 = ``; - 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); diff --git a/src/services/sql.js b/src/services/sql.js index d352818e4..dba837c51 100644 --- a/src/services/sql.js +++ b/src/services/sql.js @@ -211,6 +211,8 @@ async function transactional(func) { transactionActive = false; resolve(); + + setTimeout(() => require('./ws').sendPingToAllClients(), 50); } catch (e) { if (transactionActive) {