From 1f09356bc9e58f043cd851535e8ca6db56422290 Mon Sep 17 00:00:00 2001 From: royee Date: Tue, 4 Oct 2022 00:01:51 +0800 Subject: [PATCH 1/2] timex add some sub method --- timex/timex.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/timex/timex.go b/timex/timex.go index 80a6b6c60..1d9621df1 100644 --- a/timex/timex.go +++ b/timex/timex.go @@ -154,6 +154,11 @@ func (t *Time) AddDay(day int) *Time { return t.AddSeconds(day * OneDaySec) } +// SubDay add some day time for the time +func (t *Time) SubDay(day int) *Time { + return t.SubDay(day) +} + // Tomorrow time. get tomorrow time for the time func (t *Time) Tomorrow() *Time { return t.AddSeconds(OneDaySec) @@ -170,11 +175,21 @@ func (t *Time) AddHour(hours int) *Time { return t.AddSeconds(hours * OneHourSec) } +// SubHour add some hour time +func (t *Time) SubHour(hours int) *Time { + return t.SubHour(hours) +} + // AddMinutes add some minutes time for the time func (t *Time) AddMinutes(minutes int) *Time { return t.AddSeconds(minutes * OneMinSec) } +// SubMinutes add some minutes time for the time +func (t *Time) SubMinutes(minutes int) *Time { + return t.SubMinutes(minutes * OneMinSec) +} + // AddSeconds add some seconds time the time func (t *Time) AddSeconds(seconds int) *Time { return &Time{ From 801ba66f6893f29a390fc0714082ce8e1c50451b Mon Sep 17 00:00:00 2001 From: royee Date: Tue, 4 Oct 2022 00:22:22 +0800 Subject: [PATCH 2/2] fix sub methods --- timex/timex.go | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/timex/timex.go b/timex/timex.go index 1d9621df1..c81d946a2 100644 --- a/timex/timex.go +++ b/timex/timex.go @@ -156,7 +156,7 @@ func (t *Time) AddDay(day int) *Time { // SubDay add some day time for the time func (t *Time) SubDay(day int) *Time { - return t.SubDay(day) + return t.AddSeconds(-day * OneDaySec) } // Tomorrow time. get tomorrow time for the time @@ -177,7 +177,7 @@ func (t *Time) AddHour(hours int) *Time { // SubHour add some hour time func (t *Time) SubHour(hours int) *Time { - return t.SubHour(hours) + return t.AddSeconds(-hours * OneHourSec) } // AddMinutes add some minutes time for the time @@ -187,7 +187,7 @@ func (t *Time) AddMinutes(minutes int) *Time { // SubMinutes add some minutes time for the time func (t *Time) SubMinutes(minutes int) *Time { - return t.SubMinutes(minutes * OneMinSec) + return t.AddSeconds(-minutes * OneMinSec) } // AddSeconds add some seconds time the time @@ -199,6 +199,15 @@ func (t *Time) AddSeconds(seconds int) *Time { } } +// SubSeconds add some seconds time the time +func (t *Time) SubSeconds(seconds int) *Time { + return &Time{ + Time: t.Add(time.Duration(-seconds) * time.Second), + // with layout + Layout: DefaultLayout, + } +} + // Diff calc diff duration for t - u. // alias of time.Time.Sub() func (t Time) Diff(u time.Time) time.Duration {