X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePage.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePage.kt;h=de61835aef6ccc704911abe58149dc51ccf3c7ba;hp=4aa35ac33a647c77736f5a4612e71240f51c74c0;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hpb=6f1f26e3998cfef155b0cf59152827accea70d30

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
index 4aa35ac..de61835 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
@@ -1,50 +1,48 @@
 package net.pterodactylus.sone.web.pages
 
-import freenet.support.api.Bucket
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.text.TextFilter
-import net.pterodactylus.sone.utils.emptyToNull
-import net.pterodactylus.sone.utils.headers
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.utils.parameters
-import net.pterodactylus.sone.utils.use
-import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
-import java.awt.image.BufferedImage
-import java.io.ByteArrayInputStream
-import java.io.ByteArrayOutputStream
-import javax.imageio.ImageIO
+import freenet.support.api.*
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.text.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.template.*
+import java.awt.image.*
+import java.io.*
+import javax.imageio.*
+import javax.inject.*
 
 /**
  * Page implementation that lets the user upload an image.
  */
-class UploadImagePage(template: Template, webInterface: WebInterface):
-		LoggedInPage("uploadImage.html", template, "Page.UploadImage.Title", webInterface) {
+@TemplatePath("/templates/invalid.html")
+@ToadletPath("uploadImage.html")
+class UploadImagePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("Page.UploadImage.Title", webInterface, loaders, templateRenderer) {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
-		if (freenetRequest.isPOST) {
-			val parentAlbum = freenetRequest.parameters["parent"]!!.let(webInterface.core::getAlbum) ?: throw RedirectException("noPermission.html")
+	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if (soneRequest.isPOST) {
+			val parentAlbum = soneRequest.parameters["parent"]!!.let(soneRequest.core::getAlbum) ?: throw RedirectException("noPermission.html")
 			if (parentAlbum.sone != currentSone) {
 				throw RedirectException("noPermission.html")
 			}
-			val title = freenetRequest.parameters["title", 200].emptyToNull ?: throw RedirectException("emptyImageTitle.html")
+			val title = soneRequest.parameters["title", 200].emptyToNull ?: throw RedirectException("emptyImageTitle.html")
 
-			val uploadedFile = freenetRequest.httpRequest.getUploadedFile("image")
+			val uploadedFile = soneRequest.httpRequest.getUploadedFile("image")
 			val bytes = uploadedFile.data.use { it.toByteArray() }
 			val bufferedImage = bytes.toImage()
 			if (bufferedImage == null) {
-				templateContext["messages"] = webInterface.l10n.getString("Page.UploadImage.Error.InvalidImage")
+				templateContext["messages"] = soneRequest.l10n.getString("Page.UploadImage.Error.InvalidImage")
 				return
 			}
 
-			val temporaryImage = webInterface.core.createTemporaryImage(bytes.mimeType, bytes)
-			webInterface.core.createImage(currentSone, parentAlbum, temporaryImage).modify().apply {
+			val temporaryImage = soneRequest.core.createTemporaryImage(bytes.mimeType, bytes)
+			soneRequest.core.createImage(currentSone, parentAlbum, temporaryImage).modify().apply {
 				setWidth(bufferedImage.width)
 				setHeight(bufferedImage.height)
 				setTitle(title)
-				setDescription(TextFilter.filter(freenetRequest.headers["Host"], freenetRequest.parameters["description", 4000]))
+				setDescription(TextFilter.filter(soneRequest.headers["Host"], soneRequest.parameters["description", 4000]))
 			}.update()
 			throw RedirectException("imageBrowser.html?album=${parentAlbum.id}")
 		}
@@ -59,13 +57,14 @@ class UploadImagePage(template: Template, webInterface: WebInterface):
 		ImageIO.read(it)
 	}
 
-	private val ByteArray.mimeType get() = ByteArrayInputStream(this).use {
-		ImageIO.createImageInputStream(it).use {
-			ImageIO.getImageReaders(it).asSequence()
-					.firstOrNull()?.originatingProvider?.mimeTypes?.firstOrNull()
-					?: UNKNOWN_MIME_TYPE
+	private val ByteArray.mimeType
+		get() = ByteArrayInputStream(this).use {
+			ImageIO.createImageInputStream(it).use {
+				ImageIO.getImageReaders(it).asSequence()
+						.firstOrNull()?.originatingProvider?.mimeTypes?.firstOrNull()
+						?: UNKNOWN_MIME_TYPE
+			}
 		}
-	}
 
 }