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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	src/services/import/zip.js
This commit is contained in:
zadam
2022-12-29 10:27:23 +01:00
parent e76290e598 dd82b0f958
commit b9b8b35342
4 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/import/enex.js
View File

@@ -115,7 +115,7 @@ function importEnex(taskContext, file, parentNote) {
let labelName = currentTag;
if (labelName === 'source-url') {
labelName = 'sourceUrl';
labelName = 'pageUrl';
}
labelName = sanitizeAttributeName(labelName);
@@ -139,7 +139,7 @@ function importEnex(taskContext, file, parentNote) {
else if (currentTag === 'source-url') {
resource.attributes.push({
type: 'label',
name: 'sourceUrl',
name: 'pageUrl',
value: text
});
}

15
src/services/import/zip.js
View File

@@ -230,6 +230,13 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
absUrl += `${absUrl.length > 0 ? '/' : ''}${url}`;
const {noteMeta} = getMeta(absUrl);
if (!noteMeta) {
log.info(`Could not find note meta for URL '${absUrl}'.`);
return null;
}
const targetNoteId = getNoteId(noteMeta, absUrl);
return targetNoteId;
}
@@ -266,6 +273,10 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
const targetNoteId = getNoteIdFromRelativeUrl(url, filePath);
if (!targetNoteId) {
return match;
}
return `src="api/images/${targetNoteId}/${path.basename(url)}"`;
});
@@ -284,6 +295,10 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
const targetNoteId = getNoteIdFromRelativeUrl(url, filePath);
if (!targetNoteId) {
return match;
}
return `href="#root/${targetNoteId}"`;
});