From 2ae91bb2169671f6699a9638b4e40dbe80ae8ab3 Mon Sep 17 00:00:00 2001
From: mzdluo123 <mzdluo123@foxmail.com>
Date: Sat, 11 Jul 2020 00:24:12 +0800
Subject: [PATCH] show ptt upload speed
---
.../qqandroid/network/highway/HighwayHelper.kt | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
index d78c4904b..ade0c396b 100644
--- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
+++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt
@@ -186,6 +186,7 @@ internal object HighwayHelper {
}
suspend fun uploadPttToServers(
+ bot: QQAndroidBot,
servers: List<Pair<Int, Int>>,
content: ByteArray,
md5: ByteArray,
@@ -194,8 +195,18 @@ internal object HighwayHelper {
servers.retryWithServers(10 * 1000, {
throw IllegalStateException("cannot upload ptt, failed on all servers.", it)
}, { s: String, i: Int ->
- uploadPttToServer(s, i, content, md5, uKey, fileKey)
+ bot.network.logger.verbose {
+ "[Highway] Uploading ptt to ${s}:$i, size=${content.size.toLong().sizeToString()}"
+ }
+ val time = measureTime {
+ uploadPttToServer(s, i, content, md5, uKey, fileKey)
+ }
+ bot.network.logger.verbose {
+ "[Highway] Uploading ptt: succeed at ${(content.size.toDouble() / 1024 / time.inSeconds).roundToInt()} KiB/s"
+ }
+
})
+
}
private suspend fun uploadPttToServer(