From c90cbfc7be56c6044870b2ee113f8e51f76e2860 Mon Sep 17 00:00:00 2001 From: bel Date: Sat, 17 Jul 2021 22:51:54 -0600 Subject: [PATCH] support combo new and old --- server/ajax/form/form.go | 1 + server/ajax/form/form_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/server/ajax/form/form.go b/server/ajax/form/form.go index d9f0db2..793d5d6 100755 --- a/server/ajax/form/form.go +++ b/server/ajax/form/form.go @@ -83,6 +83,7 @@ func ToDuration(s string) time.Duration { for len(substr) > 0 && (substr[len(substr)-1] >= '0' && substr[len(substr)-1] <= '9') { substr = substr[:len(substr)-1] } + s = strings.ReplaceAll(s, substr, "") substr = strings.TrimSuffix(substr, c.key) n, _ := strconv.Atoi(substr) d += c.d * time.Duration(n) diff --git a/server/ajax/form/form_test.go b/server/ajax/form/form_test.go index 1ec324d..96f9cad 100755 --- a/server/ajax/form/form_test.go +++ b/server/ajax/form/form_test.go @@ -153,6 +153,7 @@ func TestToDuration(t *testing.T) { "simple": {input: "1s", want: time.Second}, "compound": {input: "1m1s", want: time.Minute + time.Second}, "compound:unsorted": {input: "1s1m", want: time.Minute + time.Second}, + "compound:extension": {input: "1d1m", want: time.Minute + time.Hour*24}, "extension:day": {input: "1d", want: 24 * time.Hour}, "extension:week": {input: "1w", want: 24 * 7 * time.Hour}, "extension:week,day": {input: "1w1d", want: 24 * 8 * time.Hour},