Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue in windows picker when selecting FilePickerFileType.All #106

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Fix issue in windows picker when selecting FilePickerFileType.All #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions ...src/desktopMain/kotlin/com/mohamedrejeb/calf/picker/platform/windows/WindowsFilePicker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import kotlinx.coroutines.withContext
import java.awt.Window
import java.io.File

internal class WindowsFilePicker: PlatformFilePicker {
internal class WindowsFilePicker : PlatformFilePicker {
override suspend fun launchFilePicker(
initialDirectory: String?,
type: FilePickerFileType,
Expand All @@ -35,27 +35,33 @@ internal class WindowsFilePicker: PlatformFilePicker {

// Set initial directory, title and file extensions
val fileExtensions =
if (type is FilePickerFileType.Extension)
type.extensions
else
type.value
.map {
MimeTypes.findExtensionsByMimeTypes(it, it.contains('*'))
}
.flatten()
.distinct()
when (type) {
is FilePickerFileType.All ->
emptyList()

is FilePickerFileType.Extension ->
type.extensions

else ->
type.value
.map {
MimeTypes.findExtensionsByMimeTypes(it, it.contains('*'))
}
.flatten()
.distinct()
}
setup(initialDirectory, fileExtensions, title)
}

// Show file chooser
fileChooser.showOpenDialog(parentWindow)

// Return selected files
val result =
if (selectionMode == FilePickerSelectionMode.Single)
listOfNotNull(fileChooser.selectedFile)
else
fileChooser.selectedFiles.mapNotNull { it }
val result =
if (selectionMode == FilePickerSelectionMode.Single)
listOfNotNull(fileChooser.selectedFile)
else
fileChooser.selectedFiles.mapNotNull { it }
onResult(result)
}

Expand Down