X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=0dbe4e7fea7025202ed47237ecbfd54e9a04bba5;hb=ec06ae64c86f0b06bb0cf9f8b289e7907e81dffa;hp=53c22f2574cad4345e49b3f5cfbd18e8e5bde041;hpb=45803a1c678d6811f7bbf85d50c79844031be0f0;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index 53c22f2..0dbe4e7 100644
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -17,6 +17,11 @@
 
 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 java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -64,7 +69,7 @@ public class ImageBrowserPage extends SoneTemplatePage {
 		super.processTemplate(request, templateContext);
 		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"));
@@ -89,9 +94,9 @@ 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);
+			Collections.sort(albums, TITLE_COMPARATOR);
 			Pagination<Album> albumPagination = new Pagination<Album>(albums, 12).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
 			templateContext.set("albumPagination", albumPagination);
 			templateContext.set("albums", albumPagination.getItems());