/*
- * Sone - UploadImagePage.java - Copyright © 2011–2012 David Roden
+ * Sone - UploadImagePage.java - Copyright © 2011–2013 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
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;
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;
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;
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;
}
}
+ 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
//
* @return The MIME type of the image, or “application/octet-stream” if the
* image type could not be detected
*/
- private String getMimeType(byte[] imageData) {
+ private static String getMimeType(byte[] imageData) {
ByteArrayInputStream imageDataInputStream = new ByteArrayInputStream(imageData);
try {
ImageInputStream imageInputStream = ImageIO.createImageInputStream(imageDataInputStream);