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

WIP

Browse Source
This commit is contained in:
zadam
2022-12-07 23:37:40 +01:00
parent 2a68bdb690
commit 653f80f7d8
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/services/import/zip.js
View File

@@ -187,7 +187,7 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
title: noteTitle,
content: '',
noteId: noteId,
type: noteMeta ? noteMeta.type : 'text',
type: resolveNoteType(noteMeta.type),
mime: noteMeta ? noteMeta.mime : 'text/html',
prefix: noteMeta ? noteMeta.prefix : '',
isExpanded: noteMeta ? noteMeta.isExpanded : false,
@@ -258,12 +258,14 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
return;
}
const {type, mime} = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
let {type, mime} = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
if (type !== 'file' && type !== 'image') {
content = content.toString("UTF-8");
}
type = resolveNoteType(type);
if ((noteMeta && noteMeta.format === 'markdown')
|| (!noteMeta && taskContext.data.textImportedAsText && ['text/markdown', 'text/x-markdown'].includes(mime))) {
const parsed = mdReader.parse(content);
@@ -531,6 +533,22 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
return firstNote;
}
function resolveNoteType(type) {
type = type || 'text';
// BC for ZIPs created in Triliun 0.57 and older
if (type === 'relation-map') {
type = 'relationMap';
} else if (type === 'note-map') {
type = 'noteMap';
} else if (type === 'web-view') {
type = 'webView';
}
return type;
}
module.exports = {
importZip
};