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

added "explodeArchives" option to the import dialog

Browse Source
This commit is contained in:
zadam
2019-02-25 22:38:48 +01:00
parent 7e2a2baa5d
commit 8b3e721028
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,8 @@ async function importToBranch(req) {
safeImport: req.body.safeImport !== 'false',
shrinkImages: req.body.shrinkImages !== 'false',
textImportedAsText: req.body.textImportedAsText !== 'false',
codeImportedAsCode: req.body.codeImportedAsCode !== 'false'
codeImportedAsCode: req.body.codeImportedAsCode !== 'false',
explodeArchives: req.body.explodeArchives !== 'false'
};
const file = req.file;
@@ -45,11 +46,11 @@ async function importToBranch(req) {
const importContext = ImportContext.getInstance(importId, options);
try {
if (extension === '.tar') {
if (extension === '.tar' && options.explodeArchives) {
note = await tarImportService.importTar(importContext, file.buffer, parentNote);
} else if (extension === '.opml') {
} else if (extension === '.opml' && options.explodeArchives) {
note = await opmlImportService.importOpml(importContext, file.buffer, parentNote);
} else if (extension === '.enex') {
} else if (extension === '.enex' && options.explodeArchives) {
note = await enexImportService.importEnex(importContext, file, parentNote);
} else {
note = await singleImportService.importSingleFile(importContext, file, parentNote);