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

tar import can now process files with out of order directories

Browse Source
This commit is contained in:
zadam
2019-03-31 18:53:29 +02:00
parent 51bede6541
commit f00e1235f9
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,7 @@ async function importTar(importContext, fileBuffer, importRootNote) {
}; };
} }
function getParentNoteId(filePath, parentNoteMeta) { async function getParentNoteId(filePath, parentNoteMeta) {
let parentNoteId; let parentNoteId;
if (parentNoteMeta) { if (parentNoteMeta) {
@@ -94,7 +94,9 @@ async function importTar(importContext, fileBuffer, importRootNote) {
parentNoteId = createdPaths[parentPath]; parentNoteId = createdPaths[parentPath];
} }
else { else {
throw new Error(`Could not find existing path ${parentPath} for ${filePath}.`); // tar allows creating out of order records - i.e. file in a directory can appear in the tar stream before actual directory
// (out-of-order-directory-records.tar in test set)
parentNoteId = await saveDirectory(parentPath);
} }
} }
@@ -181,7 +183,7 @@ async function importTar(importContext, fileBuffer, importRootNote) {
const noteId = getNoteId(noteMeta, filePath); const noteId = getNoteId(noteMeta, filePath);
const noteTitle = getNoteTitle(filePath, noteMeta); const noteTitle = getNoteTitle(filePath, noteMeta);
const parentNoteId = getParentNoteId(filePath, parentNoteMeta); const parentNoteId = await getParentNoteId(filePath, parentNoteMeta);
let note = await repository.getNote(noteId); let note = await repository.getNote(noteId);
@@ -205,6 +207,8 @@ async function importTar(importContext, fileBuffer, importRootNote) {
} }
createdPaths[filePath] = noteId; createdPaths[filePath] = noteId;
return noteId;
} }
function getTextFileWithoutExtension(filePath) { function getTextFileWithoutExtension(filePath) {
@@ -222,7 +226,7 @@ async function importTar(importContext, fileBuffer, importRootNote) {
const {parentNoteMeta, noteMeta} = getMeta(filePath); const {parentNoteMeta, noteMeta} = getMeta(filePath);
const noteId = getNoteId(noteMeta, filePath); const noteId = getNoteId(noteMeta, filePath);
const parentNoteId = getParentNoteId(filePath, parentNoteMeta); const parentNoteId = await getParentNoteId(filePath, parentNoteMeta);
if (noteMeta && noteMeta.isClone) { if (noteMeta && noteMeta.isClone) {
await new Branch({ await new Branch({