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

tar export fixes + added code block example to the demo document

Browse Source
This commit is contained in:
zadam 2019-12-25 11:56:55 +01:00
parent ab79f24729
commit 73c8d145fa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
db/demo.tar
View File

Binary file not shown.

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

@ -190,13 +190,13 @@ async function exportToTar(taskContext, branch, format, res) {
for (let i = 0; i < targetPath.length - 1; i++) { for (let i = 0; i < targetPath.length - 1; i++) {
const meta = noteIdToMeta[targetPath[i]]; const meta = noteIdToMeta[targetPath[i]];
url += meta.dirFileName + '/'; url += encodeURIComponent(meta.dirFileName) + '/';
} }
const meta = noteIdToMeta[targetPath[targetPath.length - 1]]; const meta = noteIdToMeta[targetPath[targetPath.length - 1]];
// link can target note which is only "folder-note" and as such will not have a file in an export // link can target note which is only "folder-note" and as such will not have a file in an export
url += meta.dataFileName || meta.dirFileName; url += encodeURIComponent(meta.dataFileName || meta.dirFileName);
return url; return url;
} }
@ -205,13 +205,13 @@ async function exportToTar(taskContext, branch, format, res) {
content = content.replace(/src="[^"]*api\/images\/([a-zA-Z0-9]+)\/[^"]*"/g, (match, targetNoteId) => { content = content.replace(/src="[^"]*api\/images\/([a-zA-Z0-9]+)\/[^"]*"/g, (match, targetNoteId) => {
const url = getTargetUrl(targetNoteId, noteMeta); const url = getTargetUrl(targetNoteId, noteMeta);
return url ? `src="${encodeURIComponent(url)}"` : match; return url ? `src="${url}"` : match;
}); });
content = content.replace(/href="[^"]*#root[a-zA-Z0-9\/]*\/([a-zA-Z0-9]+)\/?"/g, (match, targetNoteId) => { content = content.replace(/href="[^"]*#root[a-zA-Z0-9\/]*\/([a-zA-Z0-9]+)\/?"/g, (match, targetNoteId) => {
const url = getTargetUrl(targetNoteId, noteMeta); const url = getTargetUrl(targetNoteId, noteMeta);
return url ? `href="${encodeURIComponent(url)}"` : match; return url ? `href="${url}"` : match;
}); });
return content; return content;
@ -263,7 +263,7 @@ ${content}
if (noteMeta.isClone) { if (noteMeta.isClone) {
const targetUrl = getTargetUrl(noteMeta.noteId, noteMeta); const targetUrl = getTargetUrl(noteMeta.noteId, noteMeta);
let content = `<p>This is a clone of a note. Go to its <a href="${encodeURIComponent(targetUrl)}">primary location</a>.</p>`; let content = `<p>This is a clone of a note. Go to its <a href="${targetUrl}">primary location</a>.</p>`;
content = prepareContent(noteMeta.title, content, noteMeta); content = prepareContent(noteMeta.title, content, noteMeta);