From c469191f95939fdc2f53fd4fcd8581ed5c595c69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Tue, 14 Feb 2017 21:34:30 +0100 Subject: [PATCH] Replace delete image page with Kotlin version --- .../pterodactylus/sone/web/DeleteImagePage.java | 72 ---------------------- .../net/pterodactylus/sone/web/DeleteImagePage.kt | 29 +++++++++ .../pterodactylus/sone/web/DeleteImagePageTest.kt | 12 +++- 3 files changed, 40 insertions(+), 73 deletions(-) delete mode 100644 src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java create mode 100644 src/main/kotlin/net/pterodactylus/sone/web/DeleteImagePage.kt diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java deleted file mode 100644 index e1b2f37..0000000 --- a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Sone - DeleteImagePage.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 - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package net.pterodactylus.sone.web; - -import net.pterodactylus.sone.data.Image; -import net.pterodactylus.sone.web.page.FreenetRequest; -import net.pterodactylus.util.template.Template; -import net.pterodactylus.util.template.TemplateContext; -import net.pterodactylus.util.web.Method; - -/** - * Page that lets the user delete an {@link Image}. - * - * @author David ‘Bombe’ Roden - */ -public class DeleteImagePage extends SoneTemplatePage { - - /** - * Creates a new “delete image” page. - * - * @param template - * The template to render - * @param webInterface - * The Sone web interface - */ - public DeleteImagePage(Template template, WebInterface webInterface) { - super("deleteImage.html", template, "Page.DeleteImage.Title", webInterface, true); - } - - // - // SONETEMPLATEPAGE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException { - String imageId = (request.getMethod() == Method.POST) ? request.getHttpRequest().getPartAsStringFailsafe("image", 36) : request.getHttpRequest().getParam("image"); - Image image = webInterface.getCore().getImage(imageId, false); - if (image == null) { - throw new RedirectException("invalid.html"); - } - if (!image.getSone().isLocal()) { - throw new RedirectException("noPermission.html"); - } - if (request.getMethod() == Method.POST) { - if (request.getHttpRequest().isPartSet("abortDelete")) { - throw new RedirectException("imageBrowser.html?image=" + image.getId()); - } - webInterface.getCore().deleteImage(image); - throw new RedirectException("imageBrowser.html?album=" + image.getAlbum().getId()); - } - templateContext.set("image", image); - } - -} diff --git a/src/main/kotlin/net/pterodactylus/sone/web/DeleteImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/DeleteImagePage.kt new file mode 100644 index 0000000..9999c3c --- /dev/null +++ b/src/main/kotlin/net/pterodactylus/sone/web/DeleteImagePage.kt @@ -0,0 +1,29 @@ +package net.pterodactylus.sone.web + +import net.pterodactylus.sone.web.page.FreenetRequest +import net.pterodactylus.util.template.Template +import net.pterodactylus.util.template.TemplateContext +import net.pterodactylus.util.web.Method.POST + +/** + * Page that lets the user delete an {@link Image}. + */ +class DeleteImagePage(template: Template, webInterface: WebInterface): + SoneTemplatePage("deleteImage.html", template, "Page.DeleteImage.Title", webInterface, true) { + + override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) { + val image = webInterface.core.getImage(request.httpRequest.getPartAsStringFailsafe("image", 36)) ?: throw RedirectException("invalid.html") + if (!image.sone.isLocal) { + throw RedirectException("noPermission.html") + } + if (request.method == POST) { + if (request.httpRequest.isPartSet("abortDelete")) { + throw RedirectException("imageBrowser.html?image=${image.id}") + } + webInterface.core.deleteImage(image) + throw RedirectException("imageBrowser.html?album=${image.album.id}") + } + templateContext["image"] = image + } + +} diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeleteImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeleteImagePageTest.kt index d3a0b6b..3f617cd 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/DeleteImagePageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/DeleteImagePageTest.kt @@ -16,7 +16,7 @@ import org.mockito.Mockito.verify /** * Unit test for [DeleteImagePage]. */ -class DeleteImagePageTest : WebPageTest() { +class DeleteImagePageTest: WebPageTest() { private val page = DeleteImagePage(template, webInterface) private val image = mock() @@ -35,6 +35,16 @@ class DeleteImagePageTest : WebPageTest() { } @Test + fun `page returns correct path`() { + assertThat(page.path, equalTo("deleteImage.html")) + } + + @Test + fun `page requires login`() { + assertThat(page.requiresLogin(), equalTo(true)) + } + + @Test fun `get request with invalid image redirects to invalid page`() { request("", GET) verifyRedirect("invalid.html") -- 2.7.4