From baf6b83d532d9433e8a0e38691f310133dd00602 Mon Sep 17 00:00:00 2001 From: Keith Hughitt Date: Sat, 6 Feb 2021 15:09:32 -0500 Subject: [PATCH] Fixed an issue resulting --begin time adjustments leading to 0AD date --- z/helpers.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/z/helpers.go b/z/helpers.go index e7b8fca..76e6a60 100644 --- a/z/helpers.go +++ b/z/helpers.go @@ -65,7 +65,6 @@ func RelToTime(timeStr string, ftId int) (time.Time, error) { return time.Now(), errors.New("No match") } - var hours int = 0 var minutes int = 0 @@ -92,11 +91,17 @@ func RelToTime(timeStr string, ftId int) (time.Time, error) { func ParseTime(timeStr string) (time.Time, error) { tfId := GetTimeFormat(timeStr) + t:= time.Now() + switch tfId { case TFAbsTwelveHour: - return time.Parse("3:04pm", timeStr) + tadj, err := time.Parse("3:04pm", timeStr) + tnew := time.Date(t.Year(), t.Month(), t.Day(), tadj.Hour(), tadj.Minute(), t.Second(), t.Nanosecond(), t.Location()) + return tnew, err case TFAbsTwentyfourHour: - return time.Parse("15:04", timeStr) + tadj, err := time.Parse("15:04", timeStr) + tnew := time.Date(t.Year(), t.Month(), t.Day(), tadj.Hour(), tadj.Minute(), t.Second(), t.Nanosecond(), t.Location()) + return tnew, err case TFRelHourMinute, TFRelHourFraction: return RelToTime(timeStr, tfId) default: @@ -160,3 +165,4 @@ func GetGitLog(repo string, since time.Time, until time.Time) (string, string, e stdoutStr, stderrStr := string(stdout.Bytes()), string(stderr.Bytes()) return stdoutStr, stderrStr, nil } +