From 3c5ec95b59dac6820751a9e3d498cf7bf3538724 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 20 Mar 2017 10:32:04 +0300
Subject: Thumbnailator -> imgscalr

---
 .../com/juick/www/controllers/PostController.java  | 37 ++++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

(limited to 'juick-spring-www/src/main/java/com/juick/www/controllers/PostController.java')

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/PostController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/PostController.java
index 95404732..8ad06402 100644
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/PostController.java
+++ b/juick-spring-www/src/main/java/com/juick/www/controllers/PostController.java
@@ -12,9 +12,10 @@ import com.juick.service.TagService;
 import com.juick.service.UserService;
 import com.juick.util.UserUtils;
 import com.juick.www.WebApp;
-import net.coobird.thumbnailator.Thumbnails;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
+import org.imgscalr.Scalr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.env.Environment;
@@ -29,7 +30,9 @@ import rocks.xmpp.core.stanza.model.Message;
 import rocks.xmpp.extensions.nick.model.Nickname;
 import rocks.xmpp.extensions.oob.model.x.OobX;
 
+import javax.imageio.ImageIO;
 import javax.inject.Inject;
+import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -106,12 +109,16 @@ public class PostController {
 
             Path origName = Paths.get(webApp.imgDir, "p", fname);
             Files.move(Paths.get(webApp.tmpDir, attachmentFName), origName);
-            Thumbnails.of(origName.toFile()).size(1024, 1024).outputQuality(0.9)
-                    .toFile(Paths.get(webApp.imgDir, "photos-1024", fname).toFile());
-            Thumbnails.of(origName.toFile()).size(512, 512).outputQuality(0.9)
-                    .toFile(Paths.get(webApp.imgDir, "photos-512", fname).toFile());
-            Thumbnails.of(origName.toFile()).size(160, 120).outputQuality(0.9)
-                    .toFile(Paths.get(webApp.imgDir, "ps", fname).toFile());
+            BufferedImage originalImage = ImageIO.read(origName.toFile());
+            ImageIO.write(Scalr.resize(originalImage, 1024),
+                    FilenameUtils.getExtension(origName.toString()),
+                    Paths.get(webApp.imgDir, "photos-1024", fname).toFile());
+            ImageIO.write(Scalr.resize(originalImage, 512),
+                    FilenameUtils.getExtension(origName.toString()),
+                    Paths.get(webApp.imgDir, "photos-512", fname).toFile());
+            ImageIO.write(Scalr.resize(originalImage, 160),
+                    FilenameUtils.getExtension(origName.toString()),
+                    Paths.get(webApp.imgDir, "ps", fname).toFile());
 
             body = attachmentURL + "\n" + body;
             try {
@@ -238,12 +245,16 @@ public class PostController {
 
             Path origName = Paths.get(webApp.imgDir, "p", fname);
             Files.move(Paths.get(webApp.tmpDir, attachmentFName), origName);
-            Thumbnails.of(origName.toFile()).size(1024, 1024).outputQuality(0.9)
-                    .toFile(Paths.get(webApp.imgDir, "photos-1024", fname).toFile());
-            Thumbnails.of(origName.toFile()).size(512, 512).outputQuality(0.9)
-                    .toFile(Paths.get(webApp.imgDir, "photos-512", fname).toFile());
-            Thumbnails.of(origName.toFile()).size(160, 120).outputQuality(0.9)
-                    .toFile(Paths.get(webApp.imgDir, "ps", fname).toFile());
+            BufferedImage originalImage = ImageIO.read(origName.toFile());
+            ImageIO.write(Scalr.resize(originalImage, 1024),
+                    FilenameUtils.getExtension(origName.toString()),
+                    Paths.get(webApp.imgDir, "photos-1024", fname).toFile());
+            ImageIO.write(Scalr.resize(originalImage, 512),
+                    FilenameUtils.getExtension(origName.toString()),
+                    Paths.get(webApp.imgDir, "photos-512", fname).toFile());
+            ImageIO.write(Scalr.resize(originalImage, 160),
+                    FilenameUtils.getExtension(origName.toString()),
+                    Paths.get(webApp.imgDir, "ps", fname).toFile());
 
             body = attachmentURL + "\n" + body;
             try {
-- 
cgit v1.2.3