Skip to content

Added handling for day-of-week spans that end in seven #2

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

Merged
notnoop merged 1 commit into from
May 7, 2020
Merged

Added handling for day-of-week spans that end in seven #2

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
4 changes: 4 additions & 0 deletions cronexpr_parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,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)
Expand Down
9 changes: 9 additions & 0 deletions cronexpr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,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
{
Expand Down