X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=467ceda0b0304fdaffb283431f498676ec003433;hp=e160c323ff20a887fa3c2edffb77bde28cd6c869;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hpb=60926d0dc3b2139029c3fcb0b3d28caccf4b83b3

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index e160c32..467ceda 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–2016 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,6 +17,9 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.base.Optional.fromNullable;
+import static java.util.logging.Logger.getLogger;
+
 import java.awt.Image;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,16 +34,18 @@ import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty;
 import net.pterodactylus.sone.data.Sone;
 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;
 
@@ -51,8 +56,8 @@ import freenet.support.api.HTTPUploadedFile;
  */
 public class UploadImagePage extends SoneTemplatePage {
 
-	/** The logger. */
-	private static final Logger logger = Logging.getLogger(UploadImagePage.class);
+	private static final Logger logger = getLogger(UploadImagePage.class.getName());
+	private static final String UNKNOWN_MIME_TYPE = "application/octet-stream";
 
 	/**
 	 * Creates a new “upload image” page.
@@ -74,32 +79,31 @@ public class UploadImagePage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		if (request.getMethod() == Method.POST) {
 			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
-			Album parent = webInterface.getCore().getAlbum(parentId, false);
+			Album parent = webInterface.getCore().getAlbum(parentId);
 			if (parent == null) {
-				/* TODO - signal error */
-				return;
+				throw new RedirectException("noPermission.html");
 			}
 			if (!currentSone.equals(parent.getSone())) {
-				/* TODO - signal error. */
-				return;
+				throw new RedirectException("noPermission.html");
+			}
+			String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200).trim();
+			if (name.length() == 0) {
+				throw new RedirectException("emptyImageTitle.html");
 			}
-			String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200);
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
 			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();
 				/* 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;
@@ -120,11 +124,13 @@ public class UploadImagePage extends SoneTemplatePage {
 				}
 				String mimeType = getMimeType(imageData);
 				TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData);
-				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));
+				net.pterodactylus.sone.data.Image image = webInterface.getCore().createImage(currentSone, parent, temporaryImage);
+				image.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).setWidth(uploadedImage.getWidth(null)).setHeight(uploadedImage.getHeight(null)).update();
 			} catch (IOException ioe1) {
 				logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
 				return;
+			} catch (ImageTitleMustNotBeEmpty itmnbe) {
+				throw new RedirectException("emptyImageTitle.html");
 			} finally {
 				Closer.close(imageDataInputStream);
 				Closer.flush(uploadedImage);
@@ -145,18 +151,19 @@ public class UploadImagePage extends SoneTemplatePage {
 	 * @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);
 			Iterator<ImageReader> imageReaders = ImageIO.getImageReaders(imageInputStream);
 			if (imageReaders.hasNext()) {
-				return imageReaders.next().getOriginatingProvider().getMIMETypes()[0];
+				return fromNullable(imageReaders.next().getOriginatingProvider().getMIMETypes())
+						.or(new String[] { UNKNOWN_MIME_TYPE })[0];
 			}
 		} catch (IOException ioe1) {
 			logger.log(Level.FINE, "Could not detect MIME type for image.", ioe1);
 		}
-		return "application/octet-stream";
+		return UNKNOWN_MIME_TYPE;
 	}
 
 }