Change album ID to be unique, add internal ID

[Sone.git] / src / main / java / net / pterodactylus / sone / web / UploadImagePage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index 5812af5..2c7b0a9 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -17,6 +17,7 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.base.Optional.fromNullable;
 import static java.util.logging.Logger.getLogger;
 
 import java.awt.Image;
@@ -33,7 +34,8 @@ import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.impl.ImageImpl.ImageTitleMustNotBeEmpty;
+import net.pterodactylus.sone.data.IdBuilder;
+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;
@@ -55,8 +57,8 @@ import freenet.support.api.HTTPUploadedFile;
  */
 public class UploadImagePage extends SoneTemplatePage {
 
-       /** The logger. */
-       private static final Logger logger = getLogger("Sone.Web.UploadImage");
+       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.
@@ -82,7 +84,7 @@ public class UploadImagePage extends SoneTemplatePage {
                super.processTemplate(request, templateContext);
                if (request.getMethod() == Method.POST) {
                        Sone currentSone = getCurrentSone(request.getToadletContext());
-                       String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
+                       String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", IdBuilder.ID_STRING_LENGTH);
                        Album parent = webInterface.getCore().getAlbum(parentId);
                        if (parent == null) {
                                throw new RedirectException("noPermission.html");
@@ -154,12 +156,13 @@ public class UploadImagePage extends SoneTemplatePage {
                        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;
        }
 
 }