X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=acc63540dffb61401c383eeb0fe1b9e7f730f61c;hp=ea039ca5d2404199d4e1a02baf62e1e2cc5cb2e0;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=d5efb086bee8f103cbe90c7a953ffbb7ff27b689

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index ea039ca..acc6354 100644
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - ImageBrowserPage.java - Copyright © 2011–2013 David Roden
+ * Sone - ImageBrowserPage.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
@@ -17,11 +17,19 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.collect.FluentIterable.from;
+import static net.pterodactylus.sone.data.Album.FLATTENER;
+import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
+import static net.pterodactylus.sone.data.Album.TITLE_COMPARATOR;
+import static net.pterodactylus.sone.utils.NumberParsers.parseInt;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import com.google.common.base.Optional;
+
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
@@ -30,9 +38,6 @@ import net.pterodactylus.util.collection.Pagination;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
-import com.google.common.base.Optional;
-import com.google.common.primitives.Ints;
-
 /**
  * The image browser page is the entry page for the image management.
  *
@@ -60,11 +65,10 @@ public class ImageBrowserPage 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 {
 		String albumId = request.getHttpRequest().getParam("album", null);
 		if (albumId != null) {
-			Album album = webInterface.getCore().getAlbum(albumId, false);
+			Album album = webInterface.getCore().getAlbum(albumId);
 			templateContext.set("albumRequested", true);
 			templateContext.set("album", album);
 			templateContext.set("page", request.getHttpRequest().getParam("page"));
@@ -79,9 +83,9 @@ public class ImageBrowserPage extends SoneTemplatePage {
 		}
 		String soneId = request.getHttpRequest().getParam("sone", null);
 		if (soneId != null) {
-			Sone sone = webInterface.getCore().getSone(soneId, false);
+			Optional<Sone> sone = webInterface.getCore().getSone(soneId);
 			templateContext.set("soneRequested", true);
-			templateContext.set("sone", sone);
+			templateContext.set("sone", sone.orNull());
 			return;
 		}
 		String mode = request.getHttpRequest().getParam("mode", null);
@@ -89,10 +93,10 @@ public class ImageBrowserPage extends SoneTemplatePage {
 			templateContext.set("galleryRequested", true);
 			List<Album> albums = new ArrayList<Album>();
 			for (Sone sone : webInterface.getCore().getSones()) {
-				albums.addAll(sone.getAllAlbums());
+				albums.addAll(from(sone.getRootAlbum().getAlbums()).transformAndConcat(FLATTENER).filter(NOT_EMPTY).toList());
 			}
-			Collections.sort(albums, Album.TITLE_COMPARATOR);
-			Pagination<Album> albumPagination = new Pagination<Album>(albums, 12).setPage(Optional.fromNullable(Ints.tryParse(request.getHttpRequest().getParam("page"))).or(0));
+			Collections.sort(albums, TITLE_COMPARATOR);
+			Pagination<Album> albumPagination = new Pagination<Album>(albums, 12).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
 			templateContext.set("albumPagination", albumPagination);
 			templateContext.set("albums", albumPagination.getItems());
 			return;