X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateAlbumPage.java;h=561878c7a63fedd297f63e5d6646f7f5e1d34354;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=9e9cd9e1eed9a6daf8017e95136cd34e09a7abf2;hpb=7017646bf42cb265b6df539bb6def40b91d2f968;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index 9e9cd9e..561878c 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@ -17,9 +17,11 @@
 
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.text.TextFilter.filter;
+
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.text.TextFilter;
+import net.pterodactylus.sone.database.AlbumBuilder;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
@@ -48,9 +50,6 @@ public class CreateAlbumPage extends SoneTemplatePage {
 	// SONETEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
@@ -60,18 +59,23 @@ public class CreateAlbumPage extends SoneTemplatePage {
 				templateContext.set("nameMissing", true);
 				return;
 			}
-			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
-			Sone currentSone = getCurrentSone(request.getToadletContext());
-			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
-			Album parent = webInterface.getCore().getAlbum(parentId, false);
-			if (parentId.equals("")) {
-				parent = currentSone.getRootAlbum();
-			}
-			Album album = webInterface.getCore().createAlbum(currentSone, parent);
-			album.setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description));
+			Album album = createAlbum(request, name);
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException("imageBrowser.html?album=" + album.getId());
 		}
 	}
 
+	private Album createAlbum(FreenetRequest request, String name) {
+		Sone currentSone = getCurrentSone(request.getToadletContext());
+		String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
+		AlbumBuilder albumBuilder = parentId.equals("") ? currentSone.newAlbumBuilder() : webInterface.getCore().getAlbum(parentId).get().newAlbumBuilder();
+		Album album = albumBuilder.build();
+		return setTitleAndDescription(request, name, album);
+	}
+
+	private Album setTitleAndDescription(FreenetRequest request, String name, Album album) {
+		String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
+		return album.modify().setTitle(name).setDescription(filter(request.getHttpRequest().getHeader("host"), description)).update();
+	}
+
 }