InsanusMokrassar
/
MicroUtils
mirror of https://github.com/InsanusMokrassar/MicroUtils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge a7e54e2a38 into bd2558e852

This commit is contained in:
InsanusMokrassar 2024-05-01 11:46:04 +00:00 committed by GitHub
parent bd2558e852 a7e54e2a38
commit a7bdb1008e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 60 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# Changelog
## 0.21.0
## 0.20.46
* `Common`:

2
common/build.gradle
View File

@ -11,6 +11,7 @@ kotlin {
commonMain {
dependencies {
api libs.klock
api libs.kt.io.core
}
}
jvmMain {
@ -23,7 +24,6 @@ kotlin {
api project(":micro_utils.coroutines")
api libs.android.fragment
}
dependsOn jvmMain
}
linuxX64Main {

19
common/src/commonMain/kotlin/dev/inmo/micro_utils/common/MPPFile.kt
View File

@ -1,5 +1,9 @@
package dev.inmo.micro_utils.common
import kotlinx.io.RawSource
import kotlinx.io.Source
import kotlinx.io.buffered
import kotlinx.io.readByteArray
import kotlinx.serialization.Serializable
import kotlin.jvm.JvmInline
@ -23,12 +27,21 @@ value class FileName(val string: String) {
}
expect class MPPFile
expect class MPPFile = File
expect val MPPFile.rawSource: RawSource
val MPPFile.source: Source
get() = rawSource.buffered()
expect val MPPFile.filename: FileName
expect val MPPFile.filesize: Long
expect val MPPFile.bytesAllocatorSync: ByteArrayAllocator
expect val MPPFile.bytesAllocator: SuspendByteArrayAllocator
val MPPFile.bytesAllocatorSync: ByteArrayAllocator
get() = {
source.readByteArray()
}
val MPPFile.bytesAllocator: SuspendByteArrayAllocator
get() = {
source.readByteArray()
}
fun MPPFile.bytesSync() = bytesAllocatorSync()
suspend fun MPPFile.bytes() = bytesAllocator()

16
common/src/jsMain/kotlin/dev/inmo/micro_utils/common/JSMPPFile.kt
View File

@ -1,5 +1,6 @@
package dev.inmo.micro_utils.common
import kotlinx.io.RawSource
import org.khronos.webgl.ArrayBuffer
import org.w3c.dom.ErrorEvent
import org.w3c.files.*
@ -40,15 +41,6 @@ actual val MPPFile.filename: FileName
*/
actual val MPPFile.filesize: Long
get() = size.toLong()
/**
* @suppress
*/
@Warning("That is not optimized version of bytes allocator. Use asyncBytesAllocator everywhere you can")
actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator
get() = ::readBytes
/**
* @suppress
*/
@Warning("That is not optimized version of bytes allocator. Use asyncBytesAllocator everywhere you can")
actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator
get() = ::dirtyReadBytes
actual val MPPFile.rawSource: RawSource
get() =

3
common/src/jsMain/kotlin/dev/inmo/micro_utils/common/MPPFile.dev.inmo.micro_utils.micro_utils.common.js.kt Normal file
View File

@ -0,0 +1,3 @@
package dev.inmo.micro_utils.common
import kotlinx.io.RawSource

18
common/src/jvmMain/kotlin/dev/inmo/micro_utils/common/JVMMPPFile.kt
View File

@ -18,20 +18,4 @@ actual val MPPFile.filename: FileName
* @suppress
*/
actual val MPPFile.filesize: Long
get() = length()
/**
* @suppress
*/
actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator
get() = ::readBytes
/**
* @suppress
*/
actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator
get() = {
doInIO {
doOutsideOfCoroutine {
readBytes()
}
}
}
get() = if (exists()) length() else -1L

6
common/src/jvmMain/kotlin/dev/inmo/micro_utils/common/MPPFile.dev.inmo.micro_utils.micro_utils.common.jvm.kt Normal file
View File

@ -0,0 +1,6 @@
package dev.inmo.micro_utils.common
import kotlinx.io.RawSource
actual val MPPFile.rawSource: RawSource
get() = TODO("Not yet implemented")

36
common/src/linuxArm64Main/kotlin/ActualMPPFile.kt
View File

@ -1,36 +0,0 @@
package dev.inmo.micro_utils.common
import okio.FileSystem
import okio.Path
import okio.use
actual typealias MPPFile = Path
/**
* @suppress
*/
actual val MPPFile.filename: FileName
get() = FileName(toString())
/**
* @suppress
*/
actual val MPPFile.filesize: Long
get() = FileSystem.SYSTEM.openReadOnly(this).use {
it.size()
}
/**
* @suppress
*/
actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator
get() = {
FileSystem.SYSTEM.read(this) {
readByteArray()
}
}
/**
* @suppress
*/
actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator
get() = {
bytesAllocatorSync()
}

36
common/src/linuxX64Main/kotlin/ActualMPPFile.kt
View File

@ -1,36 +0,0 @@
package dev.inmo.micro_utils.common
import okio.FileSystem
import okio.Path
import okio.use
actual typealias MPPFile = Path
/**
* @suppress
*/
actual val MPPFile.filename: FileName
get() = FileName(toString())
/**
* @suppress
*/
actual val MPPFile.filesize: Long
get() = FileSystem.SYSTEM.openReadOnly(this).use {
it.size()
}
/**
* @suppress
*/
actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator
get() = {
FileSystem.SYSTEM.read(this) {
readByteArray()
}
}
/**
* @suppress
*/
actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator
get() = {
bytesAllocatorSync()
}

25
common/src/linuxX64Main/kotlin/fixed.kt
View File

@ -1,25 +0,0 @@
package dev.inmo.micro_utils.common
import kotlinx.cinterop.*
import platform.posix.snprintf
import platform.posix.sprintf
@OptIn(ExperimentalForeignApi::class)
actual fun Float.fixed(signs: Int): Float {
return memScoped {
val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2)
sprintf(buff, "%.${signs}f", this@fixed)
buff.toKString().toFloat()
}
}
@OptIn(ExperimentalForeignApi::class)
actual fun Double.fixed(signs: Int): Double {
return memScoped {
val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2)
sprintf(buff, "%.${signs}f", this@fixed)
buff.toKString().toDouble()
}
}

36
common/src/mingwX64Main/kotlin/ActualMPPFile.kt
View File

@ -1,36 +0,0 @@
package dev.inmo.micro_utils.common
import okio.FileSystem
import okio.Path
import okio.use
actual typealias MPPFile = Path
/**
* @suppress
*/
actual val MPPFile.filename: FileName
get() = FileName(toString())
/**
* @suppress
*/
actual val MPPFile.filesize: Long
get() = FileSystem.SYSTEM.openReadOnly(this).use {
it.size()
}
/**
* @suppress
*/
actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator
get() = {
FileSystem.SYSTEM.read(this) {
readByteArray()
}
}
/**
* @suppress
*/
actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator
get() = {
bytesAllocatorSync()
}

25
common/src/mingwX64Main/kotlin/fixed.kt
View File

@ -1,25 +0,0 @@
package dev.inmo.micro_utils.common
import kotlinx.cinterop.*
import platform.posix.snprintf
import platform.posix.sprintf
@OptIn(ExperimentalForeignApi::class)
actual fun Float.fixed(signs: Int): Float {
return memScoped {
val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2)
sprintf(buff, "%.${signs}f", this@fixed)
buff.toKString().toFloat()
}
}
@OptIn(ExperimentalForeignApi::class)
actual fun Double.fixed(signs: Int): Double {
return memScoped {
val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2)
sprintf(buff, "%.${signs}f", this@fixed)
buff.toKString().toDouble()
}
}

22
common/src/nativeMain/kotlin/ActualMPPFile.kt Normal file
View File

@ -0,0 +1,22 @@
package dev.inmo.micro_utils.common
import kotlinx.io.RawSource
import kotlinx.io.buffered
import kotlinx.io.files.FileSystem
import kotlinx.io.files.Path
import kotlinx.io.files.SystemFileSystem
actual typealias MPPFile = Path
actual val MPPFile.rawSource: RawSource
get() = SystemFileSystem.source(this)
/**
* @suppress
*/
actual val MPPFile.filename: FileName
get() = FileName(toString())
/**
* @suppress
*/
actual val MPPFile.filesize: Long
get() = SystemFileSystem.metadataOrNull(this) ?.size ?: -1L

0
common/src/linuxArm64Main/kotlin/fixed.kt → common/src/nativeMain/kotlin/fixed.kt
View File

4
gradle.properties
View File

@ -15,5 +15,5 @@ crypto_js_version=4.1.1
# Project data
group=dev.inmo
version=0.20.46
android_code_version=252
version=0.21.0
android_code_version=253

3
gradle/libs.versions.toml
View File

@ -3,6 +3,7 @@
kt = "1.9.23"
kt-serialization = "1.6.3"
kt-coroutines = "1.8.0"
kt-io = "0.3.3"
kslog = "1.3.3"
@ -53,6 +54,8 @@ kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", vers
kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" }
kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" }
kt-io-core = { module = "org.jetbrains.kotlinx:kotlinx-io-core", version.ref = "kt-io" }
ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }