Open
Description
Before creating
- This is NOT a gameplay feature from Civ VI, BNW, or outside - see Roadmap
- This is NOT a gameplay feature from Vanilla Civ V or from G&K - If so, it should be a comment in Missing features from Civ V - G&K #4697
Problem Description
Sniffing around in relation to my last PR, looking at UncivFiles.getSaves, made me pause:
It constructs a Sequence around an Array of FileHandles that list() returns. The list() and so the filesystem access runs at the time the getSaves() is called and must finish before the Sequence is returned. The concurrency in the Load screen does a toList() and comments this is what takes time and needs decoupling. Huh?
Related Issue Links
No response
Desired Solution
So, wouldn't this:
Index: core/src/com/unciv/logic/files/UncivFiles.kt
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/core/src/com/unciv/logic/files/UncivFiles.kt b/core/src/com/unciv/logic/files/UncivFiles.kt
--- a/core/src/com/unciv/logic/files/UncivFiles.kt (revision 816e14aab11b960a4c1ade104b69efd5c90be2aa)
+++ b/core/src/com/unciv/logic/files/UncivFiles.kt (date 1743516622273)
@@ -112,20 +112,20 @@
fun getSaves(autoSaves: Boolean = true): Sequence<FileHandle> {
val saves = getSaves(SAVE_FILES_FOLDER)
- val filteredSaves = if (autoSaves) { saves } else { saves.filter { !it.name().startsWith(
- AUTOSAVE_FILE_NAME
- ) }}
- return filteredSaves
+ if (autoSaves) return saves
+ return saves.filter { !it.name().startsWith(AUTOSAVE_FILE_NAME) }
}
private fun getSaves(saveFolder: String): Sequence<FileHandle> {
debug("Getting saves from folder %s, externalStoragePath: %s", saveFolder, files.externalStoragePath)
- val localFiles = getLocalFile(saveFolder).list().asSequence()
+ // This construct instead of asSequence causes the actual list() to happen when the
+ // first element is pulled, not right now before a Sequence is wrapped around the result
+ val localFiles = sequence { yieldAll(getLocalFile(saveFolder).list().iterator()) }
- val externalFiles = if (files.isExternalStorageAvailable && getDataFolder().file().absolutePath != files.external("").file().absolutePath) {
- files.external(saveFolder).list().asSequence()
- } else {
- emptySequence()
+ val externalFiles = sequence {
+ if (!files.isExternalStorageAvailable) return@sequence
+ if (getDataFolder().file().absolutePath == files.external("").file().absolutePath) return@sequence
+ yieldAll(files.external(saveFolder).list().iterator())
}
debug("Local files: %s, external files: %s",be a tad better? (sorry, the first block of changes is readability only)
Alternative Approaches
As I must have previously hinted: break Gdx.files and move to an alternative files API which allows proper streaming of folder listings (Java nio?)
Additional Context
No response