added ST#24

Use 'invisible' ViewTransition (0.01 seconds)
Fixes #43
Fixes #44

client/build.gradle

@@ -27,7 +27,7 @@ compileTestKotlin {
 }
 
 group 'org.hso'
-version '1.0'
+version '1.0.1'
 archivesBaseName = 'TextureSync'
 mainClassName = 'org.hso.texturesyncclient.app.Main'
 

client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt

@@ -18,9 +18,7 @@ import org.hso.texturesyncclient.view.mainView.MainView
 import org.hso.texturesyncclient.view.mainView.MainViewController
 import org.hso.texturesyncclient.view.startupView.StartupView
 import org.hso.texturesyncclient.view.startupView.StartupViewController
-import tornadofx.Controller
-import tornadofx.find
-import tornadofx.observable
+import tornadofx.*
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -51,7 +49,7 @@ class RootController : Controller() {
         val uuid = UUID.randomUUID()
         val format = if (File(path).extension.toLowerCase() == "png") TextureFormat.PNG else TextureFormat.JPEG
         val bimg = ImageIO.read(File(path)) //image for obtaining resolution
-        val resolution = Pair(bimg.height, bimg.width)
+        val resolution = Pair(bimg.width, bimg.height)
         val cal = Calendar.getInstance() //calendar obj with current time
         val hash = Sha256(data)
 
@@ -103,6 +101,8 @@ class RootController : Controller() {
                     println("[auto] Connection to Server successful")
                     switchStartupToMain()
                     showAll()
+
+                    return // abort
                 } else {
                     println("[auto] no server found")
                 }
@@ -119,6 +119,8 @@ class RootController : Controller() {
                     println("[file] Connection to Server successful")
                     switchStartupToMain()
                     showAll()
+
+                    return // abort
                 } catch (e: Exception) {
                     println(e)
                     println("[file] Connection to Server NOT successful")
@@ -137,6 +139,8 @@ class RootController : Controller() {
                 switchStartupToMain()
                 showAll()
                 println("swithing to MainView @ initCon")
+
+                return // abort
             } catch (e: Exception) {
                 println(e)
                 println("Connection to Server NOT successful")
@@ -183,7 +187,7 @@ class RootController : Controller() {
     fun exportTexture(data: Texture) {
         val directoryChooser = DirectoryChooser()
         directoryChooser.title = "Export Verzeichnis wählen"
-        directoryChooser.initialDirectory = File(lastExportDir)
+        directoryChooser.initialDirectory = if(File(lastExportDir).exists()) File(lastExportDir) else File(System.getProperty("user.home"))
 
 
         val alertExport = JFXInfoAlert(
@@ -295,20 +299,20 @@ class RootController : Controller() {
 
         fun switchStartupToMain() {
             Platform.runLater {
-                find(StartupView::class).replaceWith(MainView::class, sizeToScene = true, centerOnScreen = true)
+                find(StartupView::class).replaceWith(MainView::class,  ViewTransition.FadeThrough(0.01.seconds))
             }
         }
 
         // These runLater calls should be unnecessary
         fun switchMainToImport() {
             Platform.runLater {
-                find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true)
+                find(MainView::class).replaceWith(ImportView::class,  ViewTransition.FadeThrough(0.01.seconds))
             }
         }
 
         fun switchImportToMain() {
             Platform.runLater {
-                find(ImportView::class).replaceWith(MainView::class, sizeToScene = true, centerOnScreen = true)
+                find(ImportView::class).replaceWith(MainView::class,  ViewTransition.FadeThrough(0.01.seconds))
             }
         }
     }

client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportViewController.kt

@@ -49,9 +49,7 @@ class ImportViewController : Controller() {
     fun btnImportAction() {
         rootc.importTexture(iv.tfFilePath.text, iv.tfName.text, iv.cvTags.chips)
         RootController.switchImportToMain()
-        iv.tfFilePath.clear()
-        iv.tfName.clear()
-        iv.cvTags.chips.clear()
+        reset()
     }
 
     fun validateImport() {
@@ -61,8 +59,13 @@ class ImportViewController : Controller() {
 
     fun btnBackAction() {
         RootController.switchImportToMain()
+        reset()
+    }
+
+    fun reset() {
         iv.tfFilePath.clear()
         iv.tfName.clear()
         iv.cvTags.chips.clear()
+        iv.preview.root.isVisible = false
     }
 }

client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt

@@ -60,7 +60,7 @@ class MainViewController : Controller() {
         }
     }
 
-    // DetailView actions
+    // MainView actions
 
     fun cvSearchAction(tags: ObservableList<String>) {
         // show spinner, block ui

server/texture-sync-server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "texture-sync-server"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["CodeSteak <codesteak@shellf.art>"]
 edition = "2018"
 
@@ -10,4 +10,4 @@ serde = { version = "1.0.90", features = ["derive"] }
 serde_json = "1.0.39"
 sha2 = "0.8.0"
 lovecraft = "0.2.0"
-num_cpus = "1.0"
+num_cpus = "1.0"

server/texture-sync-server/src/search/query_filter.rs

@@ -66,7 +66,7 @@ impl QueryFilter {
 
             SpecialInName(name) => Score::RequiredMatch(
                 //
-                texture.name.contains(name),
+                texture.name.to_lowercase().contains(&name.to_lowercase()),
             ),
 
             SpecialBeforeDate(date) => Score::RequiredMatch(texture.added_on <= *date),