From 58a857cf7921d1cd4589a2494f6419e4948acd91 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 8 Nov 2019 23:09:57 +0100
Subject: [PATCH] note revisions for images, WIP

---
 .../javascripts/dialogs/note_revisions.js     |  5 ++++
 .../javascripts/services/note_detail_image.js |  2 ++
 src/public/javascripts/services/utils.js      | 10 +++++++-
 src/routes/api/note_revisions.js              |  4 +++
 src/services/image.js                         | 25 ++++++++++++++++---
 src/services/notes.js                         |  3 ++-
 6 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/public/javascripts/dialogs/note_revisions.js b/src/public/javascripts/dialogs/note_revisions.js
index efb352491..4a220e982 100644
--- a/src/public/javascripts/dialogs/note_revisions.js
+++ b/src/public/javascripts/dialogs/note_revisions.js
@@ -61,6 +61,11 @@ $list.on('change', async () => {
     else if (note.type === 'code') {
         $content.html($("<pre>").text(fullNoteRevision.content));
     }
+    else if (note.type === 'image') {
+        $content.html($("<img>")
+            .attr("src", `data:${note.mime};base64,` + fullNoteRevision.content)
+            .css("width", "100%"));
+    }
     else {
         $content.text("Preview isn't available for this note type.");
     }
diff --git a/src/public/javascripts/services/note_detail_image.js b/src/public/javascripts/services/note_detail_image.js
index 546e2d5a3..457e90f5a 100644
--- a/src/public/javascripts/services/note_detail_image.js
+++ b/src/public/javascripts/services/note_detail_image.js
@@ -64,6 +64,8 @@ class NoteDetailImage {
             if (result.uploaded) {
                 toastService.showMessage("New revision of the image has been uploaded.")
 
+                await utils.clearBrowserCache();
+
                 await noteDetailService.reload();
             }
             else {
diff --git a/src/public/javascripts/services/utils.js b/src/public/javascripts/services/utils.js
index d806bcc3a..f8f3bcdee 100644
--- a/src/public/javascripts/services/utils.js
+++ b/src/public/javascripts/services/utils.js
@@ -205,6 +205,13 @@ function isHtmlEmpty(html) {
     return $("<div>").html(html).text().trim().length === 0 && !html.toLowerCase().includes('<img');
 }
 
+async function clearBrowserCache() {
+    if (isElectron()) {
+        const win = require('electron').remote.getCurrentWindow();
+        await win.webContents.session.clearCache();
+    }
+}
+
 export default {
     reloadApp,
     parseDate,
@@ -236,5 +243,6 @@ export default {
     getNoteTypeClass,
     getMimeTypeClass,
     closeActiveDialog,
-    isHtmlEmpty
+    isHtmlEmpty,
+    clearBrowserCache
 };
\ No newline at end of file
diff --git a/src/routes/api/note_revisions.js b/src/routes/api/note_revisions.js
index 464d66cf2..4126c6cbf 100644
--- a/src/routes/api/note_revisions.js
+++ b/src/routes/api/note_revisions.js
@@ -18,6 +18,10 @@ async function getNoteRevision(req) {
 
     await noteRevision.getContent();
 
+    if (noteRevision.content && ['file', 'image'].includes(noteRevision.type)) {
+        noteRevision.content = noteRevision.content.toString('base64');
+    }
+
     return noteRevision;
 }
 
diff --git a/src/services/image.js b/src/services/image.js
index 9b364b227..fac5ea1ff 100644
--- a/src/services/image.js
+++ b/src/services/image.js
@@ -12,6 +12,8 @@ const imageminGifLossy = require('imagemin-giflossy');
 const jimp = require('jimp');
 const imageType = require('image-type');
 const sanitizeFilename = require('sanitize-filename');
+const dateUtils = require('./date_utils');
+const NoteRevision = require("../entities/note_revision");
 
 async function processImage(uploadBuffer, originalName, shrinkImageSwitch) {
     const origImageFormat = imageType(uploadBuffer);
@@ -36,12 +38,31 @@ async function updateImage(noteId, uploadBuffer, originalName) {
 
     const note = await repository.getNote(noteId);
 
+    const noteRevision = await new NoteRevision({
+        noteId: note.noteId,
+        // title and text should be decrypted now
+        title: note.title,
+        contentLength: -1, // will be updated in .setContent()
+        type: note.type,
+        mime: note.mime,
+        isProtected: false, // will be fixed in the protectNoteRevisions() call
+        utcDateLastEdited: note.utcDateModified,
+        utcDateCreated: dateUtils.utcNowDateTime(),
+        utcDateModified: dateUtils.utcNowDateTime(),
+        dateLastEdited: note.dateModified,
+        dateCreated: dateUtils.localNowDateTime()
+    }).save();
+
+    await noteRevision.setContent(await note.getContent());
+
     note.mime = 'image/' + imageFormat.ext.toLowerCase();
 
     await note.setContent(buffer);
 
     await note.setLabel('originalFileName', originalName);
     await note.setLabel('fileSize', buffer.byteLength);
+
+    await noteService.protectNoteRevisions(note);
 }
 
 async function saveImage(parentNoteId, uploadBuffer, originalName, shrinkImageSwitch) {
@@ -62,13 +83,11 @@ async function saveImage(parentNoteId, uploadBuffer, originalName, shrinkImageSw
         ]
     });
 
-    const imageHash = note.utcDateModified.replace(" ", "_");
-
     return {
         fileName,
         note,
         noteId: note.noteId,
-        url: `api/images/${note.noteId}/${fileName}?${imageHash}`
+        url: `api/images/${note.noteId}/${fileName}`
     };
 }
 
diff --git a/src/services/notes.js b/src/services/notes.js
index a376859e5..07942e4c1 100644
--- a/src/services/notes.js
+++ b/src/services/notes.js
@@ -537,5 +537,6 @@ module.exports = {
     deleteBranch,
     protectNoteRecursively,
     scanForLinks,
-    duplicateNote
+    duplicateNote,
+    protectNoteRevisions
 };
\ No newline at end of file