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

chore(deps): migrate to image-type 5.2.0

Browse Source
This commit is contained in:
Elian Doran
2024-12-10 23:21:32 +02:00
parent d6b2fc8828
commit e0e98e229e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/image.ts
View File

@@ -15,7 +15,7 @@ import htmlSanitizer from "./html_sanitizer.js";
async function processImage(uploadBuffer: Buffer, originalName: string, shrinkImageSwitch: boolean) { async function processImage(uploadBuffer: Buffer, originalName: string, shrinkImageSwitch: boolean) {
const compressImages = optionService.getOptionBool("compressImages"); const compressImages = optionService.getOptionBool("compressImages");
const origImageFormat = getImageType(uploadBuffer); const origImageFormat = await getImageType(uploadBuffer);
if (!origImageFormat || !["jpg", "png"].includes(origImageFormat.ext)) { if (!origImageFormat || !["jpg", "png"].includes(origImageFormat.ext)) {
shrinkImageSwitch = false; shrinkImageSwitch = false;
@@ -30,7 +30,7 @@ async function processImage(uploadBuffer: Buffer, originalName: string, shrinkIm
if (compressImages && shrinkImageSwitch) { if (compressImages && shrinkImageSwitch) {
finalImageBuffer = await shrinkImage(uploadBuffer, originalName); finalImageBuffer = await shrinkImage(uploadBuffer, originalName);
imageFormat = getImageType(finalImageBuffer); imageFormat = await getImageType(finalImageBuffer);
} else { } else {
finalImageBuffer = uploadBuffer; finalImageBuffer = uploadBuffer;
imageFormat = origImageFormat || { imageFormat = origImageFormat || {
@@ -44,12 +44,12 @@ async function processImage(uploadBuffer: Buffer, originalName: string, shrinkIm
}; };
} }
function getImageType(buffer: Buffer) { async function getImageType(buffer: Buffer) {
if (isSvg(buffer.toString())) { if (isSvg(buffer.toString())) {
return { ext: 'svg' } return { ext: 'svg' }
} }
else { else {
return imageType(buffer) || { ext: "jpg" }; // optimistic JPG default return await imageType(buffer) || { ext: "jpg" }; // optimistic JPG default
} }
} }