Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run zip import in a transaction. #3031

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Run zip import in a transaction. #3031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 30 additions & 21 deletions src/services/import/zip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const utils = require('../../services/utils');
const log = require('../../services/log');
const noteService = require('../../services/notes');
const attributeService = require('../../services/attributes');
const sql = require("../../services/sql");
const Branch = require('../../becca/entities/branch');
const path = require('path');
const commonmark = require('commonmark');
Expand Down Expand Up @@ -479,44 +480,52 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
zipfile.readEntry();
});

const tasks = [];

await readZipFile(fileBuffer, async (zipfile, entry) => {
const filePath = normalizeFilePath(entry.fileName);

if (/\/$/.test(entry.fileName)) {
saveDirectory(filePath);
tasks.push(() => saveDirectory(filePath));
}
else if (filePath !== '!!!meta.json') {
const content = await readContent(zipfile, entry);

saveNote(filePath, content);
tasks.push(() => saveNote(filePath, content));
}

taskContext.increaseProgressCount();
zipfile.readEntry();
});

for (const noteId in createdNoteIds) { // now the noteIds are unique
noteService.scanForLinks(becca.getNote(noteId));

if (!metaFile) {
// if there's no meta file then the notes are created based on the order in that zip file but that
// is usually quite random so we sort the notes in the way they would appear in the file manager
treeService.sortNotes(noteId, 'title', false, true);
sql.transactional(() => {
for (const task of tasks) {
task();
}

taskContext.increaseProgressCount();
}

// we're saving attributes and links only now so that all relation and link target notes
// are already in the database (we don't want to have "broken" relations, not even transitionally)
for (const attr of attributes) {
if (attr.type !== 'relation' || attr.value in createdNoteIds) {
new Attribute(attr).save();
}
else {
log.info("Relation not imported since target note doesn't exist: " + JSON.stringify(attr));
for (const noteId in createdNoteIds) { // now the noteIds are unique
noteService.scanForLinks(becca.getNote(noteId));

if (!metaFile) {
// if there's no meta file then the notes are created based on the order in that zip file but that
// is usually quite random so we sort the notes in the way they would appear in the file manager
treeService.sortNotes(noteId, 'title', false, true);
}

taskContext.increaseProgressCount();
}

// we're saving attributes and links only now so that all relation and link target notes
// are already in the database (we don't want to have "broken" relations, not even transitionally)
for (const attr of attributes) {
if (attr.type !== 'relation' || attr.value in createdNoteIds) {
new Attribute(attr).save();
}
else {
log.info("Relation not imported since target note doesn't exist: " + JSON.stringify(attr));
}
}
}
});

return firstNote;
}
Expand Down