Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-16 02:05:53 +01:00
Code Issues Packages Projects Releases Activity

fix incorrect import of relations from tar

Browse Source 
(cherry picked from commit 8d14a0d687)
This commit is contained in:
zadam
2019-10-02 23:22:58 +02:00
parent adae0625b9
commit 3eebce22e7
4 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/services/import/tar.js
View File

@@ -1,6 +1,5 @@
"use strict";
const Attribute = require('../../entities/attribute');
const utils = require('../../services/utils');
const log = require('../../services/log');
@@ -114,28 +113,18 @@ async function importTar(importContext, fileBuffer, importRootNote) {
}
function getNoteId(noteMeta, filePath) {
let noteId;
const filePathNoExt = getTextFileWithoutExtension(filePath);
if (noteMeta) {
if (filePathNoExt in createdPaths) {
noteId = createdPaths[filePathNoExt];
noteIdMap[noteMeta.noteId] = noteId;
}
else {
noteId = getNewNoteId(noteMeta.noteId);
}
}
else {
if (filePathNoExt in createdPaths) {
noteId = createdPaths[filePathNoExt];
}
else {
noteId = utils.newEntityId();
}
console.log(`Searching for noteId of filePath ${filePath} with meta: ${!!noteMeta}`);
if (filePathNoExt in createdPaths) {
console.log("Found existing path", filePathNoExt, createdPaths[filePathNoExt]);
return createdPaths[filePathNoExt];
}
const noteId = noteMeta ? getNewNoteId(noteMeta.noteId) : utils.newEntityId();
createdPaths[filePathNoExt] = noteId;
return noteId;
@@ -234,7 +223,8 @@ async function importTar(importContext, fileBuffer, importRootNote) {
absUrl += (absUrl.length > 0 ? '/' : '') + url;
const targetNoteId = getNoteId(null, absUrl);
const {noteMeta} = getMeta(absUrl);
const targetNoteId = getNoteId(noteMeta, absUrl);
return targetNoteId;
}
@@ -340,22 +330,6 @@ async function importTar(importContext, fileBuffer, importRootNote) {
await saveAttributes(note, noteMeta);
if (!noteMeta && (type === 'file' || type === 'image')) {
attributes.push({
noteId,
type: 'label',
name: 'originalFileName',
value: path.basename(filePath)
});
attributes.push({
noteId,
type: 'label',
name: 'fileSize',
value: content.byteLength
});
}
if (!firstNote) {
firstNote = note;
}
@@ -364,6 +338,22 @@ async function importTar(importContext, fileBuffer, importRootNote) {
filePath = getTextFileWithoutExtension(filePath);
}
}
if (!noteMeta && (type === 'file' || type === 'image')) {
attributes.push({
noteId,
type: 'label',
name: 'originalFileName',
value: path.basename(filePath)
});
attributes.push({
noteId,
type: 'label',
name: 'fileSize',
value: content.byteLength
});
}
}
/** @return {string} path without leading or trailing slash and backslashes converted to forward ones*/
@@ -426,7 +416,9 @@ async function importTar(importContext, fileBuffer, importRootNote) {
const noteId = createdPaths[path];
createdNoteIds[noteId] = true;
}
for (const noteId in createdNoteIds) { // now the noteIds are unique
await noteService.scanForLinks(noteId);
importContext.increaseProgressCount();