/*
- * Sone - UploadImagePage.java - Copyright © 2011–2013 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
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 javax.imageio.stream.ImageInputStream;
import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.impl.ImageImpl.ImageTitleMustNotBeEmpty;
+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;
*/
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.
* {@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);
if (!currentSone.equals(parent.getSone())) {
throw new RedirectException("noPermission.html");
}
- String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200);
+ String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200).trim();
+ if (name.length() == 0) {
+ throw new RedirectException("emptyImageTitle.html");
+ }
String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
HTTPUploadedFile uploadedFile = request.getHttpRequest().getUploadedFile("image");
Bucket fileBucket = uploadedFile.getData();
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;
}
}