Merge pull request #458 from TriliumNext/zip-import-image-fix

Resolve MIME type not being used when creating new note correctly, upon zip import
This commit is contained in:
Elian Doran 2024-10-10 23:26:48 +03:00 committed by GitHub
commit 469c1ceb07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

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