Merge pull request #498 from essentialkaos/develop

Version 13.3.4

.github/dependabot.yml

@@ -6,8 +6,8 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "daily"
-      timezone: "Europe/London"
-      time: "03:00"
+      timezone: "Etc/UTC"
+      time: "07:00"
     labels:
       - "PR • MAINTENANCE"
     assignees:
@@ -26,8 +26,8 @@ updates:
     target-branch: "develop"
     schedule:
       interval: "daily"
-      timezone: "Europe/London"
-      time: "04:00"
+      timezone: "Etc/UTC"
+      time: "08:00"
     labels:
       - "PR • MAINTENANCE"
     assignees:

CHANGELOG.md

@@ -1,6 +1,12 @@
 ## Changelog
 
-### [13.3.2](https://kaos.sh/ek/13.3.3)
+### [13.3.4](https://kaos.sh/ek/13.3.4)
+
+- `[timeutil]` Added support of minutes, hours and days to `MiniDuration`
+- `[timeutil]` Added separator customization to `MiniDuration`
+- `[timeutil]` Added usage examples for `MiniDuration`
+
+### [13.3.3](https://kaos.sh/ek/13.3.3)
 
 - `[support/apps]` Fixed Docker version extraction
 - `[support]` Improved output of large list of IPv4 and IPv6 addresses

timeutil/example_test.go

@@ -74,6 +74,21 @@ func ExampleShortDuration() {
 	// 0:03.215
 }
 
+func ExampleMiniDuration() {
+	fmt.Println(MiniDuration(36 * time.Hour))
+	fmt.Println(MiniDuration(18 * time.Second))
+	fmt.Println(MiniDuration(time.Second / 125))
+
+	// You can remove or change separator
+	fmt.Println(MiniDuration(time.Second/2000, ""))
+
+	// Output:
+	// 2 d
+	// 18 s
+	// 8 ms
+	// 500μs
+}
+
 func ExampleDurationToSeconds() {
 	fmt.Println(DurationToSeconds(2500 * time.Millisecond))
 

timeutil/timeutil.go

@@ -41,7 +41,7 @@ func PrettyDuration(d any) string {
 	}
 
 	if dur != 0 && dur < time.Second {
-		return getPrettyShortDuration(dur)
+		return getPrettyShortDuration(dur, " ")
 	}
 
 	return getPrettyLongDuration(dur)
@@ -94,9 +94,15 @@ func ShortDuration(d any, highPrecision ...bool) string {
 	return getShortDuration(dur, false)
 }
 
-// MiniDuration returns formatted value for short durations (e.g. s/ms/us/ns)
-func MiniDuration(d time.Duration) string {
-	return getPrettyShortDuration(d)
+// MiniDuration returns formatted value of duration (d/hr/m/s/ms/us/ns)
+func MiniDuration(d time.Duration, separator ...string) string {
+	sep := " "
+
+	if len(separator) != 0 {
+		sep = separator[0]
+	}
+
+	return getPrettyShortDuration(d, sep)
 }
 
 // Format returns formatted date as a string
@@ -763,28 +769,46 @@ func getPrettySimpleDuration(dur time.Duration) string {
 
 // codebeat:enable[BLOCK_NESTING]
 
-func getPrettyShortDuration(d time.Duration) string {
+func getPrettyShortDuration(d time.Duration, separator string) string {
 	switch {
+	case d >= 24*time.Hour:
+		return fmt.Sprintf(
+			"%.0g"+separator+"d",
+			formatFloat(float64(d)/float64(24*time.Hour)),
+		)
+
+	case d >= time.Hour:
+		return fmt.Sprintf(
+			"%.2g"+separator+"h",
+			formatFloat(float64(d)/float64(time.Hour)),
+		)
+
+	case d >= time.Minute:
+		return fmt.Sprintf(
+			"%.2g"+separator+"m",
+			formatFloat(float64(d)/float64(time.Minute)),
+		)
+
 	case d >= time.Second:
 		return fmt.Sprintf(
-			"%g s",
+			"%g"+separator+"s",
 			formatFloat(float64(d)/float64(time.Second)),
 		)
 
 	case d >= time.Millisecond:
 		return fmt.Sprintf(
-			"%g ms",
+			"%g"+separator+"ms",
 			formatFloat(float64(d)/float64(time.Millisecond)),
 		)
 
 	case d >= time.Microsecond:
 		return fmt.Sprintf(
-			"%g μs",
+			"%g"+separator+"μs",
 			formatFloat(float64(d)/float64(time.Microsecond)),
 		)
 
 	default:
-		return fmt.Sprintf("%d ns", d.Nanoseconds())
+		return fmt.Sprintf("%d"+separator+"ns", d.Nanoseconds())
 	}
 }
 

timeutil/timeutil_test.go

@@ -91,7 +91,11 @@ func (s *TimeUtilSuite) TestShortDuration(c *C) {
 }
 
 func (s *TimeUtilSuite) TestMiniDuration(c *C) {
+	c.Assert(MiniDuration(89*time.Hour, ""), Equals, "4d")
 	c.Assert(MiniDuration(time.Duration(0)), Equals, "0 ns")
+	c.Assert(MiniDuration(89*time.Hour), Equals, "4 d")
+	c.Assert(MiniDuration(15*time.Hour), Equals, "15 h")
+	c.Assert(MiniDuration(80*time.Second), Equals, "1.3 m")
 	c.Assert(MiniDuration(3*time.Second), Equals, "3 s")
 	c.Assert(MiniDuration(3*time.Millisecond), Equals, "3 ms")
 	c.Assert(MiniDuration(3*time.Microsecond), Equals, "3 μs")

version.go

@@ -8,4 +8,4 @@ package ek
 // ////////////////////////////////////////////////////////////////////////////////// //
 
 // VERSION is current ek package version
-const VERSION = "13.3.3"
+const VERSION = "13.3.4"