Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 13:01:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

filter out links and relations which are outside of the export

Browse Source
This commit is contained in:
azivner 2018-11-25 22:38:09 +01:00
parent be206872d1
commit 0711ea8dc8
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ async function exportToTar(branch, format, res) {
const pack = tar.pack(); const pack = tar.pack();
const exportedNoteIds = []; const noteIdToMeta = {};
function getUniqueFilename(existingFileNames, fileName) { function getUniqueFilename(existingFileNames, fileName) {
const lcFileName = fileName.toLowerCase(); const lcFileName = fileName.toLowerCase();
@ -72,7 +72,7 @@ async function exportToTar(branch, format, res) {
const baseFileName = branch.prefix ? (branch.prefix + ' - ' + note.title) : note.title; const baseFileName = branch.prefix ? (branch.prefix + ' - ' + note.title) : note.title;
if (exportedNoteIds.includes(note.noteId)) { if (note.noteId in noteIdToMeta) {
const sanitizedFileName = sanitize(baseFileName + ".clone"); const sanitizedFileName = sanitize(baseFileName + ".clone");
const fileName = getUniqueFilename(existingFileNames, sanitizedFileName); const fileName = getUniqueFilename(existingFileNames, sanitizedFileName);
@ -114,7 +114,7 @@ async function exportToTar(branch, format, res) {
meta.format = format; meta.format = format;
} }
exportedNoteIds.push(note.noteId); noteIdToMeta[note.noteId] = meta;
const childBranches = await note.getChildBranches(); const childBranches = await note.getChildBranches();
@ -193,6 +193,12 @@ async function exportToTar(branch, format, res) {
] ]
}; };
for (const noteMeta of Object.values(noteIdToMeta)) {
// filter out relations and links which are not inside this export
noteMeta.attributes = noteMeta.attributes.filter(attr => attr.type !== 'relation' || attr.value in noteIdToMeta);
noteMeta.links = noteMeta.links.filter(link => link.targetNoteId in noteIdToMeta);
}
if (!metaFile.files[0]) { // corner case of disabled export for exported note if (!metaFile.files[0]) { // corner case of disabled export for exported note
res.sendStatus(400); res.sendStatus(400);
return; return;