/*
- * Sone - UploadImagePage.java - Copyright © 2011–2012 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
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;
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;
}
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;
* @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);