X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FImageBrowserPage.kt;h=bf1ed2a7e4422fc85eadfd6581192041de7cc0f6;hp=2f165fcfbefb81ce13fff4c9fd7e908ccf80a8d3;hb=d4d31bed957e29d50bd313ab973a034eba5a07f3;hpb=107af8767f5dce8c27fa4c91b3ff3bc951140cca

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
index 2f165fc..bf1ed2a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
@@ -2,7 +2,7 @@ package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.utils.Pagination
+import net.pterodactylus.sone.utils.paginate
 import net.pterodactylus.sone.utils.parameters
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
@@ -14,17 +14,17 @@ import java.net.URI
  * The image browser page is the entry page for the image management.
  */
 class ImageBrowserPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface, true) {
+		LoggedInPage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		if ("album" in request.parameters) {
+	override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
+		if ("album" in freenetRequest.parameters) {
 			templateContext["albumRequested"] = true
-			templateContext["album"] = webInterface.core.getAlbum(request.parameters["album"]!!)
-			templateContext["page"] = request.parameters["page"]
-		} else if ("image" in request.parameters) {
+			templateContext["album"] = webInterface.core.getAlbum(freenetRequest.parameters["album"]!!)
+			templateContext["page"] = freenetRequest.parameters["page"]
+		} else if ("image" in freenetRequest.parameters) {
 			templateContext["imageRequested"] = true
-			templateContext["image"] = webInterface.core.getImage(request.parameters["image"])
-		} else if (request.parameters["mode"] == "gallery") {
+			templateContext["image"] = webInterface.core.getImage(freenetRequest.parameters["image"])
+		} else if (freenetRequest.parameters["mode"] == "gallery") {
 			templateContext["galleryRequested"] = true
 			webInterface.core.sones
 					.map(Sone::getRootAlbum)
@@ -33,12 +33,16 @@ class ImageBrowserPage(template: Template, webInterface: WebInterface):
 					.filterNot(Album::isEmpty)
 					.sortedBy(Album::getTitle)
 					.also { albums ->
-						templateContext["albums"] = albums
-						templateContext["albumPagination"] = Pagination(albums, 12).apply { page = request.parameters["page"]?.toIntOrNull() ?: 0 }
+						albums.paginate(webInterface.core.preferences.imagesPerPage)
+								.turnTo(freenetRequest.parameters["page"]?.toIntOrNull() ?: 0)
+								.also { pagination ->
+							templateContext["albumPagination"] = pagination
+							templateContext["albums"] = pagination.items
+						}
 					}
 		} else {
 			templateContext["soneRequested"] = true
-			templateContext["sone"] = webInterface.core.getSone(request.httpRequest.getParam("sone")).orNull() ?: getCurrentSone(request.toadletContext)
+			templateContext["sone"] = webInterface.core.getSone(freenetRequest.httpRequest.getParam("sone")) ?: currentSone
 		}
 	}