Avoid long duration strings: round to nearest second

For example, seeing "Next check: 14m56.245483933s" in feeds list after force-refreshing a feed.

This rounds to the nearest second, so it'll instead be "14m56s"

Other examples from latter two test cases:
- "12.345678s" -> "12s"
- "1m27.654321s" -> "1m28s"
This commit is contained in:
Nick Parker 2023-11-08 18:46:15 +13:00 committed by Frédéric Guillot
parent bc317cfcd1
commit 2bc5ad53c2
2 changed files with 34 additions and 2 deletions

View File

@ -163,17 +163,23 @@ func isEmail(str string) bool {
// Returns the duration in human readable format (hours and minutes).
func duration(t time.Time) string {
return durationImpl(t, time.Now())
}
// Accepts now argument for easy testing
func durationImpl(t time.Time, now time.Time) string {
if t.IsZero() {
return ""
}
diff := time.Until(t)
diff := t.Sub(now)
if diff < 0 {
return ""
}
return diff.String()
// Round to nearest second to get e.g. "14m56s" rather than "14m56.245483933s"
return diff.Round(time.Second).String()
}
func elapsedTime(printer *locale.Printer, tz string, t time.Time) string {

View File

@ -95,6 +95,32 @@ func TestIsEmail(t *testing.T) {
}
}
func TestDuration(t *testing.T) {
now := time.Now()
var dt = []struct {
in time.Time
out string
}{
{time.Time{}, ""},
{now.Add(time.Hour), "1h0m0s"},
{now.Add(time.Minute), "1m0s"},
{now.Add(time.Minute * 40), "40m0s"},
{now.Add(time.Millisecond * 40), "0s"},
{now.Add(time.Millisecond * 80), "0s"},
{now.Add(time.Millisecond * 400), "0s"},
{now.Add(time.Millisecond * 800), "1s"},
{now.Add(time.Millisecond * 4321), "4s"},
{now.Add(time.Millisecond * 8765), "9s"},
{now.Add(time.Microsecond * 12345678), "12s"},
{now.Add(time.Microsecond * 87654321), "1m28s"},
}
for i, tt := range dt {
if out := durationImpl(tt.in, now); out != tt.out {
t.Errorf(`%d. content mismatch for "%v": expected=%q got=%q`, i, tt.in, tt.out, out)
}
}
}
func TestElapsedTime(t *testing.T) {
printer := locale.NewPrinter("en_US")
var dt = []struct {