From 51dcaa1946f66371bf4cdde01fe65ff10e1cd6d9 Mon Sep 17 00:00:00 2001 From: death-claw <53543762+death-claw@users.noreply.github.com> Date: Sun, 14 May 2023 21:44:44 +0100 Subject: [PATCH] fixes #88 (#93) --- .../me/mnlr/vripper/controller/PostController.kt | 5 +++-- .../src/main/kotlin/me/mnlr/vripper/model/PostModel.kt | 6 +++++- .../me/mnlr/vripper/view/tables/PostsTableView.kt | 10 +++++++++- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/vripper-gui/src/main/kotlin/me/mnlr/vripper/controller/PostController.kt b/vripper-gui/src/main/kotlin/me/mnlr/vripper/controller/PostController.kt index 44d749f..039dfb9 100644 --- a/vripper-gui/src/main/kotlin/me/mnlr/vripper/controller/PostController.kt +++ b/vripper-gui/src/main/kotlin/me/mnlr/vripper/controller/PostController.kt @@ -60,10 +60,11 @@ class PostController : Controller() { it.url, it.done, it.total, - it.hosts.joinToString(separator = "||"), + it.hosts.joinToString(separator = ", "), it.addedOn.format(dateTimeFormatter), it.rank + 1, - it.downloadDirectory + it.downloadDirectory, + "${it.done}/${it.total}" ) } } \ No newline at end of file diff --git a/vripper-gui/src/main/kotlin/me/mnlr/vripper/model/PostModel.kt b/vripper-gui/src/main/kotlin/me/mnlr/vripper/model/PostModel.kt index feff8b0..309ef40 100644 --- a/vripper-gui/src/main/kotlin/me/mnlr/vripper/model/PostModel.kt +++ b/vripper-gui/src/main/kotlin/me/mnlr/vripper/model/PostModel.kt @@ -16,7 +16,8 @@ class PostModel( hosts: String, addedOn: String, order: Int, - path: String + path: String, + progressCount: String ) { val postIdProperty = SimpleStringProperty(postId) var postId: String by postIdProperty @@ -50,4 +51,7 @@ class PostModel( val pathProperty = SimpleStringProperty(path) var path: String by pathProperty + + val progressCountProperty = SimpleStringProperty(progressCount) + var progressCount: String by progressCountProperty } diff --git a/vripper-gui/src/main/kotlin/me/mnlr/vripper/view/tables/PostsTableView.kt b/vripper-gui/src/main/kotlin/me/mnlr/vripper/view/tables/PostsTableView.kt index d95d1a1..f7e096d 100644 --- a/vripper-gui/src/main/kotlin/me/mnlr/vripper/view/tables/PostsTableView.kt +++ b/vripper-gui/src/main/kotlin/me/mnlr/vripper/view/tables/PostsTableView.kt @@ -36,6 +36,7 @@ class PostsTableView : View("Download") { done = it.done total = it.total order = it.order + progressCount = it.progressCount } } else { items.add(it) @@ -46,6 +47,12 @@ class PostsTableView : View("Download") { } } + + eventBus.flux().filter { + it!!.kind == Event.Kind.POST_REMOVE + }.subscribe { event -> + items.removeIf { p -> p.postId == event.data as String } + } } override fun onDock() { @@ -141,7 +148,8 @@ class PostsTableView : View("Download") { } column("Status", PostModel::statusProperty) column("Path", PostModel::pathProperty) - column("Images", PostModel::totalProperty) + column("Total", PostModel::progressCountProperty) + column("Hosts", PostModel::hostsProperty) column("Added On", PostModel::addedOnProperty) column("Order", PostModel::orderProperty) { sortOrder.add(this)