X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUploadImagePage.java;h=5e23a786652e2cb3201b203c8c8ba4ab9a2a0891;hp=e0aa1e18a95e7290816b012f86e940608c3bff1b;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index e0aa1e1..5e23a78 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,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import static java.util.logging.Logger.getLogger;
+
 import java.awt.Image;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -31,15 +33,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,7 +56,7 @@ 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("Sone.Web.UploadImage");
 
 	/**
 	 * Creates a new “upload image” page.
@@ -78,14 +83,12 @@ public class UploadImagePage extends SoneTemplatePage {
 		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);
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
@@ -93,12 +96,11 @@ public class UploadImagePage extends SoneTemplatePage {
 			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;
@@ -119,11 +121,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(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);
@@ -144,7 +148,7 @@ 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);