sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

server: Refactor variable usage

pull/458/head
Elian Doran 2024-10-10 20:19:59 +07:00
parent c37a51c6d0
commit 5e80f120c9
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/import/zip.ts
Unescape Escape View File

@ -456,8 +456,8 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
return;
}
let { mime, type } = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
type = resolveNoteType(type);
let { mime, type: detectedType } = noteMeta ? noteMeta : detectFileTypeAndMime(taskContext, filePath);
const type = resolveNoteType(detectedType);
if (mime == null) {
throw new Error("Unable to resolve mime type.");
}
@ -478,7 +478,7 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
// only skeleton was created because of altered order of cloned notes in ZIP, we need to update
// https://github.com/zadam/trilium/issues/2440
if (note.type === undefined) {
note.type = type as NoteType;
note.type = type;
note.mime = mime;
note.title = noteTitle || "";
note.isProtected = isProtected;
@ -503,7 +503,7 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
title: noteTitle || "",
content: content,
noteId,
type: type as NoteType,
type,
mime,
prefix: noteMeta?.prefix || '',
isExpanded: !!noteMeta?.isExpanded,