allow import of multiple files at the same time

This commit is contained in:
zadam
2019-02-24 09:34:50 +01:00
parent 936f85c09e
commit 886ea6c68c
8 changed files with 46 additions and 48 deletions

View File

@@ -298,12 +298,7 @@ async function importEnex(importContext, file, parentNote) {
return new Promise((resolve, reject) =>
{
// resolve only when we parse the whole document AND saving of all notes have been finished
saxStream.on("end", () => { Promise.all(saveNotePromises).then(() => {
importContext.importFinished(rootNote.noteId);
resolve(rootNote);
});
});
saxStream.on("end", () => { Promise.all(saveNotePromises).then(() => resolve(rootNote)) });
const bufferStream = new stream.PassThrough();
bufferStream.end(file.buffer);

View File

@@ -64,8 +64,6 @@ async function importOpml(importContext, fileBuffer, parentNote) {
returnNote = returnNote || note;
}
importContext.importFinished(returnNote.noteId);
return returnNote;
}

View File

@@ -21,7 +21,6 @@ async function importMarkdown(importContext, file, parentNote) {
});
importContext.increaseProgressCount();
importContext.importFinished(note.noteId);
return note;
}
@@ -36,7 +35,6 @@ async function importHtml(importContext, file, parentNote) {
});
importContext.increaseProgressCount();
importContext.importFinished(note.noteId);
return note;
}

View File

@@ -386,8 +386,6 @@ async function importTar(importContext, fileBuffer, importRootNote) {
}
}
importContext.importFinished();
resolve(firstNote);
});