X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditAlbumPage.java;h=3de23a3ce8bbeb0e7e18e2dbb180f3d7cee418f2;hb=414ee1b03f7155ccb5049ede303dd01020ddcd94;hp=dc5c8faea143ba34daa67f221134cf5cdea4de1d;hpb=7d5aff5d52afa5d9725ce252c846b1aca6f1a761;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index dc5c8fa..3de23a3 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 David Roden
+ * Sone - EditAlbumPage.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
@@ -18,13 +18,14 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
-import net.pterodactylus.sone.data.Sone;
 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;
 
+import com.google.common.base.Optional;
+
 /**
  * Page that lets the user edit the name and description of an album.
  *
@@ -51,48 +52,37 @@ public class EditAlbumPage extends SoneTemplatePage {
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		if (request.getMethod() == Method.POST) {
-			Sone currentSone = getCurrentSone(request.getToadletContext());
 			String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
-			Album album = webInterface.getCore().getAlbum(albumId, false);
-			if (album == null) {
+			Optional<Album> album = webInterface.getCore().getAlbum(albumId);
+			if (!album.isPresent()) {
 				throw new RedirectException("invalid.html");
 			}
-			if (!webInterface.getCore().isLocalSone(album.getSone())) {
+			if (!album.get().getSone().isLocal()) {
 				throw new RedirectException("noPermission.html");
 			}
 			if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveLeft", 4))) {
-				if (album.getParent() == null) {
-					currentSone.moveAlbumUp(album);
-					webInterface.getCore().touchConfiguration();
-					throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
-				}
-				album.getParent().moveAlbumUp(album);
+				album.get().getParent().moveAlbumUp(album.get());
 				webInterface.getCore().touchConfiguration();
-				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
+				throw new RedirectException("imageBrowser.html?album=" + album.get().getParent().getId());
 			} else if ("true".equals(request.getHttpRequest().getPartAsStringFailsafe("moveRight", 4))) {
-				if (album.getParent() == null) {
-					currentSone.moveAlbumDown(album);
-					webInterface.getCore().touchConfiguration();
-					throw new RedirectException("imageBrowser.html?sone=" + currentSone.getId());
-				}
-				album.getParent().moveAlbumDown(album);
+				album.get().getParent().moveAlbumDown(album.get());
 				webInterface.getCore().touchConfiguration();
-				throw new RedirectException("imageBrowser.html?album=" + album.getParent().getId());
+				throw new RedirectException("imageBrowser.html?album=" + album.get().getParent().getId());
 			}
 			String albumImageId = request.getHttpRequest().getPartAsStringFailsafe("album-image", 36);
-			if (webInterface.getCore().getImage(albumImageId, false) == null) {
+			if (!webInterface.getCore().getImage(albumImageId).isPresent()) {
 				albumImageId = null;
 			}
-			album.setAlbumImage(albumImageId);
+			album.get().modify().setAlbumImage(albumImageId).update();
 			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));
+			album.get().modify().setTitle(title).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
 			webInterface.getCore().touchConfiguration();
-			throw new RedirectException("imageBrowser.html?album=" + album.getId());
+			throw new RedirectException("imageBrowser.html?album=" + album.get().getId());
 		}
 	}