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

simpler ENEX parsing

Browse Source
This commit is contained in:
zadam 2019-11-16 17:56:49 +01:00
parent 3d294c5163
commit 8a7228146c
2 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -74,8 +74,7 @@
"turndown": "5.0.3", "turndown": "5.0.3",
"turndown-plugin-gfm": "1.0.2", "turndown-plugin-gfm": "1.0.2",
"unescape": "1.0.1", "unescape": "1.0.1",
"ws": "7.2.0", "ws": "7.2.0"
"xml2js": "0.4.22"
}, },
"devDependencies": { "devDependencies": {
"electron": "6.0.12", "electron": "6.0.12",

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

@ -1,7 +1,6 @@
const sax = require("sax"); const sax = require("sax");
const fileType = require('file-type'); const fileType = require('file-type');
const stream = require('stream'); const stream = require('stream');
const xml2js = require('xml2js');
const log = require("../log"); const log = require("../log");
const utils = require("../utils"); const utils = require("../utils");
const noteService = require("../notes"); const noteService = require("../notes");
@ -22,8 +21,6 @@ let resource;
async function importEnex(taskContext, file, parentNote) { async function importEnex(taskContext, file, parentNote) {
const saxStream = sax.createStream(true); const saxStream = sax.createStream(true);
const xmlBuilder = new xml2js.Builder({ headless: true });
const parser = new xml2js.Parser({ explicitArray: true });
const rootNoteTitle = file.originalname.toLowerCase().endsWith(".enex") const rootNoteTitle = file.originalname.toLowerCase().endsWith(".enex")
? file.originalname.substr(0, file.originalname.length - 5) ? file.originalname.substr(0, file.originalname.length - 5)
@ -43,28 +40,20 @@ async function importEnex(taskContext, file, parentNote) {
// when we finish parsing. We use this to be sure that all saving has been finished before returning successfully. // when we finish parsing. We use this to be sure that all saving has been finished before returning successfully.
const saveNotePromises = []; const saveNotePromises = [];
async function parseXml(text) { function extractContent(content) {
return new Promise(function(resolve, reject) const openingNoteIndex = content.indexOf('<en-note>');
{
parser.parseString(text, function (err, result) {
if (err) {
reject(err);
}
else {
resolve(result);
}
});
});
}
function extractContent(enNote) { if (openingNoteIndex !== -1) {
// [] thing is workaround for https://github.com/Leonidas-from-XIV/node-xml2js/issues/484 content = content.substr(openingNoteIndex + 9);
let content = xmlBuilder.buildObject([enNote]); }
const endOfFirstTagIndex = content.indexOf('>'); const closingNoteIndex = content.lastIndexOf('</en-note>');
// strip the <0> and </0> tags if (closingNoteIndex !== -1) {
content = content.substr(endOfFirstTagIndex + 1, content.length - endOfFirstTagIndex - 5).trim(); content = content.substr(0, closingNoteIndex);
}
content = content.trim();
// workaround for https://github.com/ckeditor/ckeditor5-list/issues/116 // workaround for https://github.com/ckeditor/ckeditor5-list/issues/116
content = content.replace(/<li>\s+<div>/g, "<li>"); content = content.replace(/<li>\s+<div>/g, "<li>");
@ -205,10 +194,7 @@ async function importEnex(taskContext, file, parentNote) {
// 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} = note;
const xmlObject = await parseXml(content); content = extractContent(content);
// following is workaround for this issue: https://github.com/Leonidas-from-XIV/node-xml2js/issues/484
content = extractContent(xmlObject['en-note']);
const noteEntity = (await noteService.createNewNote({ const noteEntity = (await noteService.createNewNote({
parentNoteId: rootNote.noteId, parentNoteId: rootNote.noteId,
@ -220,8 +206,8 @@ async function importEnex(taskContext, file, parentNote) {
isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(), isProtected: parentNote.isProtected && protectedSessionService.isProtectedSessionAvailable(),
})).note; })).note;
for (const attr of resource.attributes) { for (const attr of attributes) {
await note.addAttribute(attr.type, attr.name, attr.value); await noteEntity.addAttribute(attr.type, attr.name, attr.value);
} }
taskContext.increaseProgressCount(); taskContext.increaseProgressCount();
@ -250,7 +236,7 @@ async function importEnex(taskContext, file, parentNote) {
})).note; })).note;
for (const attr of resource.attributes) { for (const attr of resource.attributes) {
await note.addAttribute(attr.type, attr.name, attr.value); await noteEntity.addAttribute(attr.type, attr.name, attr.value);
} }
taskContext.increaseProgressCount(); taskContext.increaseProgressCount();