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

fix noproxy handling for image downloading

Browse Source
This commit is contained in:
zadam
2020-08-03 23:33:44 +02:00
parent 4fc8bace94
commit 782127dd91
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/services/notes.js
View File

@@ -279,18 +279,15 @@ const downloadImagePromises = {};
function replaceUrl(content, url, imageNote) { function replaceUrl(content, url, imageNote) {
const quotedUrl = utils.quoteRegex(url); const quotedUrl = utils.quoteRegex(url);
return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "g"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`); return content.replace(new RegExp(`\\s+src=[\"']${quotedUrl}[\"']`, "ig"), ` src="api/images/${imageNote.noteId}/${imageNote.title}"`);
} }
async function downloadImages(noteId, content) { async function downloadImages(noteId, content) {
const re = /<img[^>]*?\ssrc=['"]([^'">]+)['"]/ig; const imageRe = /<img[^>]*?\ssrc=['"]([^'">]+)['"]/ig;
let match; let imageMatch;
const origContent = content;
while (match = re.exec(origContent)) {
const url = match[1];
while (imageMatch = imageRe.exec(content)) {
const url = imageMatch[1];
const inlineImageMatch = /^data:image\/[a-z]+;base64,/.exec(url); const inlineImageMatch = /^data:image\/[a-z]+;base64,/.exec(url);
if (inlineImageMatch) { if (inlineImageMatch) {
@@ -300,9 +297,9 @@ async function downloadImages(noteId, content) {
const imageService = require('../services/image'); const imageService = require('../services/image');
const {note} = await imageService.saveImage(noteId, imageBuffer, "inline image", true); const {note} = await imageService.saveImage(noteId, imageBuffer, "inline image", true);
content = content.substr(0, match.index) content = content.substr(0, imageMatch.index)
+ `<img src="api/images/${note.noteId}/${note.title}"` + `<img src="api/images/${note.noteId}/${note.title}"`
+ content.substr(match.index + match[0].length); + content.substr(imageMatch.index + imageMatch[0].length);
} }
else if (!url.includes('api/images/') else if (!url.includes('api/images/')
// this is an exception for the web clipper's "imageId" // this is an exception for the web clipper's "imageId"
@@ -316,7 +313,6 @@ async function downloadImages(noteId, content) {
} }
else { else {
content = replaceUrl(content, url, imageNote); content = replaceUrl(content, url, imageNote);
continue; continue;
} }
} }
@@ -328,7 +324,6 @@ async function downloadImages(noteId, content) {
imageUrlToNoteIdMapping[url] = existingImage.noteId; imageUrlToNoteIdMapping[url] = existingImage.noteId;
content = replaceUrl(content, url, existingImage); content = replaceUrl(content, url, existingImage);
continue; continue;
} }

3
src/services/request.js
View File

@@ -84,10 +84,11 @@ function exec(opts) {
} }
async function getImage(imageUrl) { async function getImage(imageUrl) {
const proxyConf = await syncOptions.getSyncProxy();
const opts = { const opts = {
method: 'GET', method: 'GET',
url: imageUrl, url: imageUrl,
proxy: await syncOptions.getSyncProxy() proxy: proxyConf !== "noproxy" ? proxyConf : null
}; };
const client = getClient(opts); const client = getClient(opts);