gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #3142 from spasche/zip-import-skip-bad-url

Browse Source 
let import continue when malformed URLs are encountered
This commit is contained in:
zadam 2022-09-19 22:42:31 +02:00 committed by GitHub
commit fb6a0bc2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,7 +292,12 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
content = content.replace(/<\/body>.*<\/html>/gis, ""); content = content.replace(/<\/body>.*<\/html>/gis, "");
content = content.replace(/src="([^"]*)"/g, (match, url) => { content = content.replace(/src="([^"]*)"/g, (match, url) => {
url = decodeURIComponent(url); try {
url = decodeURIComponent(url);
} catch (e) {
log.error(`Cannot parse image URL '${url}', keeping original (${e}).`);
return `src="${url}"`;
}
if (isUrlAbsolute(url) || url.startsWith("/")) { if (isUrlAbsolute(url) || url.startsWith("/")) {
return match; return match;
@ -304,7 +309,12 @@ async function importZip(taskContext, fileBuffer, importRootNote) {
}); });
content = content.replace(/href="([^"]*)"/g, (match, url) => { content = content.replace(/href="([^"]*)"/g, (match, url) => {
url = decodeURIComponent(url); try {
url = decodeURIComponent(url);
} catch (e) {
log.error(`Cannot parse link URL '${url}', keeping original (${e}).`);
return `href="${url}"`;
}
if (isUrlAbsolute(url)) { if (isUrlAbsolute(url)) {
return match; return match;