From b2b968fa7db9abb871b405d3c7f7863d62a34791 Mon Sep 17 00:00:00 2001 From: Paul Kirby Date: Thu, 19 May 2016 11:38:53 -0600 Subject: [PATCH] Added handling for day-of-week spans that end in seven --- cronexpr_parse.go | 4 ++++ cronexpr_test.go | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/cronexpr_parse.go b/cronexpr_parse.go index aeb8296..8b81ca0 100644 --- a/cronexpr_parse.go +++ b/cronexpr_parse.go @@ -317,6 +317,10 @@ func (expr *Expression) dowFieldHandler(s string) error { case one: populateOne(expr.daysOfWeek, directive.first) case span: + // To properly handle spans that end in 7 (Sunday) + if directive.last == 0 { + directive.last = 6 + } populateMany(expr.daysOfWeek, directive.first, directive.last, directive.step) case all: populateMany(expr.daysOfWeek, directive.first, directive.last, directive.step) diff --git a/cronexpr_test.go b/cronexpr_test.go index b729170..3e68515 100644 --- a/cronexpr_test.go +++ b/cronexpr_test.go @@ -141,6 +141,15 @@ var crontests = []crontest{ {"2013-12-30 00:30:00", "Sat 2014-01-04 00:00"}, }, }, + { + "0 0 * * 5-7", + "Mon 2006-01-02 15:04", + []crontimes{ + {"2013-01-01 00:00:00", "Fri 2013-01-04 00:00"}, + {"2013-01-28 00:00:00", "Fri 2013-02-01 00:00"}, + {"2013-12-30 00:30:00", "Fri 2014-01-03 00:00"}, + }, + }, // Specific days of week {