curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-15 04:54:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

no more reading entire savefiles onto the memory upon the booting

Browse Source
This commit is contained in:
minjaesong
2021-10-01 10:07:23 +09:00
parent aaa8a80324
commit b720c12c4e
9 changed files with 92 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/net/torvald/terrarum/tvda/DiskSkimmer.kt
View File

@@ -17,7 +17,11 @@ import kotlin.experimental.and
*
* Created by minjaesong on 2017-11-17.
*/
class DiskSkimmer(private val diskFile: File, val charset: Charset = Charset.defaultCharset()) {
class DiskSkimmer(
private val diskFile: File,
val charset: Charset = Charset.defaultCharset(),
private val skimmingStopFunction: (HashMap<EntryID, Long>) -> Boolean = { false }
) {
/*
@@ -63,6 +67,10 @@ removefile:
val fa = RandomAccessFile(diskFile, "rw")
private fun debugPrintln(s: Any) {
if (false) println(s.toString())
}
init {
val fis = FileInputStream(diskFile)
@@ -141,11 +149,13 @@ removefile:
if (typeFlag > 0) {
entryToOffsetTable[entryID] = offset
println("[DiskSkimmer] successfully read the entry $entryID at offset $offset (name: ${diskIDtoReadableFilename(entryID)})")
debugPrintln("[DiskSkimmer] ... successfully read the entry $entryID at offset $offset (name: ${diskIDtoReadableFilename(entryID)})")
}
else {
println("[DiskSkimmer] discarding entry $entryID at offset $offset (name: ${diskIDtoReadableFilename(entryID)})")
debugPrintln("[DiskSkimmer] ... discarding entry $entryID at offset $offset (name: ${diskIDtoReadableFilename(entryID)})")
}
if (skimmingStopFunction(entryToOffsetTable)) break
}
}
@@ -162,7 +172,7 @@ removefile:
fun requestFile(entryID: EntryID): DiskEntry? {
entryToOffsetTable[entryID].let { offset ->
if (offset == null) {
println("[DiskSkimmer.requestFile] entry $entryID does not exist on the table")
debugPrintln("[DiskSkimmer.requestFile] entry $entryID does not exist on the table")
return null
}
else {
@@ -231,17 +241,17 @@ removefile:
// fixme pretty much untested
val path = path.split(dirDelim)
//println(path)
//debugPrintln(path)
// bunch-of-io-access approach (for reading)
var traversedDir = 0L // entry ID
var dirFile: DiskEntry? = null
path.forEachIndexed { index, dirName ->
println("[DiskSkimmer.requestFile] $index\t$dirName, traversedDir = $traversedDir")
debugPrintln("[DiskSkimmer.requestFile] $index\t$dirName, traversedDir = $traversedDir")
dirFile = requestFile(traversedDir)
if (dirFile == null) {
println("[DiskSkimmer.requestFile] requestFile($traversedDir) came up null")
debugPrintln("[DiskSkimmer.requestFile] requestFile($traversedDir) came up null")
return null
} // outright null
if (dirFile!!.contents !is EntryDirectory && index < path.lastIndex) { // unexpectedly encountered non-directory
@@ -257,7 +267,7 @@ removefile:
// get name of the file
val childDirFile = requestFile(it)!!
if (childDirFile.filename.toCanonicalString(charset) == dirName) {
//println("[DiskSkimmer] found, $traversedDir -> $it")
//debugPrintln("[DiskSkimmer] found, $traversedDir -> $it")
dirGotcha = true
traversedDir = it
}
@@ -306,6 +316,20 @@ removefile:
fa.writeByte(bits)
}
fun getSaveMode(): Int {
fa.seek(49L)
return fa.read()
}
fun getDiskName(charset: Charset): String {
val bytes = ByteArray(268)
fa.seek(10L)
fa.read(bytes, 0, 32)
fa.seek(60L)
fa.read(bytes, 32, 236)
return bytes.toCanonicalString(charset)
}
///////////////////////////////////////////////////////
// THESE ARE METHODS TO SUPPORT ON-LINE MODIFICATION //
///////////////////////////////////////////////////////
@@ -409,7 +433,7 @@ removefile:
val HEADER_SIZE = DiskEntry.HEADER_SIZE
println("[DiskSkimmer.getEntryBlockSize] offset for entry $id = $offset")
debugPrintln("[DiskSkimmer.getEntryBlockSize] offset for entry $id = $offset")
val fis = FileInputStream(diskFile)
fis.skip(offset + 8)