From 9acc6cfd4b4789e76e1138820697161327e7c5b5 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Fri, 31 Aug 2018 20:23:09 +0300
Subject: [PATCH 1/7] Issue #26

---
 .../vkmusic/controller/MainController.kt      | 46 +++++++++++++++----
 src/main/resources/views/main.fxml            | 37 +++++++++------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
index eee35ed..6b83c08 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
@@ -1,17 +1,15 @@
 package me.ruslanys.vkmusic.controller
 
+import javafx.animation.PauseTransition
 import javafx.collections.FXCollections
-import javafx.collections.ObservableList
 import javafx.fxml.FXML
-import javafx.scene.control.MenuItem
-import javafx.scene.control.SelectionMode
-import javafx.scene.control.TableColumn
-import javafx.scene.control.TableView
+import javafx.scene.control.*
 import javafx.scene.control.cell.PropertyValueFactory
 import javafx.scene.image.Image
 import javafx.scene.image.ImageView
 import javafx.scene.layout.Pane
 import javafx.stage.DirectoryChooser
+import javafx.util.Duration
 import me.ruslanys.vkmusic.annotation.FxmlController
 import me.ruslanys.vkmusic.component.VkClient
 import me.ruslanys.vkmusic.domain.Audio
@@ -33,16 +31,21 @@ class MainController(
         private val downloadService: DownloadService) : ApplicationListener<DownloadEvent>, BaseController() {
 
     @FXML private lateinit var loadingView: Pane
+    @FXML private lateinit var mainView: Pane
+
     @FXML private lateinit var loadingImageView: ImageView
     @FXML private lateinit var tableView: TableView<Audio>
     @FXML private lateinit var openFolderMenuItem: MenuItem
+    @FXML private lateinit var searchField: TextField
 
-    private val data: ObservableList<Audio> = FXCollections.observableArrayList(arrayListOf())
+//    private val data: ObservableList<Audio> = FXCollections.observableArrayList(arrayListOf())
+    private val data = mutableListOf<Audio>()
 
     @FXML
     fun initialize() {
         initLoading()
         initTable()
+        initSearch()
     }
 
     private fun initLoading() {
@@ -88,7 +91,29 @@ class MainController(
         tableView.selectionModel.selectedItemProperty().addListener { _, _, _ -> adjustMenuAvailability() }
 
         // Data
-        tableView.items = data
+        tableView.items = FXCollections.observableArrayList(data)
+    }
+
+    private fun initSearch() {
+        val pauseTransition = PauseTransition(Duration.millis(300.0)) // debounce mechanism
+        searchField.textProperty().addListener { _, _, _ ->
+            println("CHANGE")
+            pauseTransition.playFromStart()
+        }
+        pauseTransition.setOnFinished { _ ->
+            println("DEBOUNCE")
+            val argument = searchField.text.toUpperCase()
+
+            tableView.items.clear()
+
+            data.forEach {
+                if (it.artist.toUpperCase().contains(argument) || it.title.toUpperCase().contains(argument)) {
+                    tableView.items.add(it)
+                }
+            }
+
+            tableView.refresh()
+        }
     }
 
     @FXML
@@ -98,14 +123,17 @@ class MainController(
 
     @FXML
     fun refreshTable() {
-        tableView.isVisible = false
+        mainView.isVisible = false
 
         CompletableFuture.supplyAsync {
             vkClient.getAudio()
         }.thenAccept {
             data.clear()
             data.addAll(it)
-            tableView.isVisible = true
+
+            tableView.items.clear()
+            tableView.items.addAll(data)
+            mainView.isVisible = true
         }
     }
 
diff --git a/src/main/resources/views/main.fxml b/src/main/resources/views/main.fxml
index 6bfa2de..f779393 100644
--- a/src/main/resources/views/main.fxml
+++ b/src/main/resources/views/main.fxml
@@ -11,21 +11,28 @@
                     <ImageView fx:id="loadingImageView" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" BorderPane.alignment="CENTER" />
                 </center>
             </BorderPane>
-            <TableView fx:id="tableView" style="-fx-focus-color: -fx-control-inner-background; -fx-faint-focus-color: -fx-control-inner-background;" tableMenuButtonVisible="true">
-                <contextMenu>
-                    <ContextMenu>
-                        <items>
-                            <MenuItem mnemonicParsing="false" onAction="#selectAll" text="Выделить все" />
-                            <MenuItem mnemonicParsing="false" onAction="#downloadSelected" text="Скачать выделенные" />
-                            <MenuItem mnemonicParsing="false" onAction="#refreshTable" text="Обновить" />
-                            <MenuItem fx:id="openFolderMenuItem" mnemonicParsing="false" onAction="#openFolder" text="Показать в папке" disable="true" />
-                        </items>
-                    </ContextMenu>
-                </contextMenu>
-                <columnResizePolicy>
-                    <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                </columnResizePolicy>
-            </TableView>
+            <BorderPane fx:id="mainView">
+            <center>
+                  <TableView fx:id="tableView" style="-fx-focus-color: -fx-control-inner-background; -fx-faint-focus-color: -fx-control-inner-background;" tableMenuButtonVisible="true" BorderPane.alignment="CENTER">
+                      <contextMenu>
+                          <ContextMenu>
+                              <items>
+                                  <MenuItem mnemonicParsing="false" onAction="#selectAll" text="Выделить все" />
+                                  <MenuItem mnemonicParsing="false" onAction="#downloadSelected" text="Скачать выделенные" />
+                                  <MenuItem mnemonicParsing="false" onAction="#refreshTable" text="Обновить" />
+                                  <MenuItem fx:id="openFolderMenuItem" disable="true" mnemonicParsing="false" onAction="#openFolder" text="Показать в папке" />
+                              </items>
+                          </ContextMenu>
+                      </contextMenu>
+                      <columnResizePolicy>
+                          <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                      </columnResizePolicy>
+                  </TableView>
+            </center>
+            <top>
+                 <TextField fx:id="searchField" promptText="Поиск" BorderPane.alignment="CENTER" />
+            </top>
+            </BorderPane>
         </StackPane>
     </center>
 

From 85e145ca9788c7bf23511d0e8354509f1922c0f0 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Fri, 31 Aug 2018 22:11:24 +0300
Subject: [PATCH 2/7] Refactoring

---
 .../vkmusic/controller/MainController.kt      | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
index 6b83c08..3a583fe 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
@@ -96,24 +96,21 @@ class MainController(
 
     private fun initSearch() {
         val pauseTransition = PauseTransition(Duration.millis(300.0)) // debounce mechanism
-        searchField.textProperty().addListener { _, _, _ ->
-            println("CHANGE")
-            pauseTransition.playFromStart()
-        }
         pauseTransition.setOnFinished { _ ->
-            println("DEBOUNCE")
             val argument = searchField.text.toUpperCase()
 
-            tableView.items.clear()
-
+            val found = mutableListOf<Audio>()
             data.forEach {
                 if (it.artist.toUpperCase().contains(argument) || it.title.toUpperCase().contains(argument)) {
-                    tableView.items.add(it)
+                    found.add(it)
                 }
             }
 
+            setItems(found)
             tableView.refresh()
         }
+
+        searchField.textProperty().addListener { _, _, _ -> pauseTransition.playFromStart() }
     }
 
     @FXML
@@ -131,8 +128,7 @@ class MainController(
             data.clear()
             data.addAll(it)
 
-            tableView.items.clear()
-            tableView.items.addAll(data)
+            setItems(data)
             mainView.isVisible = true
         }
     }
@@ -163,6 +159,11 @@ class MainController(
         openFolderMenuItem.isDisable = !(selectedItems.size == 1 && selectedItems[0].file != null)
     }
 
+    private fun setItems(list: List<Audio>) {
+        tableView.items.clear()
+        tableView.items.addAll(list)
+    }
+
     override fun onApplicationEvent(event: DownloadEvent) {
         log.info("Event $event")
 

From 76e59432228cd318296fa381080e9ea64cb00010 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Fri, 31 Aug 2018 23:05:45 +0300
Subject: [PATCH 3/7] Refactoring

---
 .../me/ruslanys/vkmusic/controller/MainController.kt       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
index 3a583fe..e45931d 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
@@ -97,11 +97,14 @@ class MainController(
     private fun initSearch() {
         val pauseTransition = PauseTransition(Duration.millis(300.0)) // debounce mechanism
         pauseTransition.setOnFinished { _ ->
-            val argument = searchField.text.toUpperCase()
+            val argument = searchField.text.toLowerCase()
 
             val found = mutableListOf<Audio>()
             data.forEach {
-                if (it.artist.toUpperCase().contains(argument) || it.title.toUpperCase().contains(argument)) {
+                val artist = it.artist.toLowerCase()
+                val title = it.title.toLowerCase()
+
+                if (artist.contains(argument) || title.contains(argument)) {
                     found.add(it)
                 }
             }

From 9b04b7690af218cac4902b56765e2f0b990ee9c0 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Sun, 2 Sep 2018 01:00:26 +0300
Subject: [PATCH 4/7] Code clean up

---
 .../kotlin/me/ruslanys/vkmusic/controller/MainController.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
index e45931d..7e22593 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
@@ -30,6 +30,7 @@ class MainController(
         private val vkClient: VkClient,
         private val downloadService: DownloadService) : ApplicationListener<DownloadEvent>, BaseController() {
 
+    // @formatter:off
     @FXML private lateinit var loadingView: Pane
     @FXML private lateinit var mainView: Pane
 
@@ -37,8 +38,8 @@ class MainController(
     @FXML private lateinit var tableView: TableView<Audio>
     @FXML private lateinit var openFolderMenuItem: MenuItem
     @FXML private lateinit var searchField: TextField
+    // @formatter:on
 
-//    private val data: ObservableList<Audio> = FXCollections.observableArrayList(arrayListOf())
     private val data = mutableListOf<Audio>()
 
     @FXML

From b337f18373ad78b3e9b0bd5d5da266faaac3c7a7 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Sun, 2 Sep 2018 01:08:48 +0300
Subject: [PATCH 5/7] Synchronization

---
 .../kotlin/me/ruslanys/vkmusic/controller/MainController.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
index 7e22593..9862994 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
@@ -164,8 +164,10 @@ class MainController(
     }
 
     private fun setItems(list: List<Audio>) {
-        tableView.items.clear()
-        tableView.items.addAll(list)
+        synchronized(tableView) {
+            tableView.items.clear()
+            tableView.items.addAll(list)
+        }
     }
 
     override fun onApplicationEvent(event: DownloadEvent) {

From e5af4f03759a9b98015440bb72e9b5634dd9eaf7 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Sun, 2 Sep 2018 01:26:58 +0300
Subject: [PATCH 6/7] Async

---
 .../vkmusic/controller/MainController.kt      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
index 9862994..c95c212 100644
--- a/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
+++ b/src/main/kotlin/me/ruslanys/vkmusic/controller/MainController.kt
@@ -97,11 +97,18 @@ class MainController(
 
     private fun initSearch() {
         val pauseTransition = PauseTransition(Duration.millis(300.0)) // debounce mechanism
-        pauseTransition.setOnFinished { _ ->
-            val argument = searchField.text.toLowerCase()
+        pauseTransition.setOnFinished { _ -> search(searchField.text) }
 
+        searchField.textProperty().addListener { _, _, _ -> pauseTransition.playFromStart() }
+    }
+
+    private fun search(input: String) {
+        val argument = input.toLowerCase()
+        val list = ArrayList<Audio>(data)
+
+        CompletableFuture.supplyAsync {
             val found = mutableListOf<Audio>()
-            data.forEach {
+            list.forEach {
                 val artist = it.artist.toLowerCase()
                 val title = it.title.toLowerCase()
 
@@ -109,12 +116,10 @@ class MainController(
                     found.add(it)
                 }
             }
-
-            setItems(found)
-            tableView.refresh()
+            found
+        }.thenAccept {
+            setItems(it)
         }
-
-        searchField.textProperty().addListener { _, _, _ -> pauseTransition.playFromStart() }
     }
 
     @FXML
@@ -148,7 +153,7 @@ class MainController(
             forEach { it.status = DownloadStatus.QUEUED }
             tableView.refresh()
 
-            downloadService.download(selectedDirectory, this.toList())
+            downloadService.download(selectedDirectory, ArrayList<Audio>(this))
         }
     }
 

From 230e40a766737f5c20c724fb43235eacb5564d59 Mon Sep 17 00:00:00 2001
From: Ruslan Molchanov <ruslanys@gmail.com>
Date: Sun, 2 Sep 2018 01:30:28 +0300
Subject: [PATCH 7/7] Code clean up

---
 src/main/resources/views/main.fxml | 42 +++++++++++++++---------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/resources/views/main.fxml b/src/main/resources/views/main.fxml
index f779393..d6be7c0 100644
--- a/src/main/resources/views/main.fxml
+++ b/src/main/resources/views/main.fxml
@@ -8,30 +8,30 @@
         <StackPane BorderPane.alignment="CENTER">
             <BorderPane fx:id="loadingView" style="-fx-background-color: rgb(80, 114, 153);">
                 <center>
-                    <ImageView fx:id="loadingImageView" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" BorderPane.alignment="CENTER" />
+                    <ImageView fx:id="loadingImageView" fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" BorderPane.alignment="CENTER"/>
                 </center>
             </BorderPane>
             <BorderPane fx:id="mainView">
-            <center>
-                  <TableView fx:id="tableView" style="-fx-focus-color: -fx-control-inner-background; -fx-faint-focus-color: -fx-control-inner-background;" tableMenuButtonVisible="true" BorderPane.alignment="CENTER">
-                      <contextMenu>
-                          <ContextMenu>
-                              <items>
-                                  <MenuItem mnemonicParsing="false" onAction="#selectAll" text="Выделить все" />
-                                  <MenuItem mnemonicParsing="false" onAction="#downloadSelected" text="Скачать выделенные" />
-                                  <MenuItem mnemonicParsing="false" onAction="#refreshTable" text="Обновить" />
-                                  <MenuItem fx:id="openFolderMenuItem" disable="true" mnemonicParsing="false" onAction="#openFolder" text="Показать в папке" />
-                              </items>
-                          </ContextMenu>
-                      </contextMenu>
-                      <columnResizePolicy>
-                          <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
-                      </columnResizePolicy>
-                  </TableView>
-            </center>
-            <top>
-                 <TextField fx:id="searchField" promptText="Поиск" BorderPane.alignment="CENTER" />
-            </top>
+                <top>
+                    <TextField fx:id="searchField" promptText="Поиск" BorderPane.alignment="CENTER"/>
+                </top>
+                <center>
+                    <TableView fx:id="tableView" style="-fx-focus-color: -fx-control-inner-background; -fx-faint-focus-color: -fx-control-inner-background;" tableMenuButtonVisible="true" BorderPane.alignment="CENTER">
+                        <contextMenu>
+                            <ContextMenu>
+                                <items>
+                                    <MenuItem mnemonicParsing="false" onAction="#selectAll" text="Выделить все"/>
+                                    <MenuItem mnemonicParsing="false" onAction="#downloadSelected" text="Скачать выделенные"/>
+                                    <MenuItem mnemonicParsing="false" onAction="#refreshTable" text="Обновить"/>
+                                    <MenuItem fx:id="openFolderMenuItem" disable="true" mnemonicParsing="false" onAction="#openFolder" text="Показать в папке"/>
+                                </items>
+                            </ContextMenu>
+                        </contextMenu>
+                        <columnResizePolicy>
+                            <TableView fx:constant="CONSTRAINED_RESIZE_POLICY"/>
+                        </columnResizePolicy>
+                    </TableView>
+                </center>
             </BorderPane>
         </StackPane>
     </center>