Skip to content

Fix iOS PHPicker multi-select copy collisions #646

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

Open
cgpllx wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix iOS PHPicker multi-select copy collisions #646

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
33 changes: 27 additions & 6 deletions filekit-dialogs/src/iosMain/kotlin/io/github/vinceglb/filekit/dialogs/FileKit.ios.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,12 @@ private fun callPhPicker(
else -> {
// Must copy the URL here because it becomes invalid outside the loadFileRepresentationForTypeIdentifier callback scope
runCatching {
copyToTempFile(fileManager, url, tempRoot.lastPathComponent!!)
copyToTempFile(
fileManager = fileManager,
url = url,
id = tempRoot.lastPathComponent!!,
index = index,
)
}.onSuccess(cont::resume)
.onFailure { cont.resumeWithException(it) }
}
Expand Down Expand Up @@ -786,18 +791,34 @@ private fun copyToTempFile(
fileManager: NSFileManager,
url: NSURL,
id: String,
index: Int,
): NSURL {
// Get the temporary directory
val fileComponents = fileManager.temporaryDirectory.pathComponents
val fileName = url.lastPathComponent ?: "file"

// Use a per-asset subdirectory so lastPathComponent stays unchanged.
val directoryComponents = fileManager.temporaryDirectory.pathComponents
?.plus(id)
?.plus(url.lastPathComponent)
?.plus(index.toString())
?: throw FileKitPickerException("Failed to resolve the temporary directory for the selected file.")

// Create a file URL
val directoryUrl = NSURL.fileURLWithPathComponents(directoryComponents)
?: throw FileKitPickerException("Failed to create a temporary directory for the selected file.")

requireApplePickerOperation(
message = "Failed to create a temporary directory for the selected file.",
) { error ->
fileManager.createDirectoryAtURL(
url = directoryUrl,
withIntermediateDirectories = true,
attributes = null,
error = error,
)
}

val fileComponents = directoryComponents.plus(fileName)
val fileUrl = NSURL.fileURLWithPathComponents(fileComponents)
?: throw FileKitPickerException("Failed to create a temporary URL for the selected file.")

// Write the data to the file URL
requireApplePickerOperation(
message = "Failed to copy the selected file to a temporary location.",
) { error ->
Expand Down