X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=766f018c770f88a46b539587dbbbfa52c3212587;hp=a6d3dafc429c47dd78e758d884dad5329953de54;hb=c2e868714435ac7c75d77d1911d0dfb00393d051;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index a6d3daf..766f018 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–2012 David Roden
+ * Sone - ImageBrowserPage.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
@@ -17,11 +17,18 @@
 
 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;
 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;
@@ -65,6 +72,7 @@ public class ImageBrowserPage extends SoneTemplatePage {
 			Album album = webInterface.getCore().getAlbum(albumId, false);
 			templateContext.set("albumRequested", true);
 			templateContext.set("album", album);
+			templateContext.set("page", request.getHttpRequest().getParam("page"));
 			return;
 		}
 		String imageId = request.getHttpRequest().getParam("image", null);
@@ -76,9 +84,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);
@@ -86,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());