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

feat(import/zip): support UTF-16 LE with BOM (closes #1241)

Browse Source
This commit is contained in:
Elian Doran
2025-02-22 01:37:02 +02:00
parent c925ae5f15
commit bedc61c3d0
5 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/services/import/single.ts
View File

@@ -3,14 +3,12 @@
import type BNote from "../../becca/entities/bnote.js";
import type TaskContext from "../task_context.js";
import chardet from "chardet";
import stripBom from "strip-bom";
import noteService from "../../services/notes.js";
import imageService from "../../services/image.js";
import protectedSessionService from "../protected_session.js";
import markdownService from "./markdown.js";
import mimeService from "./mime.js";
import { getNoteTitle } from "../../services/utils.js";
import { getNoteTitle, processStringOrBuffer } from "../../services/utils.js";
import importUtils from "./utils.js";
import htmlSanitizer from "../html_sanitizer.js";
import type { File } from "./common.js";
@@ -148,21 +146,6 @@ function importMarkdown(taskContext: TaskContext, file: File, parentNote: BNote)
return note;
}
function processStringOrBuffer(data: string | Buffer) {
if (!Buffer.isBuffer(data)) {
return data;
}
const detectedEncoding = chardet.detect(data);
switch (detectedEncoding) {
case "UTF-16LE":
return stripBom(data.toString("utf-16le"));
case "UTF-8":
default:
return data.toString("utf-8");
}
}
function importHtml(taskContext: TaskContext, file: File, parentNote: BNote) {
let content = processStringOrBuffer(file.buffer);