mirror of
https://github.com/zadam/trilium.git
synced 2025-01-16 03:58:53 +08:00
zip import - remove html tags added by Trilium
This commit is contained in:
parent
bb8fd2b054
commit
386e8dd32e
2 changed files with 16 additions and 2 deletions
|
@ -257,11 +257,11 @@ async function exportToZip(taskContext, branch, format, res, setHeaders = true)
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<link rel="stylesheet" href="${cssUrl}">
|
<link rel="stylesheet" href="${cssUrl}">
|
||||||
<base target="_parent">
|
<base target="_parent">
|
||||||
<title>${htmlTitle}</title>
|
<title data-trilium-title>${htmlTitle}</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<h1>${htmlTitle}</h1>
|
<h1 data-trilium-h1>${htmlTitle}</h1>
|
||||||
|
|
||||||
<div class="ck-content">${content}</div>
|
<div class="ck-content">${content}</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -240,6 +240,8 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
|
||||||
return /^(?:[a-z]+:)?\/\//i.test(url);
|
return /^(?:[a-z]+:)?\/\//i.test(url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
content = removeTrilumTags(content);
|
||||||
|
|
||||||
content = content.replace(/<h1>([^<]*)<\/h1>/gi, (match, text) => {
|
content = content.replace(/<h1>([^<]*)<\/h1>/gi, (match, text) => {
|
||||||
if (noteTitle.trim() === text.trim()) {
|
if (noteTitle.trim() === text.trim()) {
|
||||||
return ""; // remove whole H1 tag
|
return ""; // remove whole H1 tag
|
||||||
|
@ -325,6 +327,18 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function removeTrilumTags(content) {
|
||||||
|
const tagsToRemove = [
|
||||||
|
'<h1 data-trilium-h1>([^<]*)<\/h1>',
|
||||||
|
'<title data-trilium-title>([^<]*)<\/title>'
|
||||||
|
]
|
||||||
|
for (const tag of tagsToRemove) {
|
||||||
|
let re = new RegExp(tag, "gi");
|
||||||
|
content = content.replace(re, '');
|
||||||
|
}
|
||||||
|
return content;
|
||||||
|
}
|
||||||
|
|
||||||
function processNoteContent(noteMeta, type, mime, content, noteTitle, filePath) {
|
function processNoteContent(noteMeta, type, mime, content, noteTitle, filePath) {
|
||||||
if (noteMeta?.format === 'markdown'
|
if (noteMeta?.format === 'markdown'
|
||||||
|| (!noteMeta && taskContext.data.textImportedAsText && ['text/markdown', 'text/x-markdown'].includes(mime))) {
|
|| (!noteMeta && taskContext.data.textImportedAsText && ['text/markdown', 'text/x-markdown'].includes(mime))) {
|
||||||
|
|
Loading…
Reference in a new issue