gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

check the attachment after upload

Browse Source
This commit is contained in:
zadam 2023-07-14 21:28:32 +02:00
parent cea54aecad
commit 30bcd1764a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/becca/entities/bnote.js
View File

@ -1496,7 +1496,7 @@ class BNote extends AbstractBeccaEntity {
parentNote.setContent(fixedContent); parentNote.setContent(fixedContent);
const noteService = require("../../services/notes"); const noteService = require("../../services/notes");
noteService.asyncPostProcessContent(parentNote, fixedContent); noteService.asyncPostProcessContent(parentNote, fixedContent); // to mark an unused attachment for deletion
this.deleteNote(); this.deleteNote();

8
src/services/image.js
View File

@ -142,15 +142,21 @@ function saveImageToAttachment(noteId, uploadBuffer, originalName, shrinkImageSw
const fileName = sanitizeFilename(originalName); const fileName = sanitizeFilename(originalName);
const note = becca.getNoteOrThrow(noteId); const note = becca.getNoteOrThrow(noteId);
const attachment = note.saveAttachment({ let attachment = note.saveAttachment({
role: 'image', role: 'image',
mime: 'unknown', mime: 'unknown',
title: fileName title: fileName
}); });
const noteService = require("../services/notes");
noteService.asyncPostProcessContent(note, note.getContent()); // to mark an unused attachment for deletion
// resizing images asynchronously since JIMP does not support sync operation // resizing images asynchronously since JIMP does not support sync operation
processImage(uploadBuffer, originalName, shrinkImageSwitch).then(({buffer, imageFormat}) => { processImage(uploadBuffer, originalName, shrinkImageSwitch).then(({buffer, imageFormat}) => {
sql.transactional(() => { sql.transactional(() => {
// re-read, might be changed in the meantime
attachment = becca.getAttachmentOrThrow(attachment.attachmentId);
attachment.mime = getImageMimeFromExtension(imageFormat.ext); attachment.mime = getImageMimeFromExtension(imageFormat.ext);
if (!originalName.includes(".")) { if (!originalName.includes(".")) {