gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

preserve dateCreated and dateModified in ENEX import, fixes #725

Browse Source
This commit is contained in:
zadam 2019-11-26 22:02:21 +01:00
parent 5e9bedd903
commit 6c7d8a9667
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/entities/note.js
View File

@ -788,6 +788,7 @@ class Note extends Entity {
delete pojo.isContentAvailable; delete pojo.isContentAvailable;
delete pojo.__attributeCache; delete pojo.__attributeCache;
delete pojo.content; delete pojo.content;
/** zero references to contentHash, probably can be removed */
delete pojo.contentHash; delete pojo.contentHash;
} }
} }

38
src/services/import/enex.js
View File

@ -3,6 +3,7 @@ const fileType = require('file-type');
const stream = require('stream'); const stream = require('stream');
const log = require("../log"); const log = require("../log");
const utils = require("../utils"); const utils = require("../utils");
const sql = require("../sql");
const noteService = require("../notes"); const noteService = require("../notes");
const imageService = require("../image"); const imageService = require("../image");
const protectedSessionService = require('../protected_session'); const protectedSessionService = require('../protected_session');
@ -11,7 +12,7 @@ const protectedSessionService = require('../protected_session');
function parseDate(text) { function parseDate(text) {
// insert - and : to make it ISO format // insert - and : to make it ISO format
text = text.substr(0, 4) + "-" + text.substr(4, 2) + "-" + text.substr(6, 2) text = text.substr(0, 4) + "-" + text.substr(4, 2) + "-" + text.substr(6, 2)
+ "T" + text.substr(9, 2) + ":" + text.substr(11, 2) + ":" + text.substr(13, 2) + "Z"; + " " + text.substr(9, 2) + ":" + text.substr(11, 2) + ":" + text.substr(13, 2) + ".000Z";
return text; return text;
} }
@ -150,7 +151,7 @@ async function importEnex(taskContext, file, parentNote) {
} else if (currentTag === 'created') { } else if (currentTag === 'created') {
note.utcDateCreated = parseDate(text); note.utcDateCreated = parseDate(text);
} else if (currentTag === 'updated') { } else if (currentTag === 'updated') {
// updated is currently ignored since utcDateModified is updated automatically with each save note.utcDateModified = parseDate(text);
} else if (currentTag === 'tag') { } else if (currentTag === 'tag') {
note.attributes.push({ note.attributes.push({
type: 'label', type: 'label',
@ -187,9 +188,27 @@ async function importEnex(taskContext, file, parentNote) {
} }
}); });
async function updateDates(noteId, utcDateCreated, utcDateModified) {
// it's difficult to force custom dateCreated and dateModified to Note entity so we do it post-creation with SQL
await sql.execute(`
UPDATE notes
SET dateCreated = ?,
utcDateCreated = ?,
dateModified = ?,
utcDateModified = ?
WHERE noteId = ?`,
[utcDateCreated, utcDateCreated, utcDateModified, utcDateModified, noteId]);
await sql.execute(`
UPDATE note_contents
SET utcDateModified = ?
WHERE noteId = ?`,
[utcDateModified, noteId]);
}
async function saveNote() { async function saveNote() {
// make a copy because stream continues with the next async call and note gets overwritten // make a copy because stream continues with the next async call and note gets overwritten
let {title, content, attributes, resources, utcDateCreated} = note; let {title, content, attributes, resources, utcDateCreated, utcDateModified} = note;
content = extractContent(content); content = extractContent(content);
@ -201,6 +220,9 @@ async function importEnex(taskContext, file, parentNote) {
isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(), isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
})).note; })).note;
utcDateCreated = utcDateCreated || noteEntity.utcDateCreated;
utcDateModified = utcDateModified || noteEntity.utcDateModified;
taskContext.increaseProgressCount(); taskContext.increaseProgressCount();
let noteContent = await noteEntity.getContent(); let noteContent = await noteEntity.getContent();
@ -224,6 +246,8 @@ async function importEnex(taskContext, file, parentNote) {
isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(), isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
})).note; })).note;
await updateDates(resourceNote.noteId, utcDateCreated, utcDateModified);
taskContext.increaseProgressCount(); taskContext.increaseProgressCount();
const resourceLink = `<a href="#root/${resourceNote.noteId}">${utils.escapeHtml(resource.title)}</a>`; const resourceLink = `<a href="#root/${resourceNote.noteId}">${utils.escapeHtml(resource.title)}</a>`;
@ -235,7 +259,9 @@ async function importEnex(taskContext, file, parentNote) {
try { try {
const originalName = "image." + resource.mime.substr(6); const originalName = "image." + resource.mime.substr(6);
const {url} = await imageService.saveImage(noteEntity.noteId, resource.content, originalName, taskContext.data.shrinkImages); const {url, note: imageNote} = await imageService.saveImage(noteEntity.noteId, resource.content, originalName, taskContext.data.shrinkImages);
await updateDates(imageNote.noteId, utcDateCreated, utcDateModified);
const imageLink = `<img src="${url}">`; const imageLink = `<img src="${url}">`;
@ -257,6 +283,10 @@ async function importEnex(taskContext, file, parentNote) {
// save updated content with links to files/images // save updated content with links to files/images
await noteEntity.setContent(noteContent); await noteEntity.setContent(noteContent);
await noteService.scanForLinks(noteEntity.noteId);
await updateDates(noteEntity.noteId, utcDateCreated, utcDateModified);
} }
saxStream.on("closetag", async tag => { saxStream.on("closetag", async tag => {