null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-20 18:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert: "refactor(archive): Move stuff around"

Browse source 
This reverts commit e19d048bb1.
This commit is contained in:
Ahmad Ansori Palembani 2024-12-19 07:18:14 +07:00
parent 33332110f1
commit 17eec5f6aa
Signed by: null2264
GPG key ID: BA64F8B60AF3EFB6
4 changed files with 11 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveInputStream.kt
View file

@ -53,7 +53,7 @@ class AndroidArchiveInputStream(buffer: Long, size: Long) : ArchiveInputStream()
Archive.readFree(archive) Archive.readFree(archive)
} }
override fun getNextEntry() = Archive.readNextHeader(archive).takeUnless { it == 0L }?.let { entry -> fun getNextEntry() = Archive.readNextHeader(archive).takeUnless { it == 0L }?.let { entry ->
val name = ArchiveEntry.pathnameUtf8(entry) ?: ArchiveEntry.pathname(entry)?.decodeToString() ?: return null val name = ArchiveEntry.pathnameUtf8(entry) ?: ArchiveEntry.pathname(entry)?.decodeToString() ?: return null
val isFile = ArchiveEntry.filetype(entry) == ArchiveEntry.AE_IFREG val isFile = ArchiveEntry.filetype(entry) == ArchiveEntry.AE_IFREG
ArchiveEntry(name, isFile) ArchiveEntry(name, isFile)

14
core/src/androidMain/kotlin/yokai/core/archive/AndroidArchiveReader.kt
View file

@ -9,17 +9,15 @@ import eu.kanade.tachiyomi.util.system.openFileDescriptor
import me.zhanghai.android.libarchive.ArchiveException import me.zhanghai.android.libarchive.ArchiveException
import java.io.InputStream import java.io.InputStream
class AndroidArchiveReader(pfd: ParcelFileDescriptor) : ArchiveReader() { class AndroidArchiveReader(pfd: ParcelFileDescriptor) : ArchiveReader {
override val size = val size = pfd.statSize
pfd.statSize val address = Os.mmap(0, size, OsConstants.PROT_READ, OsConstants.MAP_PRIVATE, pfd.fileDescriptor, 0)
override val address =
Os.mmap(0, size, OsConstants.PROT_READ, OsConstants.MAP_PRIVATE, pfd.fileDescriptor, 0)
override fun createInputStream(address: Long, size: Long): ArchiveInputStream = override fun <T> useEntries(block: (Sequence<ArchiveEntry>) -> T): T =
AndroidArchiveInputStream(address, size) AndroidArchiveInputStream(address, size).use { block(generateSequence { it.getNextEntry() }) }
override fun getInputStream(entryName: String): InputStream? { override fun getInputStream(entryName: String): InputStream? {
val archive = createInputStream(address, size) val archive = AndroidArchiveInputStream(address, size)
try { try {
while (true) { while (true) {
val entry = archive.getNextEntry() ?: break val entry = archive.getNextEntry() ?: break

4
core/src/androidMain/kotlin/yokai/core/archive/ArchiveInputStream.kt
View file

@ -3,6 +3,4 @@ package yokai.core.archive
import java.io.InputStream import java.io.InputStream
// TODO: Use Okio's Source // TODO: Use Okio's Source
abstract class ArchiveInputStream : InputStream() { abstract class ArchiveInputStream : InputStream()
abstract fun getNextEntry(): ArchiveEntry?
}

13
core/src/androidMain/kotlin/yokai/core/archive/ArchiveReader.kt
View file

@ -3,14 +3,7 @@ package yokai.core.archive
import java.io.Closeable import java.io.Closeable
import java.io.InputStream import java.io.InputStream
abstract class ArchiveReader : Closeable { interface ArchiveReader : Closeable {
abstract val address: Long fun <T> useEntries(block: (Sequence<ArchiveEntry>) -> T): T
abstract val size: Long fun getInputStream(entryName: String): InputStream?
abstract fun createInputStream(address: Long, size: Long): ArchiveInputStream
inline fun <T> useEntries(block: (Sequence<ArchiveEntry>) -> T): T =
createInputStream(address, size).use { block(generateSequence { it.getNextEntry() }) }
abstract fun getInputStream(entryName: String): InputStream?
} }