github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-20 17:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix zip and unzip

Browse Source
This commit is contained in:
Him188 2020-03-08 22:04:11 +08:00
parent 243b2ea731
commit 21abfe4a64
3 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/platformAndroid.kt
View File

@ -54,18 +54,12 @@ actual object MiraiPlatformUtils {
data.checkOffsetAndLength(offset, length)
if (length == 0) return ByteArray(0)
val inflater = Deflater()
inflater.reset()
ByteArrayOutputStream().use { output ->
inflater.setInput(data, offset, length)
ByteArrayPool.useInstance {
while (!inflater.finished()) {
output.write(it, 0, inflater.deflate(it))
}
}
val deflater = Deflater()
deflater.setInput(data, offset, length)
deflater.finish()
inflater.end()
return output.toByteArray()
ByteArrayPool.useInstance {
return it.take(deflater.deflate(it)).toByteArray().also { deflater.end() }
}
}

24
mirai-core/src/commonTest/kotlin/net.mamoe.mirai.utils/PlatformUtilsTest.kt Normal file
View File

@ -0,0 +1,24 @@
/*
* Copyright 2020 Mamoe Technologies and contributors.
*
* 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
* Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
*
* https://github.com/mamoe/mirai/blob/master/LICENSE
*/
package net.mamoe.mirai.utils
import kotlinx.io.core.toByteArray
import net.mamoe.mirai.utils.io.encodeToString
import kotlin.test.Test
import kotlin.test.assertEquals
internal class PlatformUtilsTest {
@OptIn(MiraiInternalAPI::class)
@Test
fun testZip() {
assertEquals("test", MiraiPlatformUtils.unzip(MiraiPlatformUtils.zip("test".toByteArray())).encodeToString())
}
}

16
mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/PlatformUtilsJvm.kt
View File

@ -55,18 +55,12 @@ actual object MiraiPlatformUtils {
data.checkOffsetAndLength(offset, length)
if (length == 0) return ByteArray(0)
val inflater = Deflater()
inflater.reset()
ByteArrayOutputStream().use { output ->
inflater.setInput(data, offset, length)
ByteArrayPool.useInstance {
while (!inflater.finished()) {
output.write(it, 0, inflater.deflate(it))
}
}
val deflater = Deflater()
deflater.setInput(data, offset, length)
deflater.finish()
inflater.end()
return output.toByteArray()
ByteArrayPool.useInstance {
return it.take(deflater.deflate(it)).toByteArray().also { deflater.end() }
}
}