feat: relative time and duration formatting

This commit is contained in:
yusing 2025-04-13 12:24:31 +08:00
parent 3f2dfe14b5
commit ffea5fb3da
2 changed files with 253 additions and 1 deletions

View file

@ -53,8 +53,55 @@ func FormatLastSeen(t time.Time) string {
return FormatTime(t)
}
func roundString(f float64) string {
return strconv.Itoa(int(math.Round(f)))
}
func FormatTime(t time.Time) string {
return t.Format("2006-01-02 15:04:05")
if t.IsZero() {
return "never"
}
return FormatTimeWithReference(t, time.Now())
}
func FormatUnixTime(t int64) string {
return FormatTime(time.Unix(t, 0))
}
func FormatTimeWithReference(t, ref time.Time) string {
if t.IsZero() {
return "never"
}
diff := t.Sub(ref)
absDiff := diff.Abs()
switch {
case absDiff < time.Second:
return "now"
case absDiff < 3*time.Second:
if diff < 0 {
return "just now"
}
fallthrough
case absDiff < 60*time.Second:
if diff < 0 {
return roundString(absDiff.Seconds()) + " seconds ago"
}
return "in " + roundString(absDiff.Seconds()) + " seconds"
case absDiff < 60*time.Minute:
if diff < 0 {
return roundString(absDiff.Minutes()) + " minutes ago"
}
return "in " + roundString(absDiff.Minutes()) + " minutes"
case absDiff < 24*time.Hour:
if diff < 0 {
return roundString(absDiff.Hours()) + " hours ago"
}
return "in " + roundString(absDiff.Hours()) + " hours"
case t.Year() == ref.Year():
return t.Format("01-02 15:04:05")
default:
return t.Format("2006-01-02 15:04:05")
}
}
func ParseBool(s string) bool {

View file

@ -0,0 +1,205 @@
package strutils_test
import (
"testing"
"time"
. "github.com/yusing/go-proxy/internal/utils/strutils"
. "github.com/yusing/go-proxy/internal/utils/testing"
)
func TestFormatTime(t *testing.T) {
now := Must(time.Parse(time.RFC3339, "2021-06-15T12:30:30Z"))
tests := []struct {
name string
time time.Time
expected string
expectedLength int
}{
{
name: "now",
time: now.Add(100 * time.Millisecond),
expected: "now",
},
{
name: "just now (past within 3 seconds)",
time: now.Add(-1 * time.Second),
expected: "just now",
},
{
name: "seconds ago",
time: now.Add(-10 * time.Second),
expected: "10 seconds ago",
},
{
name: "in seconds",
time: now.Add(10 * time.Second),
expected: "in 10 seconds",
},
{
name: "minutes ago",
time: now.Add(-10 * time.Minute),
expected: "10 minutes ago",
},
{
name: "in minutes",
time: now.Add(10 * time.Minute),
expected: "in 10 minutes",
},
{
name: "hours ago",
time: now.Add(-10 * time.Hour),
expected: "10 hours ago",
},
{
name: "in hours",
time: now.Add(10 * time.Hour),
expected: "in 10 hours",
},
{
name: "different day",
time: now.Add(-25 * time.Hour),
expectedLength: len("01-01 15:04:05"),
},
{
name: "same year but different month",
time: now.Add(-30 * 24 * time.Hour),
expectedLength: len("01-01 15:04:05"),
},
{
name: "different year",
time: time.Date(now.Year()-1, 1, 1, 10, 20, 30, 0, now.Location()),
expected: time.Date(now.Year()-1, 1, 1, 10, 20, 30, 0, now.Location()).Format("2006-01-02 15:04:05"),
},
{
name: "zero time",
time: time.Time{},
expected: "never",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := FormatTimeWithReference(tt.time, now)
if tt.expectedLength > 0 {
ExpectEqual(t, len(result), tt.expectedLength, result)
} else {
ExpectEqual(t, result, tt.expected)
}
})
}
}
func TestFormatDuration(t *testing.T) {
tests := []struct {
name string
duration time.Duration
expected string
}{
{
name: "zero duration",
duration: 0,
expected: "0 Seconds",
},
{
name: "seconds only",
duration: 45 * time.Second,
expected: "45 seconds",
},
{
name: "one second",
duration: 1 * time.Second,
expected: "1 second",
},
{
name: "minutes only",
duration: 5 * time.Minute,
expected: "5 minutes",
},
{
name: "one minute",
duration: 1 * time.Minute,
expected: "1 minute",
},
{
name: "hours only",
duration: 3 * time.Hour,
expected: "3 hours",
},
{
name: "one hour",
duration: 1 * time.Hour,
expected: "1 hour",
},
{
name: "days only",
duration: 2 * 24 * time.Hour,
expected: "2 days",
},
{
name: "one day",
duration: 24 * time.Hour,
expected: "1 day",
},
{
name: "complex duration",
duration: 2*24*time.Hour + 3*time.Hour + 45*time.Minute + 15*time.Second,
expected: "2 days, 3 hours and 45 minutes",
},
{
name: "hours and minutes",
duration: 2*time.Hour + 30*time.Minute,
expected: "2 hours and 30 minutes",
},
{
name: "days and hours",
duration: 1*24*time.Hour + 12*time.Hour,
expected: "1 day and 12 hours",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := FormatDuration(tt.duration)
ExpectEqual(t, result, tt.expected)
})
}
}
func TestFormatLastSeen(t *testing.T) {
now := time.Now()
tests := []struct {
name string
time time.Time
expected string
}{
{
name: "zero time",
time: time.Time{},
expected: "never",
},
{
name: "non-zero time",
time: now.Add(-10 * time.Minute),
// The actual result will be handled by FormatTime, which is tested separately
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
result := FormatLastSeen(tt.time)
if tt.name == "zero time" {
ExpectEqual(t, result, tt.expected)
} else {
// Just make sure it's not "never", the actual formatting is tested in TestFormatTime
if result == "never" {
t.Errorf("Expected non-zero time to not return 'never', got %s", result)
}
}
})
}
}