projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make all members of TemporaryImage final, store width and height, too.
[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
8d40416
..
3031970
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@
-36,11
+36,13
@@
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.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 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;
import freenet.support.api.Bucket;
import freenet.support.api.HTTPUploadedFile;
@@
-99,7
+101,7
@@
public class UploadImagePage extends SoneTemplatePage {
imageInputStream = fileBucket.getInputStream();
/* TODO - check length */
imageDataOutputStream = new ByteArrayOutputStream((int) fileBucket.size());
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;
} catch (IOException ioe1) {
logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
return;
@@
-119,9
+121,11
@@
public class UploadImagePage extends SoneTemplatePage {
return;
}
String mimeType = getMimeType(imageData);
return;
}
String mimeType = getMimeType(imageData);
- TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData);
+ int width = uploadedImage.getWidth(null);
+ int height = uploadedImage.getHeight(null);
+ TemporaryImage temporaryImage = webInterface.getCore().createTemporaryImage(mimeType, imageData, width, height);
image = webInterface.getCore().createImage(currentSone, parent, temporaryImage);
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)
);
+ image.
modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update(
);
} catch (IOException ioe1) {
logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
return;
} catch (IOException ioe1) {
logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
return;