From 4d4372084770fda7624470dd2fff61d3eb898389 Mon Sep 17 00:00:00 2001 From: guqing Date: Wed, 4 Sep 2024 11:45:06 +0800 Subject: [PATCH] refactor: preserve original image if smaller than requested thumbnail size --- .../halo/app/core/attachment/ThumbnailGenerator.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/run/halo/app/core/attachment/ThumbnailGenerator.java b/application/src/main/java/run/halo/app/core/attachment/ThumbnailGenerator.java index 0a6af446f1..1bf189d903 100644 --- a/application/src/main/java/run/halo/app/core/attachment/ThumbnailGenerator.java +++ b/application/src/main/java/run/halo/app/core/attachment/ThumbnailGenerator.java @@ -1,5 +1,7 @@ package run.halo.app.core.attachment; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -74,10 +76,14 @@ private void generateThumbnail(Path tempImagePath) throws IOException { throw new UnsupportedOperationException( "Unsupported image format for: " + formatNameOpt.orElse("unknown")); } - var thumbnail = Scalr.resize(img, Scalr.Method.AUTOMATIC, Scalr.Mode.FIT_TO_WIDTH, - size.getWidth()); var formatName = formatNameOpt.orElse("jpg"); var thumbnailFile = getThumbnailFile(formatName); + if (img.getWidth() <= size.getWidth()) { + Files.copy(tempImagePath, thumbnailFile.toPath(), REPLACE_EXISTING); + return; + } + var thumbnail = Scalr.resize(img, Scalr.Method.AUTOMATIC, Scalr.Mode.FIT_TO_WIDTH, + size.getWidth()); ImageIO.write(thumbnail, formatName, thumbnailFile); }