X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=0dcdd3ab4617bbb7eb51662f0346bc61760beb02;hb=414ee1b03f7155ccb5049ede303dd01020ddcd94;hp=06afa8c608c8a500c900730c068a1a4dc27816e4;hpb=28b0c5550f1a2c1009f62ba43a038f2f2a878781;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 06afa8c..0dcdd3a 100644 --- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java @@ -1,5 +1,5 @@ /* - * Sone - UploadImagePage.java - Copyright © 2011 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 @@ -17,26 +17,41 @@ 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 javax.imageio.ImageIO; +import javax.imageio.ImageReader; +import javax.imageio.stream.ImageInputStream; import net.pterodactylus.sone.data.Album; import net.pterodactylus.sone.data.Sone; -import net.pterodactylus.sone.web.page.Page.Request.Method; +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.logging.Logging; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; +import net.pterodactylus.util.web.Method; + import freenet.support.api.Bucket; import freenet.support.api.HTTPUploadedFile; +import com.google.common.base.Optional; +import com.google.common.io.ByteStreams; + /** - * TODO + * Page implementation that lets the user upload an image. * * @author David ‘Bombe’ Roden */ @@ -46,10 +61,12 @@ public class UploadImagePage extends SoneTemplatePage { private static final Logger logger = Logging.getLogger(UploadImagePage.class); /** - * TODO + * Creates a new “upload image” page. * * @param template + * The template to render * @param webInterface + * The Sone web interface */ public UploadImagePage(Template template, WebInterface webInterface) { super("uploadImage.html", template, "Page.UploadImage.Title", webInterface, true); @@ -63,13 +80,18 @@ public class UploadImagePage extends SoneTemplatePage { * {@inheritDoc} */ @Override - protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException { + protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); if (request.getMethod() == Method.POST) { Sone currentSone = getCurrentSone(request.getToadletContext()); String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36); - Album parent = webInterface.getCore().getAlbum(parentId, false); - if (parent == null) { + Optional parent = webInterface.getCore().getAlbum(parentId); + if (!parent.isPresent()) { + /* TODO - signal error */ + return; + } + if (!currentSone.equals(parent.get().getSone())) { + /* TODO - signal error. */ return; } String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200); @@ -77,27 +99,101 @@ public class UploadImagePage extends SoneTemplatePage { HTTPUploadedFile uploadedFile = request.getHttpRequest().getUploadedFile("image"); Bucket fileBucket = uploadedFile.getData(); InputStream imageInputStream = null; + ByteArrayOutputStream imageDataOutputStream = null; net.pterodactylus.sone.data.Image image = null; try { imageInputStream = fileBucket.getInputStream(); - Image uploadedImage = ImageIO.read(imageInputStream); + /* TODO - check length */ + imageDataOutputStream = new ByteArrayOutputStream((int) fileBucket.size()); + ByteStreams.copy(imageInputStream, imageDataOutputStream); + } catch (IOException ioe1) { + logger.log(Level.WARNING, "Could not read uploaded image!", ioe1); + return; + } finally { + fileBucket.free(); + Closer.close(imageInputStream); + Closer.close(imageDataOutputStream); + } + byte[] imageData = imageDataOutputStream.toByteArray(); + ByteArrayInputStream imageDataInputStream = null; + Image uploadedImage = null; + try { + imageDataInputStream = new ByteArrayInputStream(imageData); + uploadedImage = ImageIO.read(imageDataInputStream); if (uploadedImage == null) { templateContext.set("messages", webInterface.getL10n().getString("Page.UploadImage.Error.InvalidImage")); return; } - image = new net.pterodactylus.sone.data.Image().setSone(currentSone); - image.setTitle(name).setDescription(description).setWidth(uploadedImage.getWidth(null)).setHeight(uploadedImage.getHeight(null)); - parent.addImage(image); - uploadedImage.flush(); + String mimeType = getMimeType(imageData); + Dimension imageSize = getImageDimensions(uploadedImage); + TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData, imageSize.width, imageSize.height); + image = webInterface.getCore().createImage(currentSone, parent.get(), temporaryImage); + 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; } finally { - Closer.close(imageInputStream); - fileBucket.free(); + Closer.close(imageDataInputStream); + Closer.flush(uploadedImage); + } + throw new RedirectException("imageBrowser.html?album=" + parent.get().getId()); + } + } + + 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 + // + + /** + * Tries to detect the MIME type of the encoded image. + * + * @param imageData + * The encoded image + * @return The MIME type of the image, or “application/octet-stream” if the + * image type could not be detected + */ + private static String getMimeType(byte[] imageData) { + ByteArrayInputStream imageDataInputStream = new ByteArrayInputStream(imageData); + try { + ImageInputStream imageInputStream = ImageIO.createImageInputStream(imageDataInputStream); + Iterator imageReaders = ImageIO.getImageReaders(imageInputStream); + if (imageReaders.hasNext()) { + return imageReaders.next().getOriginatingProvider().getMIMETypes()[0]; } - throw new RedirectException("imageBrowser.html?image=" + image.getId()); + } catch (IOException ioe1) { + logger.log(Level.FINE, "Could not detect MIME type for image.", ioe1); } + return "application/octet-stream"; } }