SPC/snark
5
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SNRK-98: minor fixes

Browse Source
This commit is contained in:
Anton Belyi 2023-05-17 14:06:34 +03:00
parent 62e8d859d8
commit f28c5c6263
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
snark-ktor/src/main/kotlin/space/kscience/snark/ktor/WebInterface.kt
View File

@ -20,12 +20,12 @@ import kotlin.io.writeBytes
public interface DataHolder { public interface DataHolder {
fun init(relativePath: String = "/") : Directory public fun init(relativePath: String = "/") : Directory
fun represent(relativePath: String = "/"): String
//will be HTML later public fun represent(relativePath: String = "/"): String
} }
class LocalDataHolder: DataHolder { internal class LocalDataHolder: DataHolder {
private var source: Path? = null private var source: Path? = null
private var response: String = "" private var response: String = ""
@ -62,13 +62,12 @@ class LocalDataHolder: DataHolder {
} }
} }
public class SNARKServer(val dataHolder: DataHolder, val port: Int): Runnable { public class SNARKServer(private val dataHolder: DataHolder, private val port: Int): Runnable {
private var relativePath = "/" private var relativePath = "/"
private suspend fun receivePath(call: ApplicationCall) { private suspend fun receivePath(call: ApplicationCall) {
relativePath = call.receiveParameters()["path"]?:"/" relativePath = call.receiveParameters()["path"]?:"/"
call.respondRedirect("/") call.respondRedirect("/")
//call.respondText("Path is successfully changed to: " + relativePath)
} }
private suspend fun renderGet(call: ApplicationCall) { private suspend fun renderGet(call: ApplicationCall) {
call.respondText(dataHolder.represent(relativePath), ContentType.Text.Html) call.respondText(dataHolder.represent(relativePath), ContentType.Text.Html)
@ -88,7 +87,6 @@ public class SNARKServer(val dataHolder: DataHolder, val port: Int): Runnable {
part.dispose() part.dispose()
} }
unzip(tmp.toPath().toString(), dataHolder.init(relativePath)) unzip(tmp.toPath().toString(), dataHolder.init(relativePath))
//call.respondText("File is successfully uploaded")
call.respondRedirect("/") call.respondRedirect("/")
} }
private suspend fun renderMainPage(call: ApplicationCall) { private suspend fun renderMainPage(call: ApplicationCall) {