From 3149be7223a0020117ea73274aac161402e050bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schaar?= Date: Wed, 23 Feb 2022 16:20:42 +0100 Subject: [PATCH 1/4] Add weeks --- modules/util/sec_to_time.go | 82 +++++++++++++++++++++----------- modules/util/sec_to_time_test.go | 12 ++--- 2 files changed, 59 insertions(+), 35 deletions(-) diff --git a/modules/util/sec_to_time.go b/modules/util/sec_to_time.go index 657b30cddffc1..fc3df6eae9b50 100644 --- a/modules/util/sec_to_time.go +++ b/modules/util/sec_to_time.go @@ -4,40 +4,64 @@ package util -import "fmt" +import ( + "fmt" + "strings" +) -// SecToTime converts an amount of seconds to a human-readable string (example: 66s -> 1min 6s) +// SecToTime converts an amount of seconds to a human-readable string. E.g. +// 66s -> 1 minute 6 seconds +// 52410s -> 14 hours 33 minutes +// 563418 -> 6 days 12 hours +// 1563418 -> 2 weeks 4 days +// 3937125s -> 1 month 2 weeks +// 45677465s -> 1 year 6 months func SecToTime(duration int64) string { + formattedTime := "" + years := duration / (3600 * 24 * 7 * 4 * 12) + months := (duration / (3600 * 24 * 7 * 4)) % 12 + weeks := (duration / (3600 * 24 * 7)) % 4 + days := (duration / (3600 * 24)) % 7 + hours := (duration / 3600) % 24 + minutes := (duration / 60) % 60 seconds := duration % 60 - minutes := (duration / (60)) % 60 - hours := duration / (60 * 60) % 24 - days := duration / (60 * 60) / 24 - var formattedTime string - - if days > 0 { - formattedTime = fmt.Sprintf("%dd", days) - } - if hours > 0 { - if formattedTime == "" { - formattedTime = fmt.Sprintf("%dh", hours) - } else { - formattedTime = fmt.Sprintf("%s %dh", formattedTime, hours) - } - } - if minutes > 0 { - if formattedTime == "" { - formattedTime = fmt.Sprintf("%dm", minutes) - } else { - formattedTime = fmt.Sprintf("%s %dm", formattedTime, minutes) - } + // Extract only the relevant information of the time + // If the time is greater than a year, it makes no sense to display seconds. + switch { + case years > 0: + formattedTime = FormatTime(years, "year", formattedTime) + formattedTime = FormatTime(months, "month", formattedTime) + case months > 0: + formattedTime = FormatTime(months, "month", formattedTime) + formattedTime = FormatTime(weeks, "week", formattedTime) + case weeks > 0: + formattedTime = FormatTime(weeks, "week", formattedTime) + formattedTime = FormatTime(days, "day", formattedTime) + case days > 0: + formattedTime = FormatTime(days, "day", formattedTime) + formattedTime = FormatTime(hours, "hour", formattedTime) + case hours > 0: + formattedTime = FormatTime(hours, "hour", formattedTime) + formattedTime = FormatTime(minutes, "minute", formattedTime) + default: + formattedTime = FormatTime(minutes, "minute", formattedTime) + formattedTime = FormatTime(seconds, "second", formattedTime) } - if seconds > 0 { - if formattedTime == "" { - formattedTime = fmt.Sprintf("%ds", seconds) - } else { - formattedTime = fmt.Sprintf("%s %ds", formattedTime, seconds) - } + + // The FormatTime() function always appends a space at the end. This will be trimmed + return strings.TrimRight(formattedTime, " ") +} + +// FormatTime appends the given value to the existing forammattedTime. E.g: +// formattedTime = "1 year" +// input: value = 3, name = "month" +// output will be "1 year 3 months" +func FormatTime(value int64, name string, formattedTime string) string { + if value == 1 { + formattedTime = fmt.Sprintf("%s1 %s ", formattedTime, name) + } else if value > 1 { + formattedTime = fmt.Sprintf("%s%d %ss ", formattedTime, value, name) } return formattedTime diff --git a/modules/util/sec_to_time_test.go b/modules/util/sec_to_time_test.go index 915dcbf727904..d47b702946a33 100644 --- a/modules/util/sec_to_time_test.go +++ b/modules/util/sec_to_time_test.go @@ -11,10 +11,10 @@ import ( ) func TestSecToTime(t *testing.T) { - assert.Equal(t, SecToTime(10), "10s") - assert.Equal(t, SecToTime(100), "1m 40s") - assert.Equal(t, SecToTime(1000), "16m 40s") - assert.Equal(t, SecToTime(10000), "2h 46m 40s") - assert.Equal(t, SecToTime(100000), "1d 3h 46m 40s") - assert.Equal(t, SecToTime(1000000), "11d 13h 46m 40s") + assert.Equal(t, SecToTime(66), "1 minute 6 seconds") + assert.Equal(t, SecToTime(52410), "14 hours 33 minutes") + assert.Equal(t, SecToTime(563418), "6 days 12 hours") + assert.Equal(t, SecToTime(1563418), "2 weeks 4 days") + assert.Equal(t, SecToTime(3937125), "1 month 2 weeks") + assert.Equal(t, SecToTime(45677465), "1 year 6 months") } From 2a0c27f7ac779cc874ca1f3d7a347349f81e49eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schaar?= Date: Wed, 23 Feb 2022 18:44:59 +0100 Subject: [PATCH 2/4] Update months to be 30 days instead of 4 weeks --- modules/util/sec_to_time.go | 2 +- modules/util/sec_to_time_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/util/sec_to_time.go b/modules/util/sec_to_time.go index fc3df6eae9b50..2a5f96f71cca8 100644 --- a/modules/util/sec_to_time.go +++ b/modules/util/sec_to_time.go @@ -19,7 +19,7 @@ import ( func SecToTime(duration int64) string { formattedTime := "" years := duration / (3600 * 24 * 7 * 4 * 12) - months := (duration / (3600 * 24 * 7 * 4)) % 12 + months := (duration / (3600 * 24 * 30)) % 12 weeks := (duration / (3600 * 24 * 7)) % 4 days := (duration / (3600 * 24)) % 7 hours := (duration / 3600) % 24 diff --git a/modules/util/sec_to_time_test.go b/modules/util/sec_to_time_test.go index d47b702946a33..854190462bc37 100644 --- a/modules/util/sec_to_time_test.go +++ b/modules/util/sec_to_time_test.go @@ -16,5 +16,5 @@ func TestSecToTime(t *testing.T) { assert.Equal(t, SecToTime(563418), "6 days 12 hours") assert.Equal(t, SecToTime(1563418), "2 weeks 4 days") assert.Equal(t, SecToTime(3937125), "1 month 2 weeks") - assert.Equal(t, SecToTime(45677465), "1 year 6 months") + assert.Equal(t, SecToTime(45677465), "1 year 5 months") } From 62e442463a0296b91c4e76a2b326c5dfacd9e960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schaar?= Date: Thu, 24 Feb 2022 07:45:36 +0100 Subject: [PATCH 3/4] Update tests to match new time format --- models/issue_tracked_time_test.go | 10 +++++----- models/migrations/v210.go | 2 +- models/migrations/v210_test.go | 1 + modules/util/sec_to_time.go | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/models/issue_tracked_time_test.go b/models/issue_tracked_time_test.go index e6c9caf90013b..68e78c71c726c 100644 --- a/models/issue_tracked_time_test.go +++ b/models/issue_tracked_time_test.go @@ -34,7 +34,7 @@ func TestAddTime(t *testing.T) { assert.Equal(t, int64(3661), tt.Time) comment := unittest.AssertExistsAndLoadBean(t, &Comment{Type: CommentTypeAddTimeManual, PosterID: 3, IssueID: 1}).(*Comment) - assert.Equal(t, comment.Content, "1h 1m 1s") + assert.Equal(t, comment.Content, "1 hour 1 minute") } func TestGetTrackedTimes(t *testing.T) { @@ -86,7 +86,7 @@ func TestTotalTimes(t *testing.T) { assert.Len(t, total, 1) for user, time := range total { assert.Equal(t, int64(1), user.ID) - assert.Equal(t, "6m 40s", time) + assert.Equal(t, "6 minutes 40 seconds", time) } total, err = TotalTimes(&FindTrackedTimesOptions{IssueID: 2}) @@ -94,9 +94,9 @@ func TestTotalTimes(t *testing.T) { assert.Len(t, total, 2) for user, time := range total { if user.ID == 2 { - assert.Equal(t, "1h 1m 2s", time) + assert.Equal(t, "1 hour 1 minute", time) } else if user.ID == 1 { - assert.Equal(t, "20s", time) + assert.Equal(t, "20 seconds", time) } else { assert.Error(t, assert.AnError) } @@ -107,7 +107,7 @@ func TestTotalTimes(t *testing.T) { assert.Len(t, total, 1) for user, time := range total { assert.Equal(t, int64(2), user.ID) - assert.Equal(t, "1s", time) + assert.Equal(t, "1 second", time) } total, err = TotalTimes(&FindTrackedTimesOptions{IssueID: 4}) diff --git a/models/migrations/v210.go b/models/migrations/v210.go index cf50760b92c33..9da8ca9db6643 100644 --- a/models/migrations/v210.go +++ b/models/migrations/v210.go @@ -11,8 +11,8 @@ import ( "strings" "code.gitea.io/gitea/modules/timeutil" - "github.com/tstranex/u2f" + "github.com/tstranex/u2f" "xorm.io/xorm" "xorm.io/xorm/schemas" ) diff --git a/models/migrations/v210_test.go b/models/migrations/v210_test.go index 3e10b3ce80a25..70dbe61b06eb7 100644 --- a/models/migrations/v210_test.go +++ b/models/migrations/v210_test.go @@ -8,6 +8,7 @@ import ( "testing" "code.gitea.io/gitea/modules/timeutil" + "github.com/stretchr/testify/assert" "xorm.io/xorm/schemas" ) diff --git a/modules/util/sec_to_time.go b/modules/util/sec_to_time.go index 2a5f96f71cca8..5bf87b6ebe425 100644 --- a/modules/util/sec_to_time.go +++ b/modules/util/sec_to_time.go @@ -57,7 +57,7 @@ func SecToTime(duration int64) string { // formattedTime = "1 year" // input: value = 3, name = "month" // output will be "1 year 3 months" -func FormatTime(value int64, name string, formattedTime string) string { +func FormatTime(value int64, name, formattedTime string) string { if value == 1 { formattedTime = fmt.Sprintf("%s1 %s ", formattedTime, name) } else if value > 1 { From d697e6337271ca1c3e6a7967e6b753f99496b300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Schaar?= Date: Mon, 28 Feb 2022 21:12:29 +0100 Subject: [PATCH 4/4] Make formatTime private --- modules/util/sec_to_time.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/util/sec_to_time.go b/modules/util/sec_to_time.go index 5bf87b6ebe425..9ce6fe1a13eb5 100644 --- a/modules/util/sec_to_time.go +++ b/modules/util/sec_to_time.go @@ -30,34 +30,34 @@ func SecToTime(duration int64) string { // If the time is greater than a year, it makes no sense to display seconds. switch { case years > 0: - formattedTime = FormatTime(years, "year", formattedTime) - formattedTime = FormatTime(months, "month", formattedTime) + formattedTime = formatTime(years, "year", formattedTime) + formattedTime = formatTime(months, "month", formattedTime) case months > 0: - formattedTime = FormatTime(months, "month", formattedTime) - formattedTime = FormatTime(weeks, "week", formattedTime) + formattedTime = formatTime(months, "month", formattedTime) + formattedTime = formatTime(weeks, "week", formattedTime) case weeks > 0: - formattedTime = FormatTime(weeks, "week", formattedTime) - formattedTime = FormatTime(days, "day", formattedTime) + formattedTime = formatTime(weeks, "week", formattedTime) + formattedTime = formatTime(days, "day", formattedTime) case days > 0: - formattedTime = FormatTime(days, "day", formattedTime) - formattedTime = FormatTime(hours, "hour", formattedTime) + formattedTime = formatTime(days, "day", formattedTime) + formattedTime = formatTime(hours, "hour", formattedTime) case hours > 0: - formattedTime = FormatTime(hours, "hour", formattedTime) - formattedTime = FormatTime(minutes, "minute", formattedTime) + formattedTime = formatTime(hours, "hour", formattedTime) + formattedTime = formatTime(minutes, "minute", formattedTime) default: - formattedTime = FormatTime(minutes, "minute", formattedTime) - formattedTime = FormatTime(seconds, "second", formattedTime) + formattedTime = formatTime(minutes, "minute", formattedTime) + formattedTime = formatTime(seconds, "second", formattedTime) } - // The FormatTime() function always appends a space at the end. This will be trimmed + // The formatTime() function always appends a space at the end. This will be trimmed return strings.TrimRight(formattedTime, " ") } -// FormatTime appends the given value to the existing forammattedTime. E.g: +// formatTime appends the given value to the existing forammattedTime. E.g: // formattedTime = "1 year" // input: value = 3, name = "month" -// output will be "1 year 3 months" -func FormatTime(value int64, name, formattedTime string) string { +// output will be "1 year 3 months " +func formatTime(value int64, name, formattedTime string) string { if value == 1 { formattedTime = fmt.Sprintf("%s1 %s ", formattedTime, name) } else if value > 1 {