Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

note content refactoring, WIP

Browse Source
This commit is contained in:
zadam
2019-02-06 21:29:23 +01:00
parent 8884177d9f
commit c487a95bc7
17 changed files with 158 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/services/export/tar.js
View File

@@ -123,7 +123,7 @@ async function exportToTar(branch, format, res) {
const childBranches = await note.getChildBranches();
// if it's a leaf then we'll export it even if it's empty
if (note.content.length > 0 || childBranches.length === 0) {
if ((await note.getContent()).length > 0 || childBranches.length === 0) {
meta.dataFileName = getDataFileName(note, baseFileName, existingFileNames);
}
@@ -147,19 +147,21 @@ async function exportToTar(branch, format, res) {
return meta;
}
function prepareContent(note, format) {
async function prepareContent(note, format) {
const content = await note.getContent();
if (format === 'html') {
if (!note.content.toLowerCase().includes("<html")) {
note.content = '<html><head><meta charset="utf-8"></head><body>' + note.content + '</body></html>';
if (!content.toLowerCase().includes("<html")) {
note.content = '<html><head><meta charset="utf-8"></head><body>' + content + '</body></html>';
}
return html.prettyPrint(note.content, {indent_size: 2});
return html.prettyPrint(content, {indent_size: 2});
}
else if (format === 'markdown') {
return turndownService.turndown(note.content);
return turndownService.turndown(content);
}
else {
return note.content;
return content;
}
}
@@ -179,7 +181,7 @@ async function exportToTar(branch, format, res) {
notePaths[note.noteId] = path + (noteMeta.dataFileName || noteMeta.dirFileName);
if (noteMeta.dataFileName) {
const content = prepareContent(note, noteMeta.format);
const content = await prepareContent(note, noteMeta.format);
pack.entry({name: path + noteMeta.dataFileName, size: content.length}, content);
}