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

detectFileTypeAndMime also returns the type, fixes #456

Browse Source
This commit is contained in:
perf3ct
2024-10-03 22:23:51 -07:00
parent d4fa7e3fd2
commit 91095e8d4e
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/services/import/zip.ts
View File

@@ -456,13 +456,12 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
return; return;
} }
let { mime } = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath); let { mime, type } = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
type = resolveNoteType(type);
if (mime == null) { if (mime == null) {
throw new Error("Unable to resolve mime type."); throw new Error("Unable to resolve mime type.");
} }
let type = resolveNoteType(noteMeta?.type);
if (type !== 'file' && type !== 'image') { if (type !== 'file' && type !== 'image') {
content = content.toString("utf-8"); content = content.toString("utf-8");
} }