DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Порядок файлов теперь сохраняется полностью

Browse Source
This commit is contained in:
DBotThePony 2023-03-29 19:24:57 +07:00
parent c04c89de0d
commit 6a39ed7f56
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
View File

@ -16,7 +16,6 @@ import ru.dbotthepony.kstarbound.api.ISBFileLocator
import ru.dbotthepony.kstarbound.api.IStarboundFile import ru.dbotthepony.kstarbound.api.IStarboundFile
import ru.dbotthepony.kstarbound.api.NonExistingFile import ru.dbotthepony.kstarbound.api.NonExistingFile
import ru.dbotthepony.kstarbound.api.PhysicalFile import ru.dbotthepony.kstarbound.api.PhysicalFile
import ru.dbotthepony.kstarbound.api.explore
import ru.dbotthepony.kstarbound.defs.* import ru.dbotthepony.kstarbound.defs.*
import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration import ru.dbotthepony.kstarbound.defs.image.AtlasConfiguration
import ru.dbotthepony.kstarbound.defs.image.ImageReference import ru.dbotthepony.kstarbound.defs.image.ImageReference

10
src/main/kotlin/ru/dbotthepony/kstarbound/api/IStarboundFileSystem.kt
View File

@ -61,6 +61,11 @@ interface IStarboundFile : ISBFileLocator {
return children?.get(name) return children?.get(name)
} }
fun explore(): Stream<IStarboundFile> {
val children = children ?: return Stream.of(this)
return Stream.concat(Stream.of(this), children.values.stream().flatMap { it.explore() })
}
fun computeFullPath(): String { fun computeFullPath(): String {
var path = name var path = name
var parent = parent var parent = parent
@ -224,11 +229,6 @@ class NonExistingFile(
} }
} }
fun IStarboundFile.explore(): Stream<IStarboundFile> {
val children = children ?: return Stream.of(this)
return Stream.concat(Stream.of(this), children.values.stream().flatMap { it.explore() })
}
fun getPathFolder(path: String): String { fun getPathFolder(path: String): String {
return path.substringBeforeLast('/') return path.substringBeforeLast('/')
} }

3
src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt
View File

@ -1,6 +1,7 @@
package ru.dbotthepony.kstarbound.io package ru.dbotthepony.kstarbound.io
import it.unimi.dsi.fastutil.objects.Object2ObjectFunction import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
import ru.dbotthepony.kstarbound.api.IStarboundFile import ru.dbotthepony.kstarbound.api.IStarboundFile
import ru.dbotthepony.kstarbound.io.json.BinaryJsonReader import ru.dbotthepony.kstarbound.io.json.BinaryJsonReader
@ -35,7 +36,7 @@ class StarboundPak(val path: File, callback: (finished: Boolean, status: String)
get() = false get() = false
private var frozen = false private var frozen = false
private val innerChildren = Object2ObjectOpenHashMap<String, IStarboundFile>() private val innerChildren = Object2ObjectLinkedOpenHashMap<String, IStarboundFile>()
fun put(value: IStarboundFile) { fun put(value: IStarboundFile) {
check(!frozen) { "Can't put, already frozen!" } check(!frozen) { "Can't put, already frozen!" }