Replace edit album page with Kotlin version

diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
deleted file mode 100644 (file)
index 5829c8b..0000000
--- a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Sone - EditAlbumPage.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 <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.web;
-
-import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty;
-import net.pterodactylus.sone.text.TextFilter;
-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 edit the name and description of an album.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class EditAlbumPage extends SoneTemplatePage {
-
-       /**
-        * Creates a new “edit album” page.
-        *
-        * @param template
-        *            The template to render
-        * @param webInterface
-        *            The Sone web interface
-        */
-       public EditAlbumPage(Template template, WebInterface webInterface) {
-               super("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, true);
-       }
-
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               if (request.getMethod() == Method.POST) {
-                       String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
-                       Album album = webInterface.getCore().getAlbum(albumId);
-                       if (album == null) {
-                               throw new RedirectException("invalid.html");
-                       }
-                       if (!album.getSone().isLocal()) {
-                               throw new RedirectException("noPermission.html");
-                       }
-                       if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
-                               album.getParent().moveAlbumUp(album);
-                               webInterface.getCore().touchConfiguration();
-                               throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
-                       } else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
-                               album.getParent().moveAlbumDown(album);
-                               webInterface.getCore().touchConfiguration();
-                               throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
-                       }
-                       String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
-                       String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
-                       try {
-                               album.modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
-                       } catch (AlbumTitleMustNotBeEmpty atmnbe) {
-                               throw new RedirectException("emptyAlbumTitle.html");
-                       }
-                       webInterface.getCore().touchConfiguration();
-                       throw new RedirectException("imageBrowser.html?album=" + album.getId());
-               }
-       }
-
-}

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/EditAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/EditAlbumPage.kt
new file mode 100644 (file)
index 0000000..8a59c33
--- /dev/null
+++ b/src/main/kotlin/net/pterodactylus/sone/web/EditAlbumPage.kt
@@ -0,0 +1,42 @@
+package net.pterodactylus.sone.web
+
+import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
+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 edit the name and description of an album.
+ */
+class EditAlbumPage(template: Template, webInterface: WebInterface):
+               SoneTemplatePage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, true) {
+
+       override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+               if (request.method == POST) {
+                       val album = webInterface.core.getAlbum(request.httpRequest.getPartAsStringFailsafe("album", 36)) ?: throw RedirectException("invalid.html")
+                       album.takeUnless { it.sone.isLocal }?.run { throw RedirectException("noPermission.html") }
+                       if (request.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
+                               album.parent?.moveAlbumUp(album)
+                               webInterface.core.touchConfiguration()
+                               throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
+                       } else if (request.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") {
+                               album.parent?.moveAlbumDown(album)
+                               webInterface.core.touchConfiguration()
+                               throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
+                       } else {
+                               try {
+                                       album.modify()
+                                                       .setTitle(request.httpRequest.getPartAsStringFailsafe("title", 100))
+                                                       .setDescription(request.httpRequest.getPartAsStringFailsafe("description", 1000))
+                                                       .update()
+                               } catch (e: AlbumTitleMustNotBeEmpty) {
+                                       throw RedirectException("emptyAlbumTitle.html")
+                               }
+                               webInterface.core.touchConfiguration()
+                               throw RedirectException("imageBrowser.html?album=${album.id}")
+                       }
+               }
+       }
+
+}

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/EditAlbumPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/EditAlbumPageTest.kt
index bf3b97f..ed96a80 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/EditAlbumPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/EditAlbumPageTest.kt
@@ -59,7 +59,7 @@ class EditAlbumPageTest: WebPageTest() {
        @Test
        fun `get request does not redirect`() {
                request("", GET)
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
        }
 
        @Test