X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditAlbumAjaxPage.java;h=6fe06bc0f747e92d7b46ea1a1b53993872b56da4;hb=a073898124dfcd550299c1f6ef707ee399bce270;hp=1bd94ca8c876e45ef3c40976708ce4d679328b88;hpb=9fbafff8f3467329e7c8ad24d5d13273962ade28;p=Sone.git

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 1bd94ca..6fe06bc 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java
@@ -17,10 +17,20 @@
 
 package net.pterodactylus.sone.web.ajax;
 
+import java.util.Collections;
+
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Image;
+import net.pterodactylus.sone.template.ParserFilter;
+import net.pterodactylus.sone.template.RenderFilter;
+import net.pterodactylus.sone.text.Part;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
+import net.pterodactylus.util.template.TemplateContext;
+
+import com.google.common.base.Optional;
+import com.google.common.collect.ImmutableMap;
 
 /**
  * Page that stores a user’s album modifications.
@@ -29,14 +39,13 @@ import net.pterodactylus.sone.web.page.FreenetRequest;
  */
 public class EditAlbumAjaxPage extends JsonPage {
 
-	/**
-	 * Creates a new edit album AJAX page.
-	 *
-	 * @param webInterface
-	 *            The Sone web interface
-	 */
-	public EditAlbumAjaxPage(WebInterface webInterface) {
+	private final ParserFilter parserFilter;
+	private final RenderFilter renderFilter;
+
+	public EditAlbumAjaxPage(WebInterface webInterface, ParserFilter parserFilter, RenderFilter renderFilter) {
 		super("editAlbum.ajax", webInterface);
+		this.parserFilter = parserFilter;
+		this.renderFilter = renderFilter;
 	}
 
 	//
@@ -49,28 +58,38 @@ public class EditAlbumAjaxPage extends JsonPage {
 	@Override
 	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", parseDescription(album.get()));
+		} catch (IllegalStateException e) {
+			return createErrorJsonObject("invalid-album-title");
+		}
+	}
+
+	private String parseDescription(Album album) {
+		Iterable<Part> parts = (Iterable<Part>) parserFilter.format(new TemplateContext(), album.getDescription(),
+				ImmutableMap.<String, Object>builder().put("sone", album.getSone()).build());
+		return (String) renderFilter.format(new TemplateContext(), parts, Collections.<String, Object>emptyMap());
 	}
 
 }