Merge pull request #45 from sourceplusplus/dev

v0.4.4

Author: BFergerson

src/commonMain/kotlin/spp.protocol/artifact/trace/Trace.kt

@@ -38,7 +38,7 @@ data class Trace(
     val traceIds: List<String>,
     val partial: Boolean = false,
     val segmentId: String? = null,
-    val meta: Map<String, String> = mutableMapOf()
+    val meta: MutableMap<String, String> = mutableMapOf()
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true

src/commonMain/kotlin/spp.protocol/artifact/trace/TraceSpan.kt

@@ -70,7 +70,7 @@ data class TraceSpan(
         meta[tag] = value
     }
 
-    fun putMetaInt(tag: String): Int? {
+    fun getMetaInt(tag: String): Int? {
         return meta[tag]?.toIntOrNull()
     }
 

src/commonMain/kotlin/spp.protocol/utils/TimeUtils.kt

@@ -17,51 +17,54 @@
  */
 package spp.protocol.utils
 
-fun Int.toPrettyDuration(): String {
+import kotlin.jvm.JvmOverloads
+
+fun Int.toPrettyDuration(translate: (String)->String = { it }): String {
     val days = this / 86400000.0
     if (days > 1) {
-        return "${days.toInt()}dys"
+        return "${days.toInt()}" + translate("dys")
     }
     val hours = this / 3600000.0
     if (hours > 1) {
-        return "${hours.toInt()}hrs"
+        return "${hours.toInt()}" + translate("hrs")
     }
     val minutes = this / 60000.0
     if (minutes > 1) {
-        return "${minutes.toInt()}mins"
+        return "${minutes.toInt()}" + translate("mins")
     }
     val seconds = this / 1000.0
     if (seconds > 1) {
-        return "${seconds.toInt()}secs"
+        return "${seconds.toInt()}" + translate("secs")
     }
-    return "${this}ms"
+    return "$this" + translate("ms")
 }
 
-fun Double.fromPerSecondToPrettyFrequency(): String {
+@JvmOverloads
+fun Double.fromPerSecondToPrettyFrequency(translate: (String)->String = { it }): String {
     return when {
-        this > 1000000.0 -> "${this / 1000000.0.toInt()}M/sec"
-        this > 1000.0 -> "${this / 1000.0.toInt()}K/sec"
-        this > 1.0 -> "${this.toInt()}/sec"
-        else -> "${(this * 60.0).toInt()}/min"
+        this > 1000000.0 -> "${this / 1000000.0.toInt()}M/" + translate("sec")
+        this > 1000.0 -> "${this / 1000.0.toInt()}K/" + translate("sec")
+        this > 1.0 -> "${this.toInt()}/" + translate("sec")
+        else -> "${(this * 60.0).toInt()}/" + translate.invoke("min")
     }
 }
 
-fun Long.toPrettyDuration(): String {
+fun Long.toPrettyDuration(translate: (String)->String = { it }): String {
     val days = this / 86400000.0
     if (days > 1) {
-        return "${days.toInt()}d"
+        return "${days.toInt()}" + translate("dys")
     }
     val hours = this / 3600000.0
     if (hours > 1) {
-        return "${hours.toInt()}h"
+        return "${hours.toInt()}" + translate("hrs")
     }
     val minutes = this / 60000.0
     if (minutes > 1) {
-        return "${minutes.toInt()}m"
+        return "${minutes.toInt()}" + translate("mins")
     }
     val seconds = this / 1000.0
     if (seconds > 1) {
-        return "${seconds.toInt()}s"
+        return "${seconds.toInt()}" + translate("secs")
     }
-    return "${this}ms"
+    return "$this" + translate("ms")
 }