github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: preserve original image if smaller than requested thumbnail size (#6582) 

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.20.x

#### What this PR does / why we need it:
当生成缩略图时如果原图尺寸小于请求尺寸则返回原图以保持其质量

#### Which issue(s) this PR fixes:
Fixes #6579

#### Does this PR introduce a user-facing change?
```release-note
当生成缩略图时如果原图尺寸小于请求尺寸则返回原图以保持其质量
```
pull/6587/head
guqing 2024-09-04 14:07:43 +08:00 committed by GitHub
parent 19de4db273
commit 7991ef8cf1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/src/main/java/run/halo/app/core/attachment/ThumbnailGenerator.java
View File

@ -1,5 +1,7 @@
package run.halo.app.core.attachment; package run.halo.app.core.attachment;
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
@ -74,10 +76,14 @@ public class ThumbnailGenerator {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Unsupported image format for: " + formatNameOpt.orElse("unknown")); "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 formatName = formatNameOpt.orElse("jpg");
var thumbnailFile = getThumbnailFile(formatName); 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); ImageIO.write(thumbnail, formatName, thumbnailFile);
} }