Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

correctly handle cron / "step" schedule

Browse source
This commit is contained in:
jesopo 2020-02-09 22:55:20 +00:00
parent 5d52ffdb46
commit 6982edcb78
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/core_modules/cron.py
View file

@ -1,6 +1,14 @@
import datetime, time import datetime, time
from src import ModuleManager, utils from src import ModuleManager, utils
TIMESTAMP_BOUNDS = [
[0, 59],
[0, 23],
[1, 31],
[1, 12],
[0, 6],
]
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def on_load(self): def on_load(self):
now = datetime.datetime.utcnow() now = datetime.datetime.utcnow()
@ -24,20 +32,29 @@ class Module(ModuleManager.BaseModule):
cron.call(event) cron.call(event)
def _schedule_match(self, timestamp, schedule): def _schedule_match(self, timestamp, schedule):
for timestamp_part, schedule_part in zip(timestamp, schedule): items = enumerate(zip(timestamp, schedule))
if not self._schedule_match_part(timestamp_part, schedule_part): for i, (timestamp_part, schedule_part) in items:
if not self._schedule_match_part(i, timestamp_part, schedule_part):
return False return False
return True return True
def _schedule_match_part(self, timestamp_part, schedule_part): def _schedule_match_part(self, i, timestamp_part, schedule_part):
if "," in schedule_part: if "," in schedule_part:
for schedule_part in schedule_part.split(","): for schedule_part in schedule_part.split(","):
if self._schedule_match_part([timestamp_part], [schedule_part]): if self._schedule_match_part([timestamp_part], [schedule_part]):
return True return True
elif schedule_part.startswith("*/"): elif "/" in schedule_part:
schedule_step = int(schedule_part.split("*/", 1)[1]) range_s, _, step = schedule_part.partition("/")
if (timestamp_part%schedule_step) == 0: if "-" in range_s:
range_min, _, range_max = range_s.partition("-")
range_min = int(range_min)
range_max = int(range_max)
else:
range_min, range_max = TIMESTAMP_BOUNDS[i]
if (range_min <= timestamp_part <= range_max and
((timestamp_part-range_min)%int(step)) == 0):
return True return True
elif "-" in schedule_part: elif "-" in schedule_part: