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

Merge remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
zadam 2022-12-22 18:16:06 +01:00
commit 4cc9bdf5e4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,10 @@ function importEnex(taskContext, file, parentNote) {
if (currentTag === 'data') { if (currentTag === 'data') {
text = text.replace(/\s/g, ''); text = text.replace(/\s/g, '');
resource.content = utils.fromBase64(text); // resource can be chunked into multiple events: https://github.com/zadam/trilium/issues/3424
// it would probably make sense to do this in a more global way since it can in theory affect any field,
// not just data
resource.content = (resource.content || "") + text;
} }
else if (currentTag === 'mime') { else if (currentTag === 'mime') {
resource.mime = text.toLowerCase(); resource.mime = text.toLowerCase();
@ -245,6 +248,8 @@ function importEnex(taskContext, file, parentNote) {
continue; continue;
} }
resource.content = utils.fromBase64(resource.content);
const hash = utils.md5(resource.content); const hash = utils.md5(resource.content);
// skip all checked/unchecked checkboxes from OneNote // skip all checked/unchecked checkboxes from OneNote