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

wip

Browse Source
This commit is contained in:
zadam
2020-06-27 00:40:35 +02:00
parent dd62b306fd
commit c778e87683
8 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/routes/api/import.js
View File

@@ -12,7 +12,7 @@ const noteCacheService = require('../../services/note_cache/note_cache.js');
const log = require('../../services/log');
const TaskContext = require('../../services/task_context.js');
function importToBranch(req) {
async function importToBranch(req) {
const {parentNoteId} = req.params;
const {taskId, last} = req.body;
@@ -49,19 +49,15 @@ function importToBranch(req) {
try {
if (extension === '.tar' && options.explodeArchives) {
note = tarImportService.importTar(taskContext, file.buffer, parentNote);
note = await tarImportService.importTar(taskContext, file.buffer, parentNote);
} else if (extension === '.zip' && options.explodeArchives) {
const start = Date.now();
note = zipImportService.importZip(taskContext, file.buffer, parentNote);
console.log("Import took", Date.now() - start, "ms");
note = await zipImportService.importZip(taskContext, file.buffer, parentNote);
} else if (extension === '.opml' && options.explodeArchives) {
note = opmlImportService.importOpml(taskContext, file.buffer, parentNote);
note = await opmlImportService.importOpml(taskContext, file.buffer, parentNote);
} else if (extension === '.enex' && options.explodeArchives) {
note = enexImportService.importEnex(taskContext, file, parentNote);
note = await enexImportService.importEnex(taskContext, file, parentNote);
} else {
note = singleImportService.importSingleFile(taskContext, file, parentNote);
note = await singleImportService.importSingleFile(taskContext, file, parentNote);
}
}
catch (e) {
@@ -83,8 +79,8 @@ function importToBranch(req) {
// import has deactivated note events so note cache is not updated
// instead we force it to reload (can be async)
// FIXME
//noteCacheService.load();
noteCacheService.load();
return note;
}