self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-18 23:07:45 +02:00
Code Issues Releases Activity

Desktop, Cli: Fixed various bugs related to the import of ENEX files as HTML

Browse Source
This commit is contained in:
Laurent Cozic
2020-06-15 17:10:51 +01:00
parent 6a41d6e85a
commit fcd00b3212
7 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ReactNativeClient/lib/import-enex-html-gen.js
View File

@ -1,6 +1,9 @@
const stringToStream = require('string-to-stream');
const cleanHtml = require('clean-html');
const resourceUtils = require('lib/resourceUtils.js');
const { isSelfClosingTag } = require('lib/htmlUtils');
const Entities = require('html-entities').AllHtmlEntities;
const htmlentities = new Entities().encode;
function addResourceTag(lines, resource, attributes) {
// Note: refactor to use Resource.markdownTag
@ -56,7 +59,7 @@ function enexXmlToHtml_(stream, resources) {
}
};
return new Promise((resolve, reject) => {
return new Promise((resolve) => {
const options = {};
const strict = false;
const saxStream = require('sax').createStream(strict, options);
@ -69,12 +72,11 @@ function enexXmlToHtml_(stream, resources) {
saxStream.on('error', function(e) {
console.warn(e);
// reject(e);
});
saxStream.on('text', function(text) {
section.lines.push(text);
section.lines.push(htmlentities(text));
});
saxStream.on('opentag', function(node) {
@ -110,7 +112,7 @@ function enexXmlToHtml_(stream, resources) {
}
if (!found) {
reject(`Hash with no associated resource: ${hash}`);
// console.warn(`Hash with no associated resource: ${hash}`);
}
}
@ -122,16 +124,16 @@ function enexXmlToHtml_(stream, resources) {
}
} else if (tagName == 'en-todo') {
section.lines.push('<input type="checkbox" onclick="return false;" />');
} else if (node.isSelfClosing) {
section.lines.push(`<${tagName}${attributesStr}>`);
} else if (isSelfClosingTag(tagName)) {
section.lines.push(`<${tagName}${attributesStr}/>`);
} else {
section.lines.push(`<${tagName}${attributesStr} />`);
section.lines.push(`<${tagName}${attributesStr}>`);
}
});
saxStream.on('closetag', function(n) {
const tagName = n ? n.toLowerCase() : n;
section.lines.push(`</${tagName}>`);
saxStream.on('closetag', function(node) {
const tagName = node ? node.toLowerCase() : node;
if (!isSelfClosingTag(tagName)) section.lines.push(`</${tagName}>`);
});
saxStream.on('attribute', function() {});
@ -151,19 +153,19 @@ async function enexXmlToHtml(xmlString, resources, options = {}) {
const stream = stringToStream(xmlString);
const result = await enexXmlToHtml_(stream, resources, options);
try {
const preCleaning = result.content.lines.join(''); // xmlString
const final = await beautifyHtml(preCleaning);
return final.join('');
} catch (error) {
console.warn(error);
}
const preCleaning = result.content.lines.join('');
const final = await beautifyHtml(preCleaning);
return final.join('');
}
const beautifyHtml = (html) => {
return new Promise((resolve) => {
const options = { wrap: 0 };
cleanHtml.clean(html, options, (...cleanedHtml) => resolve(cleanedHtml));
try {
cleanHtml.clean(html, { wrap: 0 }, (...cleanedHtml) => resolve(cleanedHtml));
} catch (error) {
console.warn(`Could not clean HTML - the "unclean" version will be used: ${error.message}: ${html.trim().substr(0, 512).replace(/[\n\r]/g, ' ')}...`);
resolve([html]);
}
});
};