kscience/dataforge-core
7
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 12 Wiki Activity

HTML renderer refactoring

Browse Source
This commit is contained in:
Alexander Nozik 2020-08-31 12:39:44 +03:00
parent 6ad5f162a1
commit 99fee604d8
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dataforge-output/dataforge-output-html/src/commonMain/kotlin/hep/dataforge/output/html/HtmlRenderer.kt
View File

@ -1,6 +1,7 @@
package hep.dataforge.output.html package hep.dataforge.output.html
import hep.dataforge.context.Context import hep.dataforge.context.Context
import hep.dataforge.meta.DFExperimental
import hep.dataforge.meta.Meta import hep.dataforge.meta.Meta
import hep.dataforge.output.Output import hep.dataforge.output.Output
import hep.dataforge.output.Renderer import hep.dataforge.output.Renderer
@ -10,12 +11,14 @@ import hep.dataforge.provider.Type
import hep.dataforge.provider.top import hep.dataforge.provider.top
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.html.FlowContent
import kotlinx.html.TagConsumer import kotlinx.html.TagConsumer
import kotlinx.html.p import kotlinx.html.p
import kotlin.reflect.KClass import kotlin.reflect.KClass
class HtmlRenderer<T : Any>(override val context: Context, private val consumer: TagConsumer<*>) : Renderer<T> { @DFExperimental
public class HtmlRenderer<T : Any>(override val context: Context, private val consumer: TagConsumer<*>) : Renderer<T> {
private val cache = HashMap<KClass<*>, HtmlBuilder<*>>() private val cache = HashMap<KClass<*>, HtmlBuilder<*>>()
/** /**
@ -42,7 +45,7 @@ class HtmlRenderer<T : Any>(override val context: Context, private val consumer:
} }
context.launch(Dispatchers.Output) { context.launch(Dispatchers.Output) {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
(builder as HtmlBuilder<T>).run { consumer.render(obj) } (builder as HtmlBuilder<T>).run { render(obj) }
} }
} }
} }
@ -51,29 +54,29 @@ class HtmlRenderer<T : Any>(override val context: Context, private val consumer:
* A text or binary renderer based on [Renderer] * A text or binary renderer based on [Renderer]
*/ */
@Type(HTML_CONVERTER_TYPE) @Type(HTML_CONVERTER_TYPE)
interface HtmlBuilder<T : Any> { public interface HtmlBuilder<T : Any> {
/** /**
* The priority of this renderer compared to other renderers * The priority of this renderer compared to other renderers
*/ */
val priority: Int public val priority: Int
/** /**
* The type of the content served by this renderer * The type of the content served by this renderer
*/ */
val type: KClass<T> public val type: KClass<T>
suspend fun TagConsumer<*>.render(obj: T) public suspend fun FlowContent.render(obj: T)
companion object { public companion object {
const val HTML_CONVERTER_TYPE = "dataforge.htmlBuilder" public const val HTML_CONVERTER_TYPE: String = "dataforge.htmlBuilder"
} }
} }
object DefaultHtmlBuilder : HtmlBuilder<Any> { public object DefaultHtmlBuilder : HtmlBuilder<Any> {
override val priority: Int = Int.MAX_VALUE override val priority: Int = Int.MAX_VALUE
override val type: KClass<Any> = Any::class override val type: KClass<Any> = Any::class
override suspend fun TagConsumer<*>.render(obj: Any) { override suspend fun FlowContent.render(obj: Any) {
p { +obj.toString() } p { +obj.toString() }
} }
} }