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

safe import implementation

Browse Source
This commit is contained in:
zadam
2019-02-11 23:45:58 +01:00
parent caa7dd9619
commit 14f7a8b7b9
5 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,10 +12,13 @@ const noteCacheService = require('../../services/note_cache');
const log = require('../../services/log');
class ImportContext {
constructor(importId) {
constructor(importId, safeImport) {
// importId is to distinguish between different import events - it is possible (though not recommended)
// to have multiple imports going at the same time
this.importId = importId;
this.safeImport = safeImport;
// // count is mean to represent count of exported notes where practical, otherwise it's just some measure of progress
this.progressCount = 0;
this.lastSentCountTs = Date.now();
@@ -53,7 +56,10 @@ class ImportContext {
}
async function importToBranch(req) {
const {parentNoteId, importId} = req.params;
let {parentNoteId, importId, safeImport} = req.params;
safeImport = safeImport !== '0';
const file = req.file;
if (!file) {
@@ -74,7 +80,7 @@ async function importToBranch(req) {
let note; // typically root of the import - client can show it after finishing the import
const importContext = new ImportContext(importId);
const importContext = new ImportContext(importId, safeImport);
try {
if (extension === '.tar') {