Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix negative duration parsing #144

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix negative duration parsing #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions duration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var (
"w": 7 * 24 * time.Hour,
}

durationMatcher = regexp.MustCompile(`((\d+)\s*([A-Za-zµ]+))`)
durationMatcher = regexp.MustCompile(`(((?:-\s?)?\d+)\s*([A-Za-zµ]+))`)
)

// IsDuration returns true if the provided string is a valid duration
Expand Down Expand Up @@ -98,10 +98,19 @@ func ParseDuration(cand string) (time.Duration, error) {
ok := false
for _, match := range durationMatcher.FindAllStringSubmatch(cand, -1) {

factor, err := strconv.Atoi(match[2]) // converts string to int
// remove possible leading - and spaces
value, negative := strings.CutPrefix(match[2], "-")

// if the string is a valid duration, parse it
factor, err := strconv.Atoi(strings.TrimSpace(value)) // converts string to int
if err != nil {
return 0, err
}

if negative {
factor = -factor
}

unit := strings.ToLower(strings.TrimSpace(match[3]))

for _, variants := range timeUnits {
Expand Down
14 changes: 10 additions & 4 deletions duration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ func TestDurationScanner_Nil(t *testing.T) {

func TestDurationParser(t *testing.T) {
testcases := map[string]time.Duration{

// parse the short forms without spaces
"1ns": 1 * time.Nanosecond,
"1us": 1 * time.Microsecond,
Expand Down Expand Up @@ -182,10 +181,18 @@ func TestDurationParser(t *testing.T) {
}

for str, dur := range testcases {
testDurationParser(t, str, dur)
testDurationSQLScanner(t, dur)
t.Run(str, func(t *testing.T) {
testDurationParser(t, str, dur)

// negative duration
testDurationParser(t, "-"+str, -dur)
testDurationParser(t, "- "+str, -dur)

testDurationSQLScanner(t, dur)
})
}
}

func TestIsDuration_Caveats(t *testing.T) {
// This works too
e := IsDuration("45 weeks")
Expand All @@ -206,7 +213,6 @@ func TestIsDuration_Caveats(t *testing.T) {
// This does not work
e = IsDuration("12 phours")
assert.False(t, e)

}

func TestDeepCopyDuration(t *testing.T) {
Expand Down