Nulo/zeit
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #10 from khughitt/main

Browse source 
Fixed an issue resulting --begin time adjustments leading to 0AD date
This commit is contained in:
マリウス 2021-02-07 13:49:11 -04:00 committed by GitHub
commit 2214da8e38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
z/helpers.go
View file

@ -65,7 +65,6 @@ func RelToTime(timeStr string, ftId int) (time.Time, error) {
return time.Now(), errors.New("No match") return time.Now(), errors.New("No match")
} }
var hours int = 0 var hours int = 0
var minutes 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) { func ParseTime(timeStr string) (time.Time, error) {
tfId := GetTimeFormat(timeStr) tfId := GetTimeFormat(timeStr)
t:= time.Now()
switch tfId { switch tfId {
case TFAbsTwelveHour: 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: 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: case TFRelHourMinute, TFRelHourFraction:
return RelToTime(timeStr, tfId) return RelToTime(timeStr, tfId)
default: 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()) stdoutStr, stderrStr := string(stdout.Bytes()), string(stderr.Bytes())
return stdoutStr, stderrStr, nil return stdoutStr, stderrStr, nil
} }