improve print, bump to 1.2.2

build.gradle.kts

@@ -5,15 +5,15 @@ import java.time.ZonedDateTime
 plugins {
     kotlin("jvm")
     kotlin("plugin.serialization")
-    id("com.github.gmazzo.buildconfig") version "3.0.3"
+    id("com.github.gmazzo.buildconfig")
     id("org.jlleitschuh.gradle.ktlint")
     id("org.jlleitschuh.gradle.ktlint-idea")
     id("com.github.johnrengelman.shadow")
     application
 }
 
 group = "moe.sdl.tracks"
-version = "1.2.1"
+version = "1.2.2"
 
 val commitHash by lazy {
     val commitHashCommand = "git rev-parse --short HEAD"

src/main/kotlin/moe/sdl/tracks/cmd/Dig.kt

@@ -803,7 +803,7 @@ class Dig : CliktCommand(
 
         // Mux video and audio
         when {
-            skipMux -> echo("@|cyan,bold 根据选项跳过混流...|@".color)
+            skipMux || only != null -> echo("@|cyan,bold 根据选项跳过混流...|@".color)
             videoDst?.exists() == true || audioDst?.exists() == true -> {
                 echo("@|magenta ==>|@ @|bold 开始混流...|@".color)
                 val context = placeholderContext + videoStreamContext + audioStreamContext
@@ -888,7 +888,9 @@ class Dig : CliktCommand(
                 printJob.cancel()
             }.onSuccess {
                 echo()
-                echo("下载完成! 文件路径: ${dst.toPath().normalize().toFile().absolutePath}")
+                if (!onlyArtifact || only != null) {
+                    echo("下载完成! 文件路径: ${dst.toPath().normalize().toFile().absolutePath}")
+                }
             }.onFailure {
                 if (it is CancellationException) throw it else echo(it)
             }

src/main/kotlin/moe/sdl/tracks/util/string/ProgressBar.kt

@@ -33,11 +33,17 @@ fun CoroutineScope.progressBar(
             str += " "
         }
         str += String.format("%.1f%%", min(rate * 100, 100.0)).padEnd(7, ' ')
-        val delta = (Clock.System.now() - start).inWholeMilliseconds
+        val deltaDuration = Clock.System.now() - start
+        val delta = deltaDuration.inWholeMilliseconds
         val avg = if (delta > 0) Size(cur.value).toBandwidthMs(delta).toBytesBandwidth() else BytesBandwidth(0)
         str += "avg: " + avg.toShow().padEnd(10, ' ')
-        val etaSeconds = if (avg.bytes > 0) (total - cur.value) / avg.bytes else 0
-        str += " eta: " + etaSeconds.toInt().secondsToDuration().padEnd(5, ' ')
+        val etaSeconds: Double = if (avg.bytes > 0L) (total.toDouble() - cur.value) / avg.bytes else 0.0
+        str += if (etaSeconds <= 0.1 && avg.bytes > 1) {
+            " costed: ${deltaDuration.toHms()}"
+        } else {
+            " eta: " + etaSeconds.toInt().secondsToDuration().padEnd(5, ' ')
+        }
+
         print(StringBuilder("\u0008").repeat(lastLen))
         print(str)
         lastLen = str.length

src/main/kotlin/moe/sdl/tracks/util/string/ToString.kt

@@ -7,6 +7,7 @@ import kotlinx.datetime.TimeZone
 import kotlinx.datetime.isDistantFuture
 import kotlinx.datetime.toLocalDateTime
 import kotlin.math.pow
+import kotlin.time.Duration
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration
 
@@ -96,6 +97,13 @@ fun LocalDateTime.toAbsTime() =
     year.toString() + "-" + monthNumber.padZero() + "-" + dayOfMonth.padZero() + " " +
         hour.padZero() + ":" + minute.padZero() + ":" + second.padZero()
 
+fun Duration.toHms(): String = toComponents { hours, minutes, seconds, _ ->
+    val h = hours.toString().padStart(2, '0')
+    val m = minutes.toString().padStart(2, '0')
+    val s = seconds.toString().padStart(2, '0')
+    "$h:$m:$s"
+}
+
 private const val BANDWIDTH_SCALE: Double = 1000.0
 
 /**

versions.properties

@@ -7,6 +7,8 @@
 #### suppress inspection "SpellCheckingInspection" for whole file
 #### suppress inspection "UnusedProperty" for whole file
 
+plugin.com.github.gmazzo.buildconfig=3.0.3
+
 plugin.com.github.johnrengelman.shadow=7.1.2
 
 plugin.org.jlleitschuh.gradle.ktlint-idea=10.2.1