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

Merge branch 'master' into next60

Browse Source
This commit is contained in:
zadam
2023-04-17 22:27:21 +02:00
parent f01657e1dd 8725f7cfb2
commit b84670d503
46 changed files with 629 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/notes.js
View File

@@ -20,6 +20,7 @@ const dayjs = require("dayjs");
const htmlSanitizer = require("./html_sanitizer");
const ValidationError = require("../errors/validation_error");
const noteTypesService = require("./note_types");
const fs = require("fs");
/** @param {BNote} parentNote */
function getNewNotePosition(parentNote) {
@@ -395,7 +396,24 @@ const imageUrlToAttachmentIdMapping = {};
async function downloadImage(noteId, imageUrl) {
try {
const imageBuffer = await request.getImage(imageUrl);
let imageBuffer;
if (imageUrl.toLowerCase().startsWith("file://")) {
imageBuffer = await new Promise((res, rej) => {
const localFilePath = imageUrl.substr("file://".length);
return fs.readFile(localFilePath, (err, data) => {
if (err) {
rej(err);
} else {
res(data);
}
});
});
} else {
imageBuffer = await request.getImage(imageUrl);
}
const parsedUrl = url.parse(imageUrl);
const title = path.basename(parsedUrl.pathname);