MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update Unittests and fix pep8

pull/2461/head
jarbasal 2020-02-02 06:00:48 +00:00 committed by Åke Forslund
parent cc8029a357
commit f4a96e6c22
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mycroft/skills/event_scheduler.py
View File

@ -106,9 +106,11 @@ class EventScheduler(Thread):
current_time = time.time()
e = self.events[event]
# Get scheduled times that has passed
passed = [(t, r, d, c) for (t, r, d, c) in e if t <= current_time]
passed = [(t, r, d, c) for
(t, r, d, c) in e if t <= current_time]
# and remaining times that we're still waiting for
remaining = [(t, r, d, c) for t, r, d, c in e if t > current_time]
remaining = [(t, r, d, c) for
t, r, d, c in e if t > current_time]
# Trigger registered methods
for sched_time, repeat, data, context in passed:
pending_messages.append(Message(event, data, context))
@ -126,7 +128,8 @@ class EventScheduler(Thread):
for msg in pending_messages:
self.bus.emit(msg)
def schedule_event(self, event, sched_time, repeat=None, data=None, context=None):
def schedule_event(self, event, sched_time, repeat=None,
data=None, context=None):
"""Add event to pending event schedule.
Arguments:
@ -134,7 +137,9 @@ class EventScheduler(Thread):
sched_time ([type]): [description]
repeat ([type], optional): Defaults to None. [description]
data ([type], optional): Defaults to None. [description]
context (dict, optional): message context to send when the handler is called
context (dict, optional): context (dict, optional): message
context to send when the
handler is called
"""
data = data or {}
with self.event_lock:
@ -285,7 +290,8 @@ class EventSchedulerInterface:
"""
return str(self.sched_id) + ':' + (name or '')
def _schedule_event(self, handler, when, data, name, repeat_interval=None, context=None):
def _schedule_event(self, handler, when, data, name,
repeat_interval=None, context=None):
"""Underlying method for schedule_event and schedule_repeating_event.
Takes scheduling information and sends it off on the message bus.
@ -299,8 +305,8 @@ class EventSchedulerInterface:
data (dict, optional): data to send when the handler is called
name (str, optional): reference name, must be unique
repeat_interval (float/int): time in seconds between calls
context (dict, optional): message context to send when the handler is called
context (dict, optional): message context to send
when the handler is called
"""
if isinstance(when, (int, float)) and when >= 0:
when = datetime.now() + timedelta(seconds=when)
@ -325,7 +331,8 @@ class EventSchedulerInterface:
self.bus.emit(Message('mycroft.scheduler.schedule_event',
data=event_data, context=context))
def schedule_event(self, handler, when, data=None, name=None, context=None):
def schedule_event(self, handler, when, data=None, name=None,
context=None):
"""Schedule a single-shot event.
Arguments:
@ -338,7 +345,8 @@ class EventSchedulerInterface:
NOTE: This will not warn or replace a
previously scheduled event of the same
name.
context (dict, optional): message context to send when the handler is called
context (dict, optional): message context to send
when the handler is called
"""
self._schedule_event(handler, when, data, name, context=context)
@ -355,7 +363,8 @@ class EventSchedulerInterface:
interval (float/int): time in seconds between calls
data (dict, optional): data to send when the handler is called
name (str, optional): reference name, must be unique
context (dict, optional): message context to send when the handler is called
context (dict, optional): message context to send
when the handler is called
"""
# Do not schedule if this event is already scheduled by the skill
if name not in self.scheduled_repeats:
@ -363,7 +372,8 @@ class EventSchedulerInterface:
# from now.
if not when:
when = datetime.now() + timedelta(seconds=interval)
self._schedule_event(handler, when, data, name, interval, context=context)
self._schedule_event(handler, when, data, name, interval,
context=context)
else:
LOG.debug('The event is already scheduled, cancel previous '
'event if this scheduling should replace the last.')

14
mycroft/skills/mycroft_skill/mycroft_skill.py
View File

@ -1257,7 +1257,8 @@ class MycroftSkill:
LOG.error('Failed to stop skill: {}'.format(self.name),
exc_info=True)
def schedule_event(self, handler, when, data=None, name=None, context=None):
def schedule_event(self, handler, when, data=None, name=None,
context=None):
"""Schedule a single-shot event.
Arguments:
@ -1270,10 +1271,13 @@ class MycroftSkill:
NOTE: This will not warn or replace a
previously scheduled event of the same
name.
context (dict, optional): message context to send when the handler is called
context (dict, optional): context (dict, optional): message
context to send when the handler
is called
"""
context = context or {"skill": self.name}
return self.event_scheduler.schedule_event(handler, when, data, name, context=context)
return self.event_scheduler.schedule_event(handler, when, data, name,
context=context)
def schedule_repeating_event(self, handler, when, frequency,
data=None, name=None, context=None):
@ -1288,7 +1292,9 @@ class MycroftSkill:
frequency (float/int): time in seconds between calls
data (dict, optional): data to send when the handler is called
name (str, optional): reference name, must be unique
context (dict, optional): message context to send when the handler is called
context (dict, optional): context (dict, optional): message
context to send when the handler
is called
"""
context = context or {"skill": self.name}
return self.event_scheduler.schedule_repeating_event(

2
test/unittests/skills/test_event_scheduler.py
View File

@ -79,7 +79,7 @@ class TestEventScheduler(unittest.TestCase):
# Make sure the dump method wasn't called with test-repeat
self.assertEqual(mock_dump.call_args[0][0],
{'test': [(900000000000, None, {})]})
{'test': [(900000000000, None, {}, None)]})
@patch('threading.Thread')
@patch('json.load')