Skip to content

Add fix to the file decoding. #22

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

Merged
merged 2 commits into from
Oct 26, 2021
Merged

Add fix to the file decoding. #22

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
cf05114
Add fix to the files not decoding properly.
ultraviolet-jordan Oct 26, 2021
e9f6eda
Bump version and update README.
ultraviolet-jordan Oct 26, 2021
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ A cache library written in Kotlin.
# Implementation
Just use cache if you do not require any of the revision specific loaders.
```
cache = { module = "com.runetopic.cache:cache", version.ref "1.4.18-SNAPSHOT" }
cache = { module = "com.runetopic.cache:cache", version.ref "1.4.19-SNAPSHOT" }
loader = { module = "com.runetopic.cache:loader", version.ref "647.6.4-SNAPSHOT" }
```

Expand Down
2 changes: 1 addition & 1 deletion cache/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {
signing
}

version = "1.4.18-SNAPSHOT"
version = "1.4.19-SNAPSHOT"

java {
withJavadocJar()
Expand Down
11 changes: 6 additions & 5 deletions cache/src/main/kotlin/com/runetopic/cache/store/storage/js5/Js5IndexDecoder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,23 @@ internal fun decode(

val groups = hashMapOf<Int, Group>()
(0 until count).forEach {
val groupReferenceTableData = datFile.readReferenceTable(idxFile.id(), idxFile.loadReferenceTable(it))
val groupId = groupIds[it]

val groupReferenceTableData = datFile.readReferenceTable(idxFile.id(), idxFile.loadReferenceTable(groupId))
val data = if (groupReferenceTableData.isEmpty()) byteArrayOf() else try {
groupReferenceTableData.decompress()
} catch (exception: ZipException) {
groupReferenceTableData
}

val groupId = groupIds[it]
groups[it] = (Group(
groups[groupId] = (Group(
groupId,
groupNameHashes[groupId],
groupCrcs[groupId],
groupWhirlpools[groupId],
groupRevisions[groupId],
intArrayOf(),//TODO
decodeFiles(fileIds, fileNameHashes, data, groupFileIds[it], it),
decodeFiles(fileIds, fileNameHashes, data, groupFileIds[groupId], groupId),
data
))
}
Expand Down Expand Up @@ -206,7 +207,7 @@ internal fun decodeFiles(
groupId: Int
): Map<Int, File> {
if (data.isEmpty()) return hashMapOf(Pair(0, File.DEFAULT))
if (count == 1) return hashMapOf(Pair(0, File(fileIds[groupId][0], fileNameHashes[groupId][0], data)))
if (count <= 1) return hashMapOf(Pair(0, File(fileIds[groupId][0], fileNameHashes[groupId][0], data)))

var position = data.size
val chunks = data[--position].toInt() and 0xFF
Expand Down