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

fix(import/zip): regression in normal import

Browse Source
This commit is contained in:
Elian Doran
2025-06-20 22:13:36 +03:00
parent 02a0624e8f
commit 24c82fa7b6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,13 +262,13 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
} }
function getEntityIdFromRelativeUrl(url: string, filePath: string) { function getEntityIdFromRelativeUrl(url: string, filePath: string) {
let absUrl; let absUrl: string;
if (!url.startsWith("/")) { if (!url.startsWith("/")) {
while (url.startsWith("./")) { while (url.startsWith("./")) {
url = url.substr(2); url = url.substr(2);
} }
let absUrl = path.dirname(filePath); absUrl = path.dirname(filePath);
while (url.startsWith("../")) { while (url.startsWith("../")) {
absUrl = path.dirname(absUrl); absUrl = path.dirname(absUrl);
@@ -285,6 +285,8 @@ async function importZip(taskContext: TaskContext, fileBuffer: Buffer, importRoo
absUrl = topLevelPath + url; absUrl = topLevelPath + url;
} }
console.log(url, "-->", absUrl);
const { noteMeta, attachmentMeta } = getMeta(absUrl); const { noteMeta, attachmentMeta } = getMeta(absUrl);
if (attachmentMeta && attachmentMeta.attachmentId && noteMeta.noteId) { if (attachmentMeta && attachmentMeta.attachmentId && noteMeta.noteId) {