X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditAlbumAjaxPage.java;h=570d0274b21d6e50d2bc410b05b152926ba217a1;hp=0e72ea5738af58e996913b487efe139f9fb7e9cf;hb=00a434a23c9ea1e57c63d8a3c0fc4b09277af431;hpb=a88e930a23b550dae75116d7759924d760941776

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
index 0e72ea5..570d027 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - EditAlbumAjaxPage.java - Copyright © 2011–2012 David Roden
+ * Sone - EditAlbumAjaxPage.java - Copyright © 2011–2013 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
@@ -21,7 +21,8 @@ import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
+
+import com.google.common.base.Optional;
 
 /**
  * Page that stores a user’s album modifications.
@@ -48,30 +49,34 @@ public class EditAlbumAjaxPage extends JsonPage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected JsonObject createJsonObject(FreenetRequest request) {
+	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String albumId = request.getHttpRequest().getParam("album");
-		Album album = webInterface.getCore().getAlbum(albumId, false);
-		if (album == null) {
+		Optional<Album> album = webInterface.getCore().getAlbum(albumId);
+		if (!album.isPresent()) {
 			return createErrorJsonObject("invalid-album-id");
 		}
-		if (!album.getSone().isLocal()) {
+		if (!album.get().getSone().isLocal()) {
 			return createErrorJsonObject("not-authorized");
 		}
 		if ("true".equals(request.getHttpRequest().getParam("moveLeft"))) {
-			Album swappedAlbum = (album.getParent() != null) ? album.getParent().moveAlbumUp(album) : album.getSone().moveAlbumUp(album);
+			Album swappedAlbum = album.get().getParent().moveAlbumUp(album.get());
 			webInterface.getCore().touchConfiguration();
-			return createSuccessJsonObject().put("sourceAlbumId", album.getId()).put("destinationAlbumId", swappedAlbum.getId());
+			return createSuccessJsonObject().put("sourceAlbumId", album.get().getId()).put("destinationAlbumId", swappedAlbum.getId());
 		}
 		if ("true".equals(request.getHttpRequest().getParam("moveRight"))) {
-			Album swappedAlbum = (album.getParent() != null) ? album.getParent().moveAlbumDown(album) : album.getSone().moveAlbumDown(album);
+			Album swappedAlbum = album.get().getParent().moveAlbumDown(album.get());
 			webInterface.getCore().touchConfiguration();
-			return createSuccessJsonObject().put("sourceAlbumId", album.getId()).put("destinationAlbumId", swappedAlbum.getId());
+			return createSuccessJsonObject().put("sourceAlbumId", album.get().getId()).put("destinationAlbumId", swappedAlbum.getId());
 		}
 		String title = request.getHttpRequest().getParam("title").trim();
 		String description = request.getHttpRequest().getParam("description").trim();
-		album.setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
-		webInterface.getCore().touchConfiguration();
-		return createSuccessJsonObject().put("albumId", album.getId()).put("title", album.getTitle()).put("description", album.getDescription());
+		try {
+			album.get().modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+			webInterface.getCore().touchConfiguration();
+			return createSuccessJsonObject().put("albumId", album.get().getId()).put("title", album.get().getTitle()).put("description", album.get().getDescription());
+		} catch (IllegalStateException e) {
+			return createErrorJsonObject("invalid-album-title");
+		}
 	}
 
 }