Public/libcron
1
0
Fork 0
mirror of https://github.com/PerMalmberg/libcron.git synced 2025-04-22 08:23:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added "convenience scheduling" using @yearly, @annually, @monthly, @weekly, @daily or @hourly. (#24)

Browse Source
This commit is contained in:
Peter Jansson 2021-12-20 08:16:36 +01:00 committed by GitHub
parent d4679b7c3c
commit a3b892a24a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@ -183,6 +183,17 @@ Each part is separated by one or more whitespaces. It is thus important to keep
`Day of month` and `day of week` are mutually exclusive so one of them must at always be ignored using `Day of month` and `day of week` are mutually exclusive so one of them must at always be ignored using
the '?'-character to ensure that it is not possible to specify a statement which results in an impossible mix of these fields. the '?'-character to ensure that it is not possible to specify a statement which results in an impossible mix of these fields.
## Convenience scheduling
These special time specification "nicknames" which replace the 5 initial time and date fields, and are prefixed with the '@' character, are supported:
@yearly : Run once a year, ie. "0 0 1 1 *".
@annually : Run once a year, ie. "0 0 1 1 *".
@monthly : Run once a month, ie. "0 0 1 * *".
@weekly : Run once a week, ie. "0 0 * * 0".
@daily : Run once a day, ie. "0 0 * * *".
@hourly : Run once an hour, ie. "0 * * * *".
## Examples ## Examples
|Expression | Meaning |Expression | Meaning
@ -191,6 +202,7 @@ the '?'-character to ensure that it is not possible to specify a statement which
| 0 0 12 * * MON-FRI | Every Weekday at noon | 0 0 12 * * MON-FRI | Every Weekday at noon
| 0 0 12 1/2 * ? | Every 2 days, starting on the 1st at noon | 0 0 12 1/2 * ? | Every 2 days, starting on the 1st at noon
| 0 0 */12 ? * * | Every twelve hours | 0 0 */12 ? * * | Every twelve hours
| @hourly | Every hour
# Randomization # Randomization

13
libcron/src/CronData.cpp
View File

@ -37,13 +37,22 @@ namespace libcron
void CronData::parse(const std::string& cron_expression) void CronData::parse(const std::string& cron_expression)
{ {
// First, split on white-space. We expect six parts. // First, check for "convenience scheduling" using @yearly, @annually,
// @monthly, @weekly, @daily or @hourly.
std::string tmp = std::regex_replace(cron_expression, std::regex("@yearly"), "0 0 1 1 *");
tmp = std::regex_replace(tmp, std::regex("@annually"), "0 0 1 1 *");
tmp = std::regex_replace(tmp, std::regex("@monthly"), "0 0 1 * *");
tmp = std::regex_replace(tmp, std::regex("@weekly"), "0 0 * * 0");
tmp = std::regex_replace(tmp, std::regex("@daily"), "0 0 * * *");
const std::string expression = std::regex_replace(tmp, std::regex("@hourly"), "0 * * * *");
// Second, split on white-space. We expect six parts.
std::regex split{ R"#(^\s*(.*?)\s+(.*?)\s+(.*?)\s+(.*?)\s+(.*?)\s+(.*?)\s*$)#", std::regex split{ R"#(^\s*(.*?)\s+(.*?)\s+(.*?)\s+(.*?)\s+(.*?)\s+(.*?)\s*$)#",
std::regex_constants::ECMAScript }; std::regex_constants::ECMAScript };
std::smatch match; std::smatch match;
if (std::regex_match(cron_expression.begin(), cron_expression.end(), match, split)) if (std::regex_match(expression.begin(), expression.end(), match, split))
{ {
valid = validate_numeric<Seconds>(match[1], seconds); valid = validate_numeric<Seconds>(match[1], seconds);
valid &= validate_numeric<Minutes>(match[2], minutes); valid &= validate_numeric<Minutes>(match[2], minutes);