From 769ae5b9f19b700867aa6bd13d1aa10e94201a52 Mon Sep 17 00:00:00 2001 From: Bruno Bernardino Date: Tue, 13 Aug 2024 16:46:12 +0100 Subject: [PATCH] Update dependencies, change thumbnail generation method --- .dvmrc | 2 +- Dockerfile | 2 +- deno.json | 15 +++++++-------- routes/photos/thumbnail/[fileName].tsx | 17 ++--------------- 4 files changed, 11 insertions(+), 25 deletions(-) diff --git a/.dvmrc b/.dvmrc index 5399945..c8d55f3 100644 --- a/.dvmrc +++ b/.dvmrc @@ -1 +1 @@ -1.45.3 +1.45.5 diff --git a/Dockerfile b/Dockerfile index b1a5bee..a49eb76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM denoland/deno:ubuntu-1.45.3 +FROM denoland/deno:ubuntu-1.45.5 EXPOSE 8000 diff --git a/deno.json b/deno.json index 0c47216..2d6c25a 100644 --- a/deno.json +++ b/deno.json @@ -25,16 +25,15 @@ "./": "./", "xml": "https://deno.land/x/xml@2.1.3/mod.ts", "mrmime": "https://deno.land/x/mrmime@v2.0.0/mod.ts", - "imagemagick": "https://deno.land/x/imagemagick_deno@0.0.26/mod.ts", "fresh/": "https://deno.land/x/fresh@1.6.8/", "$fresh/": "https://deno.land/x/fresh@1.6.8/", - "preact": "https://esm.sh/preact@10.19.6", - "preact/": "https://esm.sh/preact@10.19.6/", - "@preact/signals": "https://esm.sh/*@preact/signals@1.2.2", - "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.5.1", - "tailwindcss": "npm:tailwindcss@3.4.4", - "tailwindcss/": "npm:/tailwindcss@3.4.4/", - "tailwindcss/plugin": "npm:/tailwindcss@3.4.4/plugin.js", + "preact": "https://esm.sh/preact@10.23.2", + "preact/": "https://esm.sh/preact@10.23.2/", + "@preact/signals": "https://esm.sh/*@preact/signals@1.3.0", + "@preact/signals-core": "https://esm.sh/*@preact/signals-core@1.8.0", + "tailwindcss": "npm:tailwindcss@3.4.9", + "tailwindcss/": "npm:/tailwindcss@3.4.9/", + "tailwindcss/plugin": "npm:/tailwindcss@3.4.9/plugin.js", "std/": "https://deno.land/std@0.224.0/", "$std/": "https://deno.land/std@0.224.0/" } diff --git a/routes/photos/thumbnail/[fileName].tsx b/routes/photos/thumbnail/[fileName].tsx index 2d59399..de0d3fa 100644 --- a/routes/photos/thumbnail/[fileName].tsx +++ b/routes/photos/thumbnail/[fileName].tsx @@ -1,5 +1,5 @@ import { Handlers } from 'fresh/server.ts'; -import { ImageMagick, initialize, MagickGeometry } from 'imagemagick'; +import { resize } from 'https://deno.land/x/deno_image@0.0.4/mod.ts'; import { FreshContextState } from '/lib/types.ts'; import { getFile } from '/lib/data/files.ts'; @@ -53,20 +53,7 @@ export const handler: Handlers = { return new Response('Bad Request', { status: 400 }); } - await initialize(); - - const sizingData = new MagickGeometry( - width, - height, - ); - sizingData.ignoreAspectRatio = false; - - const resizedImageContents = await new Promise((resolve) => { - ImageMagick.read(fileResult.contents!, (image) => { - image.resize(sizingData); - image.write((data) => resolve(data)); - }); - }); + const resizedImageContents = await resize(fileResult.contents!, { width, height, aspectRatio: true }); return new Response(resizedImageContents, { status: 200,