Add config defaults, k8scp: remove debug from K8scpSource.stat, dav: configurable nextcloud upload chunk size, fix no update on source change, sftp: add home

Author: valaphee

src/main/kotlin/com/valaphee/blit/Main.kt

@@ -42,7 +42,7 @@ fun main(arguments: Array<String>) {
  val injector = Guice.createInjector(DataModule(), object : AbstractModule() {
  @Singleton
  @Provides
- fun locale(config: Config, locales: Map<String, @JvmSuppressWildcards Locale>) = config.locale?.let { locales[it] ?: locales["en_us"] } ?: locales["en_us"]
+ fun locale(config: Config, locales: Map<String, @JvmSuppressWildcards Locale>) = locales[config.locale] ?: locales["en_us"]
  })
 
  FX.dicontainer = object : DIContainer {

src/main/kotlin/com/valaphee/blit/MainView.kt

@@ -128,8 +128,15 @@ class MainView : View("Blit") {
  }
 
  inner class Pane<T : Entry<T>> : VBox() {
- private val source = SimpleObjectProperty<Source<T>>().apply { onChange { it?.let { navigate(it.home) } } }
- private lateinit var _path: String
+ private val source = SimpleObjectProperty<Source<T>>().apply {
+ onChange {
+ it?.let {
+ _path = null
+ navigate(it.home)
+ }
+ }
+ }
+ private var _path: String? = null
  private val name = SimpleStringProperty()
  private val tree = Tree<T>()
 
@@ -183,7 +190,7 @@ class MainView : View("Blit") {
  var canonicalPath = path.toCanonicalPath().joinToString("/")
  if (!canonicalPath.endsWith('/')) canonicalPath = "$canonicalPath/"
 
- if (::_path.isInitialized && canonicalPath == _path) return
+ if (canonicalPath == _path) return
 
  source.value?.let {
  worker.launch(locale["main.navigator.task.navigate.name", canonicalPath]) {

src/main/kotlin/com/valaphee/blit/data/DataModule.kt

@@ -16,6 +16,7 @@
 
 package com.valaphee.blit.data
 
+import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.DeserializationFeature
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.PropertyNamingStrategies
@@ -42,6 +43,8 @@ class DataModule(
  if (!::objectMapper.isInitialized) objectMapper = jacksonObjectMapper().apply {
  registerModule(AfterburnerModule())
  propertyNamingStrategy = PropertyNamingStrategies.SNAKE_CASE
+ setSerializationInclusion(JsonInclude.Include.NON_DEFAULT)
+ enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
  disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
  }.also { bind(ObjectMapper::class.java).toInstance(it) }
 

src/main/kotlin/com/valaphee/blit/data/config/Config.kt

@@ -24,6 +24,7 @@ import com.valaphee.blit.source.Source
 import com.valaphee.blit.source.local.LocalSource
 import java.lang.Long.signum
 import java.text.StringCharacterIterator
+import java.util.Locale
 import kotlin.math.abs
 
 /**
@@ -32,7 +33,7 @@ import kotlin.math.abs
 @Singleton
 @DataType("config")
 class Config(
- @get:JsonProperty("locale") val locale: String? = null,
+ @get:JsonProperty("locale") val locale: String = Locale.getDefault().toLanguageTag().replace('-', '_'),
  @get:JsonProperty("data_size_unit") val dataSizeUnit: DataSizeUnit = DataSizeUnit.IEC,
  @get:JsonProperty("sources") val sources: List<Source<*>> = listOf(LocalSource("local"))
 ) : Data {

src/main/kotlin/com/valaphee/blit/source/dav/DavEntry.kt

@@ -28,6 +28,7 @@ import io.ktor.client.request.put
 import io.ktor.client.request.request
 import io.ktor.client.statement.HttpResponse
 import io.ktor.client.statement.readBytes
+import io.ktor.client.statement.request
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.URLBuilder
 import io.ktor.http.content.OutgoingContent
@@ -53,20 +54,20 @@ class DavEntry(
  override val modifyTime get() = prop.getlastmodified?.time ?: 0
  override val directory get() = prop.resourcetype?.collection != null
 
- override suspend fun list() = if (directory) {
+ override suspend fun list(): List<DavEntry> = if (directory) {
+ val path = if (path.startsWith('/')) path.substring(1) else path // Unix path correction, "." ("") and "/" are the same
  val httpResponse = davSource.httpClient.request<HttpResponse>("${davSource._url}/$path") { method = httpMethodPropfind }
- if (httpResponse.status == HttpStatusCode.MultiStatus) {
- var first = true
- xmlMapper.readValue<Multistatus>(httpResponse.readBytes()).response.mapNotNull {
- if (first) {
- first = false
- null
- } else {
+ when (httpResponse.status) {
+ HttpStatusCode.MultiStatus -> {
+ val href = httpResponse.request.url.encodedPath
+ xmlMapper.readValue<Multistatus>(httpResponse.readBytes()).response.filter { !it.href.equals(href, true) }.mapNotNull {
  val name = URLDecoder.decode(it.href.removeSuffix("/").split('/').last(), "UTF-8")
- /*if (name != this.name) */DavEntry(davSource, "${if (path == "/") "" else path}/${name}", it.propstat.first().prop)/* else null*/
- } // TODO: it is not defined in the standard that the first entry has to be the entry itself
+ it.propstat.find { it.status == "HTTP/1.1 200 OK" }?.prop?.let { DavEntry(davSource, "$path/$name", it) }
+ }
  }
- } else emptyList()
+ HttpStatusCode.NotFound -> throw NotFoundException(path)
+ else -> TODO()
+ }
  } else emptyList()
 
  override suspend fun transferTo(stream: OutputStream) {
@@ -78,15 +79,15 @@ class DavEntry(
  }
 
  override suspend fun transferFrom(name: String, stream: InputStream, length: Long) {
- if (davSource.nextcloud && length > chunkSize) {
+ if (davSource.nextcloud && length > davSource.nextcloudUploadChunkSize) {
  val id = "blit-${UUID.randomUUID()}"
  davSource.httpClient.request<Unit>("${davSource.url}/uploads/${davSource.username}/$id") { method = httpMethodMkcol }
 
  /*val jobs = mutableListOf<Job>()*/
- val chunkCount = ceil(length / chunkSize.toDouble())
+ val chunkCount = ceil(length / davSource.nextcloudUploadChunkSize.toDouble())
  for (i in 0..chunkCount) {
  /*jobs += ioScope.launch { */
- davSource.httpClient.put<Unit>("${davSource.url}/uploads/${davSource.username}/$id/${i * chunkSize}") { body = stream.readNBytes(chunkSize.toInt()) }
+ davSource.httpClient.put<Unit>("${davSource.url}/uploads/${davSource.username}/$id/${i * davSource.nextcloudUploadChunkSize}") { body = stream.readNBytes(davSource.nextcloudUploadChunkSize.toInt()) }
  coroutineContext.progress = i / chunkCount.toDouble() // TODO: more precise progress
  /*}*/
  }
@@ -124,8 +125,6 @@ class DavEntry(
  }
 
  companion object {
- private const val chunkSize = 10L * 1024 * 1024
-
  private fun ceil(value: Double): Int {
  val valueInt = (value + 1).toInt()
  return if (value >= valueInt) valueInt else valueInt - 1

src/main/kotlin/com/valaphee/blit/source/dav/DavSource.kt

@@ -47,11 +47,12 @@ import javax.net.ssl.X509TrustManager
  */
 @JsonTypeName("dav")
 class DavSource(
- name: String,
- @get:JsonProperty("url") val url: String,
- @get:JsonProperty("username") val username: String,
- @get:JsonProperty("password") val password: String,
- @get:JsonProperty("nextcloud") val nextcloud: Boolean
+ name: String = "",
+ @get:JsonProperty("url") val url: String = "",
+ @get:JsonProperty("username") val username: String = "",
+ @get:JsonProperty("password") val password: String = "",
+ @get:JsonProperty("nextcloud") val nextcloud: Boolean = false,
+ @get:JsonProperty("nextcloud-upload-chunk-size") val nextcloudUploadChunkSize: Long = 10L * 1024 * 1024
 ) : AbstractSource<DavEntry>(name) {
  @get:JsonIgnore internal val httpClient by lazy {
  HttpClient(OkHttp) {

src/main/kotlin/com/valaphee/blit/source/dav/DavSourceUi.kt

@@ -24,6 +24,8 @@ import javafx.scene.control.TextField
 import tornadofx.Field
 import tornadofx.checkbox
 import tornadofx.field
+import tornadofx.filterInput
+import tornadofx.isLong
 import tornadofx.passwordfield
 import tornadofx.textfield
 import tornadofx.toProperty
@@ -43,6 +45,7 @@ object DavSourceUi : SourceUi {
  field("Username") { textfield(davSource?.username ?: "") },
  field("Password") { passwordfield(davSource?.password ?: "") },
  field("Nextcloud") { checkbox(property = davSource?.nextcloud.toProperty()) },
+ field("Nextcloud Upload Chunk Size") { textfield(davSource?.nextcloudUploadChunkSize?.toString() ?: "") { filterInput { it.controlNewText.isLong() } } }
  )
  }
 
@@ -52,5 +55,6 @@ object DavSourceUi : SourceUi {
  (fields[2].inputs[0] as TextField).text,
  (fields[3].inputs[0] as TextField).text,
  (fields[4].inputs[0] as CheckBox).isSelected,
+ (fields[5].inputs[0] as TextField).text.toLong()
  )
 }

src/main/kotlin/com/valaphee/blit/source/k8scp/K8scpSource.kt

@@ -31,9 +31,9 @@ import java.io.InputStreamReader
  */
 @JsonTypeName("k8scp")
 class K8scpSource(
- name: String,
- @get:JsonProperty("namespace") val namespace: String,
- @get:JsonProperty("pod") val pod: String
+ name: String = "",
+ @get:JsonProperty("namespace") val namespace: String = "",
+ @get:JsonProperty("pod") val pod: String = ""
 ) : AbstractSource<K8scpEntry>(name) {
  override val home: String get() = if (namespace.isNotEmpty() && pod.isNotEmpty()) {
  val process = copy.exec(namespace, pod, arrayOf("pwd", toString()), false)

src/main/kotlin/com/valaphee/blit/source/k8scp/K8scpUtil.kt

@@ -31,7 +31,6 @@ internal fun K8scpSource.stat(path: String): SftpClient.Attributes? {
  val (namespace, pod, path) = getNamespacePodAndPath(path)
  return if (namespace != null) {
  if (pod != null) {
- println("$namespace - $pod - $path")
  val process = K8scpSource.copy.exec(namespace, pod, arrayOf("stat", "--format", "%A 0 %U %G %s %y %n", path), false)
  val attributes = BufferedReader(InputStreamReader(process.inputStream)).use { parseLsEntry(it.readText())?.second }
  process.waitFor()

src/main/kotlin/com/valaphee/blit/source/local/LocalSource.kt

@@ -26,7 +26,7 @@ import java.io.File
  */
 @JsonTypeName("local")
 class LocalSource(
- name: String
+ name: String = ""
 ) : AbstractSource<LocalEntry>(name) {
  override val home: String get() = File(System.getProperty("user.home")).absolutePath