Add version to about, use config model (for rollback), ignore invalid data, add k8scp, sftp progress, and delete operation, add local delete operation, don not save default configuration on start-up, set worker thread to daemon

Author: Kevin Ludwig

build.gradle.kts

@@ -69,7 +69,15 @@ tasks {
 
     withType<Test> { useJUnitPlatform() }
 
-    shadowJar { archiveName = "blit.jar" }
+    jar {
+        manifest {
+            attributes(
+                "Implementation-Title" to "Blit",
+                "Implementation-Version" to project.version,
+                "Implementation-Vendor" to "Valaphee"
+            )
+        }
+    }
 }
 
 application { mainClass.set("com.valaphee.blit.MainKt") }
@@ -78,14 +86,11 @@ javafx { modules("javafx.controls", "javafx.graphics") }
 
 launch4j {
     mainClassName = "com.valaphee.blit.MainKt"
-    jarTask = tasks.shadowJar.get()
     icon = "${projectDir}/app.ico"
     copyright = "Copyright (c) 2021, Valaphee"
     jvmOptions = setOf("--add-opens=java.base/java.nio=ALL-UNNAMED", "--add-opens java.base/jdk.internal.misc=ALL-UNNAMED", "-Dio.netty.tryReflectionSetAccessible=true")
     companyName = "Valaphee"
     productName = "Blit"
-    /*splashFileName = "${projectDir}/splash.bmp"*/
-    copyConfigurable = emptyArray<Any>()
 }
 
 signing { useGpgCmd() }

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

@@ -16,33 +16,35 @@
 
 package com.valaphee.blit
 
+import javafx.geometry.Pos
+import javafx.scene.image.Image
 import javafx.scene.text.TextAlignment
 import jfxtras.styles.jmetro.JMetro
 import jfxtras.styles.jmetro.JMetroStyleClass
 import jfxtras.styles.jmetro.Style
 import tornadofx.View
-import tornadofx.borderpane
-import tornadofx.center
+import tornadofx.hbox
+import tornadofx.imageview
 import tornadofx.label
 
 /**
  * @author Kevin Ludwig
  */
 class AboutView : View("About Blit") {
-    override val root = borderpane {
-        prefWidth = 300.0
-        prefHeight = 100.0
-
+    override val root = hbox {
         JMetro(this, Style.DARK)
         styleClass.add(JMetroStyleClass.BACKGROUND)
 
-        center {
-            label(
-                """
-                    Blit
-                    Copyright (c) 2021, Valaphee.
-                """.trimIndent()
-            ) { textAlignment = TextAlignment.CENTER }
-        }
+        prefWidth = 300.0
+        prefHeight = 100.0
+        alignment = Pos.CENTER
+
+        imageview(Image(AboutView::class.java.getResourceAsStream("/app.png")))
+        label(
+            """
+            Blit${AboutView::class.java.`package`.implementationVersion?.let { " $it" } ?: ""}
+            Copyright (c) 2021, Valaphee.
+        """.trimIndent()
+        ) { textAlignment = TextAlignment.CENTER }
     }
 }

…kotlin/com/valaphee/blit/util/ComUtil.kt …main/kotlin/com/valaphee/blit/ComUtil.ktsrc/main/kotlin/com/valaphee/blit/util/ComUtil.kt renamed to src/main/kotlin/com/valaphee/blit/ComUtil.kt src/main/kotlin/com/valaphee/blit/util/ComUtil.kt renamed to src/main/kotlin/com/valaphee/blit/ComUtil.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.valaphee.blit.util
+package com.valaphee.blit
 
 import com.sun.javafx.tk.TKStage
 import javafx.stage.Stage

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

@@ -16,21 +16,18 @@
 
 package com.valaphee.blit
 
-import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.inject.AbstractModule
 import com.google.inject.Guice
 import com.google.inject.Provides
 import com.google.inject.Singleton
 import com.valaphee.blit.data.DataModule
-import com.valaphee.blit.data.config.Config
 import com.valaphee.blit.data.locale.Locale
 import de.codecentric.centerdevice.javafxsvg.SvgImageLoaderFactory
 import javafx.scene.image.Image
 import tornadofx.App
 import tornadofx.DIContainer
 import tornadofx.FX
 import tornadofx.launch
-import java.io.File
 import kotlin.reflect.KClass
 
 /**
@@ -44,12 +41,9 @@ fun main(arguments: Array<String>) {
     val injector = Guice.createInjector(DataModule(), object : AbstractModule() {
         @Singleton
         @Provides
-        fun i18n(locales: Map<String, @JvmSuppressWildcards Locale>) = locales["en_us"]
+        fun locale(locales: Map<String, @JvmSuppressWildcards Locale>) = locales["en_us"]
     })
 
-    val configFile = File(File("data").also(File::mkdir), "config.json")
-    if (!configFile.exists()) injector.getInstance(ObjectMapper::class.java).writeValue(configFile, injector.getInstance(Config::class.java)) // TODO
-
     FX.dicontainer = object : DIContainer {
         override fun <T : Any> getInstance(type: KClass<T>) = injector.getInstance(type.java)
     }

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

@@ -16,15 +16,12 @@
 
 package com.valaphee.blit
 
-import com.valaphee.blit.data.config.Config
+import com.valaphee.blit.data.config.ConfigModel
 import com.valaphee.blit.data.config.ConfigView
 import com.valaphee.blit.data.locale.Locale
 import com.valaphee.blit.data.manifest.IconManifest
 import com.valaphee.blit.source.Entry
 import com.valaphee.blit.source.Source
-import com.valaphee.blit.util.Work
-import com.valaphee.blit.util.comExecutor
-import com.valaphee.blit.util.hWnd
 import javafx.beans.property.SimpleObjectProperty
 import javafx.beans.property.SimpleStringProperty
 import javafx.collections.ObservableList
@@ -87,9 +84,9 @@ import java.util.concurrent.CompletableFuture
 class MainView : View("Blit") {
     private val locale by di<Locale>()
     private val iconManifest by di<IconManifest>()
-    private val _config by di<Config>()
+    private val _config by di<ConfigModel>()
 
-    private val work = Work().apply {
+    private val worker = Worker().apply {
         val version = System.getProperty("os.version").toFloatOrNull()
         if (System.getProperty("os.name").startsWith("Windows") && version != null && version >= 6.1f) {
             val iTaskbarList3 = CompletableFuture.supplyAsync({ COMRuntime.newInstance(ITaskbarList3::class.java) }, comExecutor).join()
@@ -125,8 +122,8 @@ class MainView : View("Blit") {
             @Suppress("UPPER_BOUND_VIOLATED_WARNING") add(Pane<Entry<*>>())
             @Suppress("UPPER_BOUND_VIOLATED_WARNING") add(Pane<Entry<*>>())
         }
-        label(work.name)
-        progressbar(work.progress)
+        label(worker.name)
+        progressbar(worker.progress)
     }
 
     inner class Pane<T : Entry<T>> : VBox() {
@@ -152,7 +149,7 @@ class MainView : View("Blit") {
                     left = BreadCrumbBar<String>().apply {
                         style(true) { paddingTop = 2.0 }
 
-                        tree.rootProperty().onChange { it?.let { selectedCrumb = BreadCrumbBar.buildTreeModel(*normalizePath(it.value.toString()).split('/').toTypedArray()) } }
+                        tree.rootProperty().onChange { it?.let { selectedCrumb = if (it.value.toString() == "/") BreadCrumbBar.buildTreeModel("/") else BreadCrumbBar.buildTreeModel(*normalizePath(it.value.toString()).split('/').toTypedArray().apply { if (this[0].isEmpty()) this[0] = "/" }) } }
                         selectedCrumbProperty().onChange {
                             val path = StringBuilder()
                             var item = it
@@ -171,14 +168,14 @@ class MainView : View("Blit") {
             add(tree)
         }
 
-        fun navigate(path: String) {
+        private fun navigate(path: String) {
             val normalizedPath = normalizePath(path)
 
             if (::_path.isInitialized && normalizedPath == _path) return
             _path = normalizedPath
 
             source.value?.let { source ->
-                work.launch(locale["main.navigator.task.navigate.name", path]) {
+                worker.launch(locale["main.navigator.task.navigate.name", normalizedPath]) {
                     if (source.isValid(normalizedPath)) {
                         val item = source.get(normalizedPath).item
                         runLater {
@@ -193,7 +190,7 @@ class MainView : View("Blit") {
 
         fun navigateRelative(path: String) = navigate(if (path.startsWith('/')) path else tree.root.value.toString() + "/$path")
 
-        inner class Tree<T : Entry<T>>() : TreeTableView<Entry<T>>() {
+        inner class Tree<T : Entry<T>> : TreeTableView<Entry<T>>() {
             init {
                 vgrow = Priority.ALWAYS
                 isShowRoot = false
@@ -213,7 +210,7 @@ class MainView : View("Blit") {
                 }
                 column(locale["main.tree.column.size.title"], Entry<T>::self) {
                     tableColumnBaseSetWidth(this, 75.0)
-                    cellFormat { text = if (it.directory) "" else _config.dataSizeUnit.format(it.size) }
+                    cellFormat { text = if (it.directory) "" else _config.dataSizeUnit.value.format(it.size) }
                     setComparator { a, b -> a.size.compareTo(b.size) }
                 }
                 column(locale["main.tree.column.modified.title"], Entry<T>::modifyTime) {
@@ -227,7 +224,7 @@ class MainView : View("Blit") {
                             setOnDragDetected {
                                 startDragAndDrop(TransferMode.MOVE).apply {
                                     setContent {
-                                        work.runBlocking(locale["main.tree.task.download.name"]) {
+                                        worker.runBlocking(locale["main.tree.task.download.name"]) {
                                             suspend fun flatten(entry: Entry<T>, path: String? = null): List<File> = if (entry.directory) {
                                                 File(tmpdir, entry.name).mkdir()
                                                 entry.list().flatMap { flatten(it, "${path?.let { "$path/" } ?: ""}${entry.name}") }
@@ -256,7 +253,7 @@ class MainView : View("Blit") {
                 setOnKeyPressed {
                     when (it.code) {
                         KeyCode.C -> if (it.isControlDown) Clipboard.getSystemClipboard().setContent {
-                            work.runBlocking(locale["main.tree.task.download.name"]) {
+                            worker.runBlocking(locale["main.tree.task.download.name"]) {
                                 suspend fun flatten(entry: Entry<T>, path: String? = null): List<File> = if (entry.directory) {
                                     File(tmpdir, entry.name).mkdir()
                                     entry.list().flatMap { flatten(it, "${path?.let { "$path/" } ?: ""}${entry.name}") }
@@ -271,12 +268,12 @@ class MainView : View("Blit") {
                             if (hasFiles()) {
                                 val entry = selectionModel.selectedItem.value
                                 if (!entry.directory) TODO()
-                                files.forEach { file -> work.launch(locale["main.tree.task.upload.name", file.name]) { FileInputStream(file).use { entry.transferFrom(file.name, it, file.length()) } } }
+                                files.forEach { file -> worker.launch(locale["main.tree.task.upload.name", file.name]) { FileInputStream(file).use { entry.transferFrom(file.name, it, file.length()) } } }
                             }
                         }
                         KeyCode.DELETE -> selectionModel.selectedItems.forEach {
                             val entry = it.value
-                            work.launch(locale["main.tree.task.delete.name", entry]) {
+                            worker.launch(locale["main.tree.task.delete.name", entry]) {
                                 entry.delete()
                                 runLater { populate(it.parent) }
                             }
@@ -291,7 +288,7 @@ class MainView : View("Blit") {
                                 it.list.firstOrNull { it.value.directory }?.value?.let { navigateRelative(it.name) } ?: if (Desktop.isDesktopSupported()) {
                                     it.list.forEach {
                                         val entry = it.value
-                                        work.launch(locale["main.tree.task.download.name", entry]) { Desktop.getDesktop().open(File(tmpdir, entry.name).apply { FileOutputStream(this).use { entry.transferTo(it) } }) } // TODO: Desktop.open throws IOException (No application is associated with the specific file for this operation.)
+                                        worker.launch(locale["main.tree.task.download.name", entry]) { Desktop.getDesktop().open(File(tmpdir, entry.name).apply { FileOutputStream(this).use { entry.transferTo(it) } }) } // TODO: Desktop.open throws IOException (No application is associated with the specific file for this operation.)
                                     }
                                 }
                             }
@@ -301,7 +298,7 @@ class MainView : View("Blit") {
                             action {
                                 it.list.forEach {
                                     val entry = it.value
-                                    work.launch(locale["main.tree.task.delete.name", entry]) {
+                                    worker.launch(locale["main.tree.task.delete.name", entry]) {
                                         entry.delete()
                                         runLater { populate(it.parent) }
                                     }
@@ -313,7 +310,7 @@ class MainView : View("Blit") {
             }
 
             fun populate(item: TreeItem<Entry<T>>) {
-                work.launch(locale["main.tree.task.populate.name", item.value]) {
+                worker.launch(locale["main.tree.task.populate.name", item.value]) {
                     val children = item.value!!.list()
                     runLater {
                         populateTree(item, { entry ->

…in/kotlin/com/valaphee/blit/util/Work.kt …/main/kotlin/com/valaphee/blit/Worker.ktsrc/main/kotlin/com/valaphee/blit/util/Work.kt renamed to src/main/kotlin/com/valaphee/blit/Worker.kt src/main/kotlin/com/valaphee/blit/util/Work.kt renamed to src/main/kotlin/com/valaphee/blit/Worker.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.valaphee.blit.util
+package com.valaphee.blit
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder
 import javafx.beans.property.DoubleProperty
@@ -37,8 +37,8 @@ import kotlin.coroutines.CoroutineContext
 /**
  * @author Kevin Ludwig
  */
-class Work {
-    private val coroutineScope = CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), ThreadFactoryBuilder().setNameFormat("blit-%d").build()).asCoroutineDispatcher() + SupervisorJob())
+class Worker {
+    private val coroutineScope = CoroutineScope(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), ThreadFactoryBuilder().setNameFormat("blit-%d").setDaemon(true).build()).asCoroutineDispatcher() + SupervisorJob())
     private val tasks = ConcurrentLinkedDeque<Task>()
 
     val name: StringProperty = SimpleStringProperty("")
@@ -71,5 +71,5 @@ class Work {
 }
 
 var CoroutineContext.progress: Double
-    get() = get(Work.Task)!!.progress.value
-    set(value) { get(Work.Task)!!.progress.value = value }
+    get() = get(Worker.Task)!!.progress.value
+    set(value) { get(Worker.Task)!!.progress.value = value }

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

@@ -50,13 +50,15 @@ class DataModule(
         ClassGraph().acceptPaths("data").scan().use {
             val (keyed, other) = (it.allResources.map { it.url } + path.walk().filter { it.isFile }.map { it.toURI().toURL() })
                 .mapNotNull {
-                    when (it.file.substring(it.file.lastIndexOf('.') + 1)) {
-                        "json" -> {
-                            @Suppress("UNCHECKED_CAST")
-                            objectMapper.readValue<Data>(it)
+                    try {
+                        when (it.file.substring(it.file.lastIndexOf('.') + 1)) {
+                            "json" -> {
+                                @Suppress("UNCHECKED_CAST")
+                                objectMapper.readValue<Data>(it)
+                            }
+                            else -> null
                         }
-                        else -> null
-                    }
+                    } catch (_: Throwable) {}
                 }
                 .partition { it is KeyedData }
             keyed.filterIsInstance<KeyedData>()

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

@@ -17,18 +17,11 @@
 package com.valaphee.blit.data.config
 
 import com.fasterxml.jackson.annotation.JsonProperty
-import com.fasterxml.jackson.core.JsonParser
-import com.fasterxml.jackson.core.type.TypeReference
-import com.fasterxml.jackson.databind.DeserializationContext
-import com.fasterxml.jackson.databind.JsonDeserializer
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.google.inject.Singleton
 import com.valaphee.blit.data.Data
 import com.valaphee.blit.data.DataType
 import com.valaphee.blit.source.Source
 import com.valaphee.blit.source.local.LocalSource
-import javafx.collections.FXCollections
-import javafx.collections.ObservableList
 import java.lang.Long.signum
 import java.text.StringCharacterIterator
 import kotlin.math.abs
@@ -39,8 +32,8 @@ import kotlin.math.abs
 @Singleton
 @DataType("config")
 class Config(
-    @get:JsonProperty("data_size_unit") var dataSizeUnit: DataSizeUnit = DataSizeUnit.IEC,
-    @get:JsonProperty("sources") @get:JsonDeserialize(using = SourceObservableListDeserializer::class) val sources: ObservableList<Source<*>> = FXCollections.observableArrayList(LocalSource("local"))
+    @get:JsonProperty("data_size_unit") val dataSizeUnit: DataSizeUnit = DataSizeUnit.IEC,
+    @get:JsonProperty("sources") val sources: List<Source<*>> = listOf(LocalSource("local"))
 ) : Data {
     enum class DataSizeUnit(
         val format: (Long) -> String
@@ -72,10 +65,4 @@ class Config(
             }
         })
     }
-
-    companion object {
-        class SourceObservableListDeserializer : JsonDeserializer<ObservableList<Source<*>>>() {
-            override fun deserialize(parser: JsonParser, context: DeserializationContext): ObservableList<Source<*>> = FXCollections.observableList(parser.readValueAs<List<Source<*>>>(object : TypeReference<List<Source<*>>>() {}))
-        }
-    }
 }