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

Set thumbnail image with original image while OOM

pull/296/head
johnniang 2019-09-10 12:56:03 +08:00
parent 7aaf670276
commit 2297a895f1
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/run/halo/app/handler/file/LocalFileHandler.java
View File

@ -152,15 +152,19 @@ public class LocalFileHandler implements FileHandler {
// Read as image // Read as image
BufferedImage originalImage = ImageIO.read(uploadPath.toFile()); BufferedImage originalImage = ImageIO.read(uploadPath.toFile());
// Generate thumbnail
generateThumbnail(originalImage, thumbnailPath, extension);
// Set width and height // Set width and height
uploadResult.setWidth(originalImage.getWidth()); uploadResult.setWidth(originalImage.getWidth());
uploadResult.setHeight(originalImage.getHeight()); uploadResult.setHeight(originalImage.getHeight());
// Set thumb path
uploadResult.setThumbPath(thumbnailSubFilePath); // Generate thumbnail
boolean result = generateThumbnail(originalImage, thumbnailPath, extension);
if (result) {
// Set thumb path
uploadResult.setThumbPath(thumbnailSubFilePath);
} else {
// If generate error
uploadResult.setThumbPath(subFilePath);
}
} finally { } finally {
lock.unlock(); lock.unlock();
} }
@ -203,7 +207,7 @@ public class LocalFileHandler implements FileHandler {
try { try {
boolean deleteResult = Files.deleteIfExists(thumbnailPath); boolean deleteResult = Files.deleteIfExists(thumbnailPath);
if (!deleteResult) { if (!deleteResult) {
log.warn("Thumbnail: [{}] way not exist", thumbnailPath.toString()); log.warn("Thumbnail: [{}] may not exist", thumbnailPath.toString());
} }
} catch (IOException e) { } catch (IOException e) {
throw new FileOperationException("附件缩略图 " + thumbnailName + " 删除失败", e); throw new FileOperationException("附件缩略图 " + thumbnailName + " 删除失败", e);
@ -215,19 +219,24 @@ public class LocalFileHandler implements FileHandler {
return AttachmentType.LOCAL.equals(type); return AttachmentType.LOCAL.equals(type);
} }
private boolean generateThumbnail(BufferedImage originalImage, Path thumbPath, String extension) {
private void generateThumbnail(BufferedImage originalImage, Path thumbPath, String extension) throws IOException {
Assert.notNull(originalImage, "Image must not be null"); Assert.notNull(originalImage, "Image must not be null");
Assert.notNull(thumbPath, "Thumb path must not be null"); Assert.notNull(thumbPath, "Thumb path must not be null");
boolean result = false;
// Create the thumbnail // Create the thumbnail
Files.createFile(thumbPath); try {
Files.createFile(thumbPath);
// Convert to thumbnail and copy the thumbnail // Convert to thumbnail and copy the thumbnail
log.debug("Trying to generate thumbnail: [{}]", thumbPath.toString()); log.debug("Trying to generate thumbnail: [{}]", thumbPath.toString());
Thumbnails.of(originalImage).size(THUMB_WIDTH, THUMB_HEIGHT).keepAspectRatio(true).toFile(thumbPath.toFile()); Thumbnails.of(originalImage).size(THUMB_WIDTH, THUMB_HEIGHT).keepAspectRatio(true).toFile(thumbPath.toFile());
log.debug("Generated thumbnail image, and wrote the thumbnail to [{}]", thumbPath.toString()); log.debug("Generated thumbnail image, and wrote the thumbnail to [{}]", thumbPath.toString());
result = true;
} catch (Throwable t) {
log.warn("Failed to generate thumbnail: [{}]", thumbPath);
}
return result;
} }
} }