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

ImportContext generalized to TaskContext

Browse Source
This commit is contained in:
zadam
2019-10-17 21:11:35 +02:00
parent 992d174b23
commit 9689029c4b
11 changed files with 125 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,11 +9,11 @@ const cls = require('../../services/cls');
const path = require('path');
const noteCacheService = require('../../services/note_cache');
const log = require('../../services/log');
const ImportContext = require('../../services/import_context');
const TaskContext = require('../../services/task_context.js');
async function importToBranch(req) {
const {parentNoteId} = req.params;
const {importId, last} = req.body;
const {taskId, last} = req.body;
const options = {
safeImport: req.body.safeImport !== 'false',
@@ -43,22 +43,22 @@ async function importToBranch(req) {
let note; // typically root of the import - client can show it after finishing the import
const importContext = ImportContext.getInstance(importId, options);
const taskContext = TaskContext.getInstance(taskId, options);
try {
if (extension === '.tar' && options.explodeArchives) {
note = await tarImportService.importTar(importContext, file.buffer, parentNote);
note = await tarImportService.importTar(taskContext, file.buffer, parentNote);
} else if (extension === '.opml' && options.explodeArchives) {
note = await opmlImportService.importOpml(importContext, file.buffer, parentNote);
note = await opmlImportService.importOpml(taskContext, file.buffer, parentNote);
} else if (extension === '.enex' && options.explodeArchives) {
note = await enexImportService.importEnex(importContext, file, parentNote);
note = await enexImportService.importEnex(taskContext, file, parentNote);
} else {
note = await singleImportService.importSingleFile(importContext, file, parentNote);
note = await singleImportService.importSingleFile(taskContext, file, parentNote);
}
}
catch (e) {
const message = "Import failed with following error: '" + e.message + "'. More details might be in the logs.";
importContext.reportError(message);
taskContext.reportError(message);
log.error(message + e.stack);
@@ -67,7 +67,7 @@ async function importToBranch(req) {
if (last === "true") {
// small timeout to avoid race condition (message is received before the transaction is committed)
setTimeout(() => importContext.importSucceeded(parentNoteId, note.noteId), 1000);
setTimeout(() => taskContext.taskSucceeded(parentNoteId, note.noteId), 1000);
}
// import has deactivated note events so note cache is not updated