Merge pull request #51 from Paulanerus/dev

Dev

Author: Paulanerus

build.gradle.kts

@@ -42,7 +42,6 @@ compose.desktop {
         }
 
         jvmArgs += listOf(
-            "--add-modules", "java.sql",
             "--add-modules", "jdk.incubator.vector",
             "-Dapi.version=${property("api.version")}",
             "-Dcore.version=${property("core.version")}",
@@ -56,7 +55,7 @@ compose.desktop {
 
             licenseFile.set(project.file("LICENSE.md"))
 
-            modules += listOf("java.sql", "jdk.incubator.vector")
+            modules += listOf("java.sql", "jdk.incubator.vector", "java.net.http")
 
             linux {
                 iconFile.set(project.file("ui/src/main/resources/icon.png"))

core/src/main/kotlin/dev/paulee/core/data/provider/EmbeddingProvider.kt

@@ -235,7 +235,7 @@ internal object EmbeddingProvider {
                         }
                     }
                 } catch (_: CancellationException) {
-                    runCatching { modelPath.deleteIfExists() }
+                    runCatching { if (modelPath.exists()) modelPath.deleteRecursively() }
                         .onFailure { logger.error("Failed to delete model dir $modelPath", it) }
 
                     logger.info("Download cancelled.")

gradle.properties

@@ -15,6 +15,6 @@ duckdb.version=1.4.1.0
 caffeine.version=3.2.2
 
 api.version=1.14.1
-core.version=1.17.6
-ui.version=1.17.4
-app.version=1.6.1
+core.version=1.17.8
+ui.version=1.17.7
+app.version=1.6.3

ui/src/main/kotlin/dev/paulee/ui/Config.kt

@@ -22,6 +22,8 @@ object Config {
 
     var exactHighlighting by mutableStateOf(true)
 
+    var useLegacyFileDialog by mutableStateOf(false)
+
     var selectedPool by mutableStateOf("")
 
     var windowState by mutableStateOf("Floating")

ui/src/main/kotlin/dev/paulee/ui/components/Dialog.kt

@@ -2,18 +2,23 @@ package dev.paulee.ui.components
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.awt.SwingPanel
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.AwtWindow
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
+import dev.paulee.ui.Config
 import dev.paulee.ui.LocalI18n
 import dev.paulee.ui.SimpleTextField
 import java.awt.FileDialog
 import java.awt.Frame
+import java.io.File
 import java.io.FilenameFilter
 import java.nio.file.Path
+import javax.swing.JFileChooser
+import javax.swing.filechooser.FileNameExtensionFilter
 
 enum class DialogType {
     LOAD, SAVE
@@ -25,13 +30,28 @@ fun FileDialog(
     dialogType: DialogType = DialogType.LOAD,
     extension: String? = null,
     onCloseRequest: (result: List<Path>) -> Unit,
+) {
+    if (Config.useLegacyFileDialog) LegacyFileDialog(dialogType, extension, onCloseRequest)
+    else SystemFileDialog(parent, dialogType, extension, onCloseRequest)
+}
+
+@Composable
+fun SystemFileDialog(
+    parent: Frame? = null,
+    dialogType: DialogType = DialogType.LOAD,
+    extension: String? = null,
+    onCloseRequest: (result: List<Path>) -> Unit,
 ) {
     val locale = LocalI18n.current
 
     AwtWindow(
         create = {
             object :
-                FileDialog(parent, if (dialogType == DialogType.SAVE) locale["dialog.save"] else locale["dialog.open"], dialogType.ordinal) {
+                FileDialog(
+                    parent,
+                    if (dialogType == DialogType.SAVE) locale["dialog.save"] else locale["dialog.open"],
+                    dialogType.ordinal
+                ) {
 
                 init {
                     isMultipleMode = dialogType == DialogType.LOAD
@@ -69,6 +89,110 @@ fun FileDialog(
     )
 }
 
+@Composable
+fun LegacyFileDialog(
+    type: DialogType = DialogType.LOAD,
+    extension: String? = null,
+    onCloseRequest: (result: List<Path>) -> Unit,
+) {
+    val locale = LocalI18n.current
+
+    val title = if (type == DialogType.SAVE) locale["dialog.save"] else locale["dialog.open"]
+    var closeResult by remember { mutableStateOf<List<Path>?>(null) }
+
+    closeResult?.let {
+        LaunchedEffect(closeResult) { onCloseRequest(it) }
+        return
+    }
+
+    val normalizedExtension = extension?.trim()?.lowercase()?.takeIf { it.isNotBlank() }
+
+    fun JFileChooser.configure(initial: Boolean = true) {
+        dialogTitle = title
+        dialogType = if (type == DialogType.SAVE) JFileChooser.SAVE_DIALOG else JFileChooser.OPEN_DIALOG
+        isMultiSelectionEnabled = type == DialogType.LOAD
+        fileSelectionMode = JFileChooser.FILES_ONLY
+
+        normalizedExtension?.let { ext ->
+            val extensionFilter = FileNameExtensionFilter("*.$ext", ext)
+
+            if (initial) {
+                fileFilter = extensionFilter
+                isAcceptAllFileFilterUsed = true
+
+            } else {
+                val filter = fileFilter
+
+                if (filter !is FileNameExtensionFilter || filter.extensions.any { it.equals(ext, true) }) {
+                    resetChoosableFileFilters()
+
+                    fileFilter = extensionFilter
+                    isAcceptAllFileFilterUsed = true
+                }
+            }
+        }
+    }
+
+    Dialog(
+        onDismissRequest = { closeResult = emptyList() },
+        properties = DialogProperties(
+            usePlatformDefaultWidth = false,
+            dismissOnBackPress = true,
+            dismissOnClickOutside = true
+        )
+    ) {
+        Surface(
+            modifier = Modifier.padding(16.dp),
+            shape = MaterialTheme.shapes.medium,
+            elevation = 8.dp
+        ) {
+            SwingPanel(
+                modifier = Modifier.sizeIn(minWidth = 520.dp, minHeight = 420.dp),
+                factory = {
+                    JFileChooser().apply {
+                        configure()
+
+                        if (type == DialogType.SAVE && selectedFile == null) {
+                            val baseName = buildString {
+                                append("untitled")
+                                normalizedExtension?.let { append('.').append(it) }
+                            }
+
+                            selectedFile = File(currentDirectory, baseName)
+                        }
+
+                        addActionListener { event ->
+                            val approved = event.actionCommand == JFileChooser.APPROVE_SELECTION
+
+                            if (!approved) {
+                                closeResult = emptyList()
+                                return@addActionListener
+                            }
+
+                            val files =
+                                if (isMultiSelectionEnabled) selectedFiles
+                                else selectedFile?.let { arrayOf(it) }.orEmpty()
+
+                            closeResult = files.mapNotNull { file ->
+                                if (file == null) return@mapNotNull null
+
+                                if (type == DialogType.SAVE && normalizedExtension != null) {
+
+                                    val withExt = if (file.extension == normalizedExtension) file
+                                    else File(file.parentFile ?: currentDirectory, "${file.name}.$normalizedExtension")
+
+                                    withExt.toPath()
+                                } else file.toPath()
+                            }
+                        }
+                    }
+                },
+                update = { it.configure(false) }
+            )
+        }
+    }
+}
+
 @Composable
 fun CustomInputDialog(
     title: String,