simplify API of MPPFile.input

This commit is contained in:
InsanusMokrassar 2023-04-04 01:26:18 +06:00
parent 6ea5e2e5a6
commit a938ee1efb
2 changed files with 6 additions and 51 deletions

View File

@ -1,33 +1,11 @@
package dev.inmo.micro_utils.ktor.common
import dev.inmo.micro_utils.common.MPPFile
import io.ktor.utils.io.bits.Memory
import io.ktor.utils.io.bits.loadByteArray
import dev.inmo.micro_utils.common.bytesAllocatorSync
import io.ktor.utils.io.core.ByteReadPacket
import io.ktor.utils.io.core.Input
import okio.FileSystem
import okio.Path
private class FileInput(
private val path: Path
) : Input() {
private val openedFile = FileSystem.SYSTEM.openReadOnly(path)
override fun closeSource() {
openedFile.close()
}
override fun fill(destination: Memory, offset: Int, length: Int): Int {
val byteArray = ByteArray(length)
val read = openedFile.read(offset.toLong(), byteArray, 0, length)
destination.loadByteArray(
offset,
byteArray,
count = length
)
return read
}
}
actual fun MPPFile.input(): Input {
return FileInput(this)
return ByteReadPacket(bytesAllocatorSync())
}

View File

@ -1,33 +1,10 @@
package dev.inmo.micro_utils.ktor.common
import dev.inmo.micro_utils.common.MPPFile
import io.ktor.utils.io.bits.Memory
import io.ktor.utils.io.bits.loadByteArray
import dev.inmo.micro_utils.common.bytesAllocatorSync
import io.ktor.utils.io.core.ByteReadPacket
import io.ktor.utils.io.core.Input
import okio.FileSystem
import okio.Path
private class FileInput(
private val path: Path
) : Input() {
private val openedFile = FileSystem.SYSTEM.openReadOnly(path)
override fun closeSource() {
openedFile.close()
}
override fun fill(destination: Memory, offset: Int, length: Int): Int {
val byteArray = ByteArray(length)
val read = openedFile.read(offset.toLong(), byteArray, 0, length)
destination.loadByteArray(
offset,
byteArray,
count = length
)
return read
}
}
actual fun MPPFile.input(): Input {
return FileInput(this)
return ByteReadPacket(bytesAllocatorSync())
}