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

enex import cleanup

Browse Source
This commit is contained in:
zadam 2020-11-18 21:30:56 +01:00
parent 6662b9dbf9
commit fd6b2f1e7f
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,10 +39,6 @@ function importEnex(taskContext, file, parentNote) {
isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(), isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
})).note; })).note;
// we're persisting notes as we parse the document, but these are run asynchronously and may not be finished
// when we finish parsing. We use this to be sure that all saving has been finished before returning successfully.
const saveNotePromises = [];
function extractContent(content) { function extractContent(content) {
const openingNoteIndex = content.indexOf('<en-note>'); const openingNoteIndex = content.indexOf('<en-note>');
@ -314,13 +310,7 @@ function importEnex(taskContext, file, parentNote) {
updateDates(noteEntity.noteId, utcDateCreated, utcDateModified); updateDates(noteEntity.noteId, utcDateCreated, utcDateModified);
} }
saxStream.on("closetag", tag => { saxStream.on("closetag", tag => path.pop());
path.pop();
if (tag === 'note') {
saveNotePromises.push(saveNote());
}
});
saxStream.on("opencdata", () => { saxStream.on("opencdata", () => {
//console.log("opencdata"); //console.log("opencdata");
@ -337,14 +327,14 @@ function importEnex(taskContext, file, parentNote) {
return new Promise((resolve, reject) => return new Promise((resolve, reject) =>
{ {
// resolve only when we parse the whole document AND saving of all notes have been finished // resolve only when we parse the whole document AND saving of all notes have been finished
saxStream.on("end", () => { Promise.all(saveNotePromises).then(() => resolve(rootNote)) }); saxStream.on("end", () => resolve(rootNote));
const bufferStream = new stream.PassThrough(); const bufferStream = new stream.PassThrough();
bufferStream.end(file.buffer); bufferStream.end(file.buffer);
bufferStream bufferStream
// rate limiting to improve responsiveness during / after import // rate limiting to improve responsiveness during / after import
.pipe(new Throttle({rate: 300000})) .pipe(new Throttle({rate: 500000}))
.pipe(saxStream); .pipe(saxStream);
}); });
} }