parra/ntfy
parra/ntfy
1
0
Fork 0
mirror of https://github.com/binwiederhier/ntfy.git synced 2025-06-12 23:53:19 +02:00
Code Releases Activity

Enhance some duration flags

Browse source
This commit is contained in:
binwiederhier 2023-02-27 14:34:05 -05:00
parent 217ca81b17
commit a3087047b6
4 changed files with 53 additions and 24 deletions

20
util/time.go
View file

@ -45,15 +45,9 @@ func ParseFutureTime(s string, now time.Time) (time.Time, error) {
return time.Time{}, errUnparsableTime
}
func parseFromDuration(s string, now time.Time) (time.Time, error) {
d, err := parseDuration(s)
if err == nil {
return now.Add(d), nil
}
return time.Time{}, errUnparsableTime
}
func parseDuration(s string) (time.Duration, error) {
// ParseDuration is like time.ParseDuration, except that it also understands days (d), which
// translates to 24 hours, e.g. "2d" or "20h".
func ParseDuration(s string) (time.Duration, error) {
d, err := time.ParseDuration(s)
if err == nil {
return d, nil
@ -80,6 +74,14 @@ func parseDuration(s string) (time.Duration, error) {
return 0, errUnparsableTime
}
func parseFromDuration(s string, now time.Time) (time.Time, error) {
d, err := ParseDuration(s)
if err == nil {
return now.Add(d), nil
}
return time.Time{}, errUnparsableTime
}
func parseUnixTime(s string, now time.Time) (time.Time, error) {
t, err := strconv.Atoi(s)
if err != nil {