Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 05:47:26 +02:00
Code Issues Packages Projects Releases Activity

fix(import/zip): ZIPs without language encoding flag importing garbage (closes #3013)

Browse Source
This commit is contained in:
Elian Doran
2026-04-07 17:01:34 +03:00
parent 28b2547229
commit d21557069c
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/server/src/services/import/samples/utf8-filename.zip Normal file
View File

Binary file not shown.

5
apps/server/src/services/import/zip.spec.ts
View File

@@ -71,6 +71,11 @@ describe("processNoteContent", () => {
expect(content).toContain(`<img src="api/images/${bananaNote!.noteId}/banana.jpeg`);
});
it("can import ZIP with UTF-8 filenames without language encoding flag", async () => {
const { importedNote } = await testImport("utf8-filename.zip");
expect(importedNote.title).toBe("测试");
});
it("can import old geomap notes", async () => {
const { importedNote } = await testImport("geomap.zip");
expect(importedNote.type).toBe("book");

9
apps/server/src/services/import/zip.ts
View File

@@ -659,13 +659,20 @@ export function readContent(zipfile: yauzl.ZipFile, entry: yauzl.Entry): Promise
export function readZipFile(buffer: Buffer, processEntryCallback: (zipfile: yauzl.ZipFile, entry: yauzl.Entry) => Promise<void>) {
return new Promise<void>((res, rej) => {
yauzl.fromBuffer(buffer, { lazyEntries: true, validateEntrySizes: false }, (err, zipfile) => {
yauzl.fromBuffer(buffer, { lazyEntries: true, validateEntrySizes: false, decodeStrings: false }, (err, zipfile) => {
if (err) rej(err);
if (!zipfile) throw new Error("Unable to read zip file.");
zipfile.readEntry();
zipfile.on("entry", async (entry) => {
try {
// yauzl with decodeStrings: false returns fileName as a Buffer.
// We decode as UTF-8 to handle ZIP files that use UTF-8 filenames
// without setting the general purpose bit flag 11 (language encoding flag).
if (Buffer.isBuffer(entry.fileName)) {
entry.fileName = (entry.fileName as Buffer).toString("utf-8");
}
await processEntryCallback(zipfile, entry);
} catch (e) {
rej(e);