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=60a2bd5bf0f9b8ba4510a9da59ac0e603eb0d89e;hp=61894298dd1036913132ed3011a096d8789f55bf;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hpb=8da648b3e2b33064cb72aa87c4dc198b60bf0a7f

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 6189429..60a2bd5 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
@@ -2,10 +2,10 @@ 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.parameters
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
-import net.pterodactylus.util.collection.Pagination
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import java.net.URI
@@ -16,15 +16,15 @@ import java.net.URI
 class ImageBrowserPage(template: Template, webInterface: WebInterface):
 		SoneTemplatePage("imageBrowser.html", template, "Page.ImageBrowser.Title", webInterface, true) {
 
-	override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
-		if ("album" in request.parameters) {
+	override fun handleRequest(freenetRequest: FreenetRequest, 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,14 @@ class ImageBrowserPage(template: Template, webInterface: WebInterface):
 					.filterNot(Album::isEmpty)
 					.sortedBy(Album::getTitle)
 					.also { albums ->
-						templateContext["albums"] = albums
-						templateContext["albumPagination"] = Pagination(albums, 12).setPage(request.parameters["page"]?.toIntOrNull() ?: 0)
+						Pagination(albums, webInterface.core.preferences.imagesPerPage).apply { page = 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")) ?: getCurrentSone(freenetRequest.toadletContext)
 		}
 	}