Skip to content

fix(filesystem): make readdir ordering deterministic across iOS and Android #73

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
antonymarion wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(filesystem): make readdir ordering deterministic across iOS and Android #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b07e244
fix(filesystem): sort readdir results chronologically
antonymarion Apr 15, 2026
b669dc3
fix(filesystem): align iOS readdir order with Android
antonymarion Apr 15, 2026
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
11 changes: 9 additions & 2 deletions android/src/main/kotlin/com/capacitorjs/plugins/filesystem/FilesystemMethodResults.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@ fun createWriteResultObject(uri: Uri, mode: IONFILESaveMode): JSObject? =
* @return a result [JSObject] for the list of a directories contents
*/
fun createReadDirResultObject(list: List<IONFILEMetadataResult>): JSObject = JSObject().also {
it.put(OUTPUT_FILES, JSArray(list.map { child -> child.toResultObject() }))
val sorted = list.sortedWith(
compareBy<IONFILEMetadataResult>(
{ it.lastModifiedTimestamp },
{ it.createdTimestamp },
{ it.name.lowercase() },
),
)
it.put(OUTPUT_FILES, JSArray(sorted.map { child -> child.toResultObject() }))
}

/**
Expand All @@ -62,4 +69,4 @@ fun IONFILEUri.Resolved.toResultObject(): JSObject = createUriResultObject(this.
* @return a result [JSObject] for an Android [Uri]
*/
fun createUriResultObject(uri: Uri): JSObject =
JSObject().also { it.put(OUTPUT_URI, uri.toString()) }
JSObject().also { it.put(OUTPUT_URI, uri.toString()) }
14 changes: 13 additions & 1 deletion ios/Sources/FilesystemPlugin/FilesystemOperationExecutor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,19 @@ class FilesystemOperationExecutor {
try service.removeDirectory(atURL: url, includeIntermediateDirectories: recursive)
case .readdir(let url):
let directoryAttributes = try service.listDirectory(atURL: url)
.map { try fetchItemAttributesJSObject(using: service, atURL: $0) }
.map { childUrl in
(url: childUrl, attributes: try service.getItemAttributes(atURL: childUrl))
}
.sorted { lhs, rhs in
if lhs.attributes.modificationDateTimestamp != rhs.attributes.modificationDateTimestamp {
return lhs.attributes.modificationDateTimestamp < rhs.attributes.modificationDateTimestamp
}
if lhs.attributes.creationDateTimestamp != rhs.attributes.creationDateTimestamp {
return lhs.attributes.creationDateTimestamp < rhs.attributes.creationDateTimestamp
}
return lhs.url.lastPathComponent.localizedCaseInsensitiveCompare(rhs.url.lastPathComponent) == .orderedAscending
}
.map { $0.attributes.toJSResult(with: $0.url) }
resultData = [Constants.ResultDataKey.files: directoryAttributes]
case .stat(let url):
resultData = try fetchItemAttributesJSObject(using: service, atURL: url)
Expand Down