enex import recognizes images, media references are converted to links

src/routes/api/image.js

@@ -1,6 +1,6 @@
 "use strict";
 
-const image = require('../../services/image');
+const imageService = require('../../services/image');
 const repository = require('../../services/repository');
 const RESOURCE_DIR = require('../../services/resource_dir').RESOURCE_DIR;
 const fs = require('fs');
@@ -35,11 +35,11 @@ async function uploadImage(req) {
         return [400, "Unknown image type: " + file.mimetype];
     }
 
-    const {fileName, imageId} = await image.saveImage(file, noteId);
+    const {url} = await imageService.saveImage(file.buffer, file.originalname, noteId);
 
     return {
         uploaded: true,
-        url: `/api/images/${imageId}/${fileName}`
+        url
     };
 }
 

src/services/enex.js

@@ -4,6 +4,7 @@ const xml2js = require('xml2js');
 const log = require("./log");
 const utils = require("./utils");
 const noteService = require("./notes");
+const imageService = require("./image");
 
 // date format is e.g. 20181121T193703Z
 function parseDate(text) {
@@ -205,20 +206,50 @@ async function importEnex(file, parentNote) {
         // following is workaround for this issue: https://github.com/Leonidas-from-XIV/node-xml2js/issues/484
         content = extractContent(xmlObject['en-note']);
 
-        const resp = await noteService.createNote(rootNote.noteId, title, content, {
+        const noteEntity = (await noteService.createNote(rootNote.noteId, title, content, {
             attributes,
             dateCreated,
             type: 'text',
             mime: 'text/html'
-        });
+        })).note;
 
         for (const resource of resources) {
-            await noteService.createNote(resp.note.noteId, resource.title, resource.content, {
+            const hash = utils.md5(resource.content);
-                attributes: resource.attributes,
+
-                type: 'file',
+            const mediaRegex = new RegExp(`<en-media hash="${hash}"[^>]*>`, 'g');
-                mime: resource.mime
+
-            });
+            if (resource.mime.startsWith("image/")) {
+                const originalName = "image." + resource.mime.substr(6);
+
+                const { url } = await imageService.saveImage(resource.content, originalName, noteEntity.noteId);
+
+                const imageLink = `<img src="${url}">`;
+
+                noteEntity.content = noteEntity.content.replace(mediaRegex, imageLink);
+
+                if (!note.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
+                    note.content += imageLink;
+                }
+            }
+            else {
+                const resourceNote = (await noteService.createNote(noteEntity.noteId, resource.title, resource.content, {
+                    attributes: resource.attributes,
+                    type: 'file',
+                    mime: resource.mime
+                })).note;
+
+                const resourceLink = `<a href="#root/${resourceNote.noteId}">${utils.escapeHtml(resource.title)}</a>`;
+
+                noteEntity.content = noteEntity.content.replace(mediaRegex, resourceLink);
+            }
         }
+
+        // save updated content with links to files/images
+        await noteEntity.save();
+
+        console.log(noteEntity.content);
     }
 
     saxStream.on("closetag", async tag => {

src/services/image.js

@@ -11,14 +11,14 @@ const jimp = require('jimp');
 const imageType = require('image-type');
 const sanitizeFilename = require('sanitize-filename');
 
-async function saveImage(file, noteId) {
+async function saveImage(buffer, originalName, noteId) {
-    const resizedImage = await resize(file.buffer);
+    const resizedImage = await resize(buffer);
     const optimizedImage = await optimize(resizedImage);
 
     const imageFormat = imageType(optimizedImage);
 
-    const fileNameWithouExtension = file.originalname.replace(/\.[^/.]+$/, "");
+    const fileNameWithoutExtension = originalName.replace(/\.[^/.]+$/, "");
-    const fileName = sanitizeFilename(fileNameWithouExtension + "." + imageFormat.ext);
+    const fileName = sanitizeFilename(fileNameWithoutExtension + "." + imageFormat.ext);
 
     const image = await new Image({
         format: imageFormat.ext,
@@ -32,7 +32,11 @@ async function saveImage(file, noteId) {
         imageId: image.imageId
     }).save();
 
-    return {fileName, imageId: image.imageId};
+    return {
+        fileName,
+        imageId: image.imageId,
+        url: `/api/images/${image.imageId}/${fileName}`
+    };
 }
 
 const MAX_SIZE = 1000;

src/services/utils.js

@@ -3,6 +3,7 @@
 const crypto = require('crypto');
 const randtoken = require('rand-token').generator({source: 'crypto'});
 const unescape = require('unescape');
+const escape = require('escape-html');
 
 function newEntityId() {
     return randomString(12);
@@ -16,6 +17,10 @@ function randomSecureToken(bytes = 32) {
     return crypto.randomBytes(bytes).toString('base64');
 }
 
+function md5(content) {
+    return crypto.createHash('md5').update(content).digest('hex');
+}
+
 function toBase64(plainText) {
     return Buffer.from(plainText).toString('base64');
 }
@@ -59,6 +64,10 @@ async function stopWatch(what, func) {
     return ret;
 }
 
+function escapeHtml(str) {
+    return escape(str);
+}
+
 function unescapeHtml(str) {
     return unescape(str);
 }
@@ -108,6 +117,7 @@ function union(a, b) {
 module.exports = {
     randomSecureToken,
     randomString,
+    md5,
     newEntityId,
     toBase64,
     fromBase64,
@@ -117,6 +127,7 @@ module.exports = {
     isEmptyOrWhitespace,
     sanitizeSql,
     stopWatch,
+    escapeHtml,
     unescapeHtml,
     toObject,
     stripTags,

src/test/enex/Export-test.enex

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export2.dtd">
-<en-export export-date="20181101T194259Z" application="Evernote/Windows" version="6.x">
+<en-export export-date="20181105T095144Z" application="Evernote/Windows" version="6.x">
 <note><title>Formatted text</title><content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
 
@@ -5485,4 +5485,10 @@ OTg3NjMyOSwyNzkxMTA0MTYwLDEwNTc1NjM5NDksMzI1NTM2MzIzMSwzMDc1MzY3MjE4LDM0NjM5
 NjMyMjcsMTQ2OTA0Njc1NSw5ODU4ODc0NjJdLEU9WzEzMzI4OTk5NDQsMTcwMDg4NDAzNCwxNzAx
 MzQzMDg0LDE2ODQzNzAwMDMsMTY2ODQ0NjUzMiwKMTg2OTk2Mzg5Ml07ay5lbmNvZGVCYXNlNjQ9
 eDtrLmRlY29kZUJhc2U2ND1CO3JldHVybiBrfSk7Cg==
-</data><mime>application/octet-stream</mime><resource-attributes><source-url>file://Z:\home\adam\Downloads\bcrypt.min.js</source-url><file-name>bcrypt.min.js</file-name><attachment>true</attachment></resource-attributes></resource></note></en-export>
+</data><mime>application/octet-stream</mime><resource-attributes><source-url>file://Z:\home\adam\Downloads\bcrypt.min.js</source-url><file-name>bcrypt.min.js</file-name><attachment>true</attachment></resource-attributes></resource></note><note><title>Internal link to another note</title><content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+
+<en-note><div>Link to another note:&nbsp;<a href="evernote:///view/2223880/s20/76fc5a06-19de-4f03-ad53-1816f307eb5c/76fc5a06-19de-4f03-ad53-1816f307eb5c/" style="color: #69aa35;">Formatted text</a></div></en-note>]]></content><created>20181105T094707Z</created><updated>20181105T095117Z</updated><note-attributes><author>Adam Zivner</author><source>desktop.win</source><source-application>evernote.win32</source-application></note-attributes></note><note><title>Table</title><content><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+
+<en-note><div><div><br/></div><table style="border-collapse: collapse; min-width: 100%;"><colgroup><col style="width: 130px;"/><col style="width: 130px;"/><col style="width: 130px;"/></colgroup><tbody><tr><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div><b>header1</b></div></td><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div><b>header2</b></div></td><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div><b>header3</b></div></td></tr><tr><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div>abc</div></td><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div>def</div></td><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div>ghi</div></td></tr><tr><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div>123</div></td><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div>456</div></td><td style="width: 130px; padding: 8px; border: 1px solid rgb(204, 204, 204);"><div>789</div></td></tr></tbody></table><div><br/></div></div><div><br/></div></en-note>]]></content><created>20181105T094826Z</created><updated>20181105T094949Z</updated><note-attributes><author>Adam Zivner</author><source>desktop.win</source><source-application>evernote.win32</source-application></note-attributes></note></en-export>