Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

fixes for web clipper

Browse Source
This commit is contained in:
zadam
2020-04-02 22:55:11 +02:00
parent bab657e43d
commit 3bbb213f82
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/services/notes.js
View File

@@ -282,7 +282,7 @@ async function downloadImage(noteId, imageUrl) {
log.info(`Download of ${imageUrl} succeeded and was saved as image note ${note.noteId}`);
}
catch (e) {
log.error(`Downoad of ${imageUrl} for note ${noteId} failed with error: ${e.message} ${e.stack}`);
log.error(`Download of ${imageUrl} for note ${noteId} failed with error: ${e.message} ${e.stack}`);
}
}
@@ -296,13 +296,17 @@ function replaceUrl(content, url, imageNote) {
}
async function downloadImages(noteId, content) {
const re = /<img.*?\ssrc=['"]([^'">]+)['"]/ig;
const re = /<img[^>]*?\ssrc=['"]([^'">]+)['"]/ig;
let match;
while (match = re.exec(content)) {
const url = match[1];
const origContent = content;
if (!url.startsWith('api/images/')) {
while (match = re.exec(origContent)) {
const url = match[1].toLowerCase();
if (!url.startsWith('api/images/')
// this is and exception for the web clipper's "imageId"
&& (url.length !== 20 || url.startsWith('http'))) {
if (url in downloadImagePromises) {
// download is already in progress
continue;
@@ -386,12 +390,19 @@ async function saveLinks(note, content) {
const foundLinks = [];
if (note.type === 'text') {
console.time("LINKS");
content = findImageLinks(content, foundLinks);
content = findInternalLinks(content, foundLinks);
content = findExternalLinks(content, foundLinks);
content = findIncludeNoteLinks(content, foundLinks);
console.timeEnd("LINKS");
console.time("IMAGES");
content = await downloadImages(note.noteId, content);
console.timeEnd("IMAGES");
}
else if (note.type === 'relation-map') {
findRelationMapLinks(content, foundLinks);