/*
- * Sone - ImageBrowserPage.java - Copyright © 2011–2012 David Roden
+ * Sone - ImageBrowserPage.java - Copyright © 2011–2015 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
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;
import net.pterodactylus.sone.web.page.FreenetRequest;
import net.pterodactylus.util.collection.Pagination;
-import net.pterodactylus.util.number.Numbers;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
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"));
return;
}
String imageId = request.getHttpRequest().getParam("image", null);
}
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);
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(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 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;