X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpage%2FFreenetTemplatePage.kt;h=d5d8f06a95ce205b4ec3935c6a3ae9391d18ff75;hp=792c0ba444529dabdf14d2e12969b6eb1506706b;hb=5201720801a4053f8f324b71fb3e9c36f6cd911e;hpb=5b9d7d47f2e3ba720a3d5a5b94146904e5e10632

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
index 792c0ba..d5d8f06 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
@@ -21,7 +21,6 @@ import freenet.clients.http.*
 import net.pterodactylus.sone.main.*
 import net.pterodactylus.util.template.*
 import net.pterodactylus.util.web.*
-import java.io.*
 import java.lang.String.*
 import java.net.*
 import java.util.logging.*
@@ -32,18 +31,17 @@ import java.util.logging.Logger.*
  * fit into Freenet’s web interface.
  */
 open class FreenetTemplatePage(
-		private val path: String,
-		private val templateContextFactory: TemplateContextFactory,
+		private val templateRenderer: TemplateRenderer,
 		loaders: Loaders,
-		template: Template,
 		private val invalidFormPasswordRedirectTarget: String
 ) : FreenetPage, LinkEnabledCallback {
 
+	private val pageMakerInteractionFactory: PageMakerInteractionFactory = DefaultPageMakerInteractionFactory()
 	open val styleSheets: Collection<String> = emptySet()
 	open val shortcutIcon: String? get() = null
 	open val isFullAccessOnly get() = false
 
-	override fun getPath() = path
+	override fun getPath() = toadletPath
 
 	open fun getPageTitle(request: FreenetRequest) = ""
 
@@ -57,7 +55,7 @@ open class FreenetTemplatePage(
 
 	override fun isEnabled(toadletContext: ToadletContext) = !isFullAccessOnly
 
-	private val template = templatePath?.let(loaders::loadTemplate) ?: template
+	private val template = templatePath?.let(loaders::loadTemplate) ?: Template()
 
 	override fun handleRequest(request: FreenetRequest, response: Response): Response {
 		getRedirectTarget(request)?.let { redirectTarget -> return RedirectResponse(redirectTarget) }
@@ -73,33 +71,27 @@ open class FreenetTemplatePage(
 				return RedirectResponse(invalidFormPasswordRedirectTarget)
 			}
 		}
-		val pageMaker = toadletContext.pageMaker
-		val pageNode = pageMaker.getPageNode(getPageTitle(request), toadletContext)
-
-		styleSheets.forEach(pageNode::addCustomStyleSheet)
-		getAdditionalLinkNodes(request)
-				.map { it to pageNode.headNode.addChild("link") }
-				.forEach { (linkNodeParameters, linkNode) ->
-					linkNodeParameters.forEach(linkNode::addAttribute)
-				}
-		shortcutIcon?.let { pageNode.addForwardLink("icon", it) }
-
-		val templateContext = templateContextFactory.createTemplateContext()
-		templateContext.mergeContext(template.initialContext)
-		try {
+
+		val pageMakerInteraction = pageMakerInteractionFactory.createPageMaker(toadletContext, getPageTitle(request))
+		styleSheets.forEach(pageMakerInteraction::addStyleSheet)
+		getAdditionalLinkNodes(request).forEach(pageMakerInteraction::addLinkNode)
+		shortcutIcon?.let(pageMakerInteraction::addShortcutIcon)
+
+		val output = try {
 			val start = System.nanoTime()
-			processTemplate(request, templateContext)
-			val finish = System.nanoTime()
-			logger.log(Level.FINEST, format("Template was rendered in %.2fms.", (finish - start) / 1000000.0))
+			templateRenderer.render(template) { templateContext ->
+				processTemplate(request, templateContext)
+			}.also {
+				val finish = System.nanoTime()
+				logger.log(Level.FINEST, format("Template was rendered in %.2fms.", (finish - start) / 1000000.0))
+			}
 		} catch (re1: RedirectException) {
 			return RedirectResponse(re1.target ?: "")
 		}
 
-		val stringWriter = StringWriter()
-		template.render(templateContext, stringWriter)
-		pageNode.content.addChild("%", stringWriter.toString())
+		pageMakerInteraction.setContent(output)
 
-		return response.setStatusCode(200).setStatusText("OK").setContentType("text/html").write(pageNode.outer.generate())
+		return response.setStatusCode(200).setStatusText("OK").setContentType("text/html").write(pageMakerInteraction.renderPage())
 	}
 
 	open fun processTemplate(request: FreenetRequest, templateContext: TemplateContext) {