X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditAlbumPage.java;h=5829c8be343a8a4ec2ff75aa393ae7ea92cec155;hp=3db14d507100729edb02bd82343a7dcc628846c4;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=629ddb006542df2b671e172d8f544815bbab639b

diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index 3db14d5..5829c8b 100644
--- a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditAlbumPage.java - Copyright © 2011–2013 David Roden
+ * 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
@@ -18,7 +18,7 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.Sone;
+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;
@@ -48,11 +48,10 @@ public class EditAlbumPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	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, false);
+			Album album = webInterface.getCore().getAlbum(albumId);
 			if (album == null) {
 				throw new RedirectException("invalid.html");
 			}
@@ -68,18 +67,13 @@ public class EditAlbumPage extends SoneTemplatePage {
 				webInterface.getCore().touchConfiguration();
 				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
 			}
-			String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", 36);
-			if (webInterface.getCore().getImage(albumImageId, false) == null) {
-				albumImageId = null;
-			}
-			album.setAlbumImage(albumImageId);
 			String title = request.getHttpRequest().getPartAsStringFailsafe("title", 100).trim();
-			if (title.length() == 0) {
-				templateContext.set("titleMissing", true);
-				return;
-			}
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 1000).trim();
-			album.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+			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());
 		}