fix #17

Deficuet · Jun 2, 2024 · e3bb601 · e3bb601
1 parent 25650e6
commit e3bb601
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
-def progVersion = "1.0.1"
+def progVersion = "1.0.2"
 group 'io.github.deficuet'
 version progVersion
 mainClassName = "io.github.deficuet.alpa.MainApp"

diff --git a/src/main/kotlin/io/github/deficuet/alpa/Functions.kt b/src/main/kotlin/io/github/deficuet/alpa/Functions.kt
@@ -316,9 +316,9 @@ class Functions(private val gui: MainView): Closeable {
                 FileChooser.ExtensionFilter("Required Files ($wct)", wct),
                 FileChooser.ExtensionFilter("All Files (*.*)", "*.*")
             ),
-            File(configurations.face.importBundlePath).withDefaultPath(
-                Path(configurations.assetSystemRoot).resolve("paintingface").pathString
-            )
+            File(configurations.face.importBundlePath)
+                .withDefaultPath(Path(configurations.assetSystemRoot).resolve("paintingface").pathString)
+                .withDefaultPath()
         )
         if (files.isEmpty()) return null
         gui.errorString.value = ""
@@ -799,9 +799,7 @@ class Functions(private val gui: MainView): Closeable {
         fun importAssetSystemRoot(): File? {
             val folder = chooseDirectory(
                 "选择文件夹",
-                configurations.assetSystemRoot.let {
-                    File(it).withDefaultPath()
-                }
+                File(configurations.assetSystemRoot).withDefaultPath()
             ) ?: return null
             configurations.assetSystemRoot = folder.absolutePath
             return folder
@@ -810,9 +808,9 @@ class Functions(private val gui: MainView): Closeable {
         fun importMainFile(): File? {
             val files = chooseFile(
                 "选择文件", allTypeFilter,
-                File(configurations.importMainBundlePath).withDefaultPath(
-                    Path(configurations.assetSystemRoot).resolve("painting").pathString
-                )
+                File(configurations.importMainBundlePath)
+                    .withDefaultPath(Path(configurations.assetSystemRoot).resolve("painting").pathString)
+                    .withDefaultPath()
             )
             if (files.isEmpty()) return null
             val file = files[0]

diff --git a/src/main/kotlin/io/github/deficuet/alpa/utils.kt b/src/main/kotlin/io/github/deficuet/alpa/utils.kt
@@ -23,7 +23,7 @@ import kotlin.io.path.Path
 import javafx.scene.paint.Color as ColorFX
 
 fun File.withDefaultPath(defaultPath: String = "C:/Users"): File {
-    return if (exists()) this else File(defaultPath)
+    return if (exists() && isDirectory) this else File(defaultPath)
 }
 
 fun generateFileName(raw: String): String {