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

local image storage fixes

Browse Source
This commit is contained in:
zadam
2020-03-25 18:21:55 +01:00
parent 8a92786012
commit ef61e22f1f
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/notes.js
View File

@@ -280,11 +280,13 @@ async function downloadImage(noteId, imageUrl) {
const downloadImagePromises = {};
function replaceUrl(content, url, imageNote) {
return content.replace(new RegExp(url, "g"), `api/images/${imageNote.noteId}/${imageNote.title}`);
const quoted = url.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
return content.replace(new RegExp(quoted, "g"), `api/images/${imageNote.noteId}/${imageNote.title}`);
}
async function downloadImages(noteId, content) {
const re = /<img\s.*?src=['"]([^'">]+)['"]/ig;
const re = /<img.*?\ssrc=['"]([^'">]+)['"]/ig;
let match;
while (match = re.exec(content)) {
@@ -323,7 +325,7 @@ async function downloadImages(noteId, content) {
}
}
await Promise.all(Object.values(downloadImagePromises)).then(() => {
Promise.all(Object.values(downloadImagePromises)).then(() => {
setTimeout(async () => {
const imageNotes = await repository.getNotes(Object.values(imageUrlToNoteIdMapping));
@@ -344,6 +346,8 @@ async function downloadImages(noteId, content) {
}
}, 5000);
});
return content;
}
async function saveLinks(note, content) {
@@ -363,7 +367,7 @@ async function saveLinks(note, content) {
content = findExternalLinks(content, foundLinks);
content = findIncludeNoteLinks(content, foundLinks);
downloadImages(note.noteId, content);
content = await downloadImages(note.noteId, content);
}
else if (note.type === 'relation-map') {
findRelationMapLinks(content, foundLinks);