X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=5dd4cbb2e6a74f2dae3f0c5d03823e54894600c7;hb=37d40a97c65c078a03b71b98177be6551b3ea28a;hp=8d40416f957df3e5f1f5e00b1d6115bbf777c93a;hpb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index 8d40416..5dd4cbb 100644
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -17,12 +17,16 @@
 
 package net.pterodactylus.sone.web;
 
+import java.awt.Dimension;
 import java.awt.Image;
+import java.awt.image.ImageObserver;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Iterator;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -36,11 +40,13 @@ import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.io.Closer;
-import net.pterodactylus.util.io.StreamCopier;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
+
+import com.google.common.io.ByteStreams;
+
 import freenet.support.api.Bucket;
 import freenet.support.api.HTTPUploadedFile;
 
@@ -99,7 +105,7 @@ public class UploadImagePage extends SoneTemplatePage {
 				imageInputStream = fileBucket.getInputStream();
 				/* TODO - check length */
 				imageDataOutputStream = new ByteArrayOutputStream((int) fileBucket.size());
-				StreamCopier.copy(imageInputStream, imageDataOutputStream);
+				ByteStreams.copy(imageInputStream, imageDataOutputStream);
 			} catch (IOException ioe1) {
 				logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
 				return;
@@ -119,9 +125,10 @@ public class UploadImagePage extends SoneTemplatePage {
 					return;
 				}
 				String mimeType = getMimeType(imageData);
-				TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData);
+				Dimension imageSize = getImageDimensions(uploadedImage);
+				TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData, imageSize.width, imageSize.height);
 				image = webInterface.getCore().createImage(currentSone, parent, temporaryImage);
-				image.setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).setWidth(uploadedImage.getWidth(null)).setHeight(uploadedImage.getHeight(null));
+				image.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			} catch (IOException ioe1) {
 				logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
 				return;
@@ -133,6 +140,36 @@ public class UploadImagePage extends SoneTemplatePage {
 		}
 	}
 
+	private static Dimension getImageDimensions(Image uploadedImage) {
+		final CountDownLatch widthHeightLatch = new CountDownLatch(2);
+		final AtomicInteger finalWidth = new AtomicInteger();
+		final AtomicInteger finalHeight = new AtomicInteger();
+		ImageObserver imageObserver = new ImageObserver() {
+			@Override
+			public boolean imageUpdate(Image image, int infoFlags, int x, int y, int width, int height) {
+				if ((infoFlags & WIDTH) != 0) {
+					finalWidth.set(width);
+					widthHeightLatch.countDown();
+				}
+				if ((infoFlags & HEIGHT) != 0) {
+					finalHeight.set(width);
+					widthHeightLatch.countDown();
+				}
+				return (infoFlags & ALLBITS) != 0;
+			}
+		};
+		finalWidth.set(uploadedImage.getWidth(imageObserver));
+		finalHeight.set(uploadedImage.getHeight(imageObserver));
+		while ((finalWidth.get() == -1) || (finalHeight.get() == -1)) {
+			try {
+				widthHeightLatch.await();
+			} catch (InterruptedException ie1) {
+				logger.log(Level.WARNING, "Interrupted while waiting for latch...");
+			}
+		}
+		return new Dimension(finalWidth.get(), finalHeight.get());
+	}
+
 	//
 	// PRIVATE METHODS
 	//