nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

WIP Simplify ModuleEvent with functools package

Browse source
This commit is contained in:
nemunaire 2017-09-01 20:46:58 +02:00
commit ce4140ade8
1 changed files with 8 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

69
nemubot/event/__init__.py
View file

@ -21,49 +21,29 @@ class ModuleEvent:
"""Representation of a event initiated by a bot module""" """Representation of a event initiated by a bot module"""
def __init__(self, call=None, call_data=None, func=None, func_data=None, def __init__(self, call=None, cmp=None, interval=60, offset=0, times=1):
cmp=None, cmp_data=None, interval=60, offset=0, times=1):
"""Initialize the event """Initialize the event
Keyword arguments: Keyword arguments:
call -- Function to call when the event is realized call -- Function to call when the event is realized
call_data -- Argument(s) (single or dict) to pass as argument
func -- Function called to check
func_data -- Argument(s) (single or dict) to pass as argument OR if no func, initial data to watch
cmp -- Boolean function called to check changes cmp -- Boolean function called to check changes
cmp_data -- Argument(s) (single or dict) to pass as argument OR if no cmp, data compared to previous
interval -- Time in seconds between each check (default: 60) interval -- Time in seconds between each check (default: 60)
offset -- Time in seconds added to interval before the first check (default: 0) offset -- Time in seconds added to interval before the first check (default: 0)
times -- Number of times the event has to be realized before being removed; -1 for no limit (default: 1) times -- Number of times the event has to be realized before being removed; -1 for no limit (default: 1)
""" """
# What have we to check?
self.func = func
self.func_data = func_data
# How detect a change? # How detect a change?
self.cmp = cmp self.cmp = cmp
self.cmp_data = None
if cmp_data is not None:
self.cmp_data = cmp_data
elif self.func is not None:
if self.func_data is None:
self.cmp_data = self.func()
elif isinstance(self.func_data, dict):
self.cmp_data = self.func(**self.func_data)
else:
self.cmp_data = self.func(self.func_data)
# What should we call when? # What should we call when?
self.call = call self.call = call
if call_data is not None:
self.call_data = call_data
else:
self.call_data = func_data
# Store times # Time to wait before the first check
self.offset = timedelta(seconds=offset) # Time to wait before the first check if isinstance(offset, timedelta):
self.offset = offset
else:
self.offset = timedelta(seconds=offset)
self.interval = timedelta(seconds=interval) self.interval = timedelta(seconds=interval)
self._next = None # Cache self._next = None # Cache
@ -91,41 +71,6 @@ class ModuleEvent:
def check(self): def check(self):
"""Run a check and realized the event if this is time""" """Run a check and realized the event if this is time"""
# Get initial data if self.cmp():
if self.func is None:
d_init = self.func_data
elif self.func_data is None:
d_init = self.func()
elif isinstance(self.func_data, dict):
d_init = self.func(**self.func_data)
else:
d_init = self.func(self.func_data)
# then compare with current data
if self.cmp is None:
if self.cmp_data is None:
rlz = True
else:
rlz = (d_init != self.cmp_data)
elif self.cmp_data is None:
rlz = self.cmp(d_init)
elif isinstance(self.cmp_data, dict):
rlz = self.cmp(d_init, **self.cmp_data)
else:
rlz = self.cmp(d_init, self.cmp_data)
if rlz:
self.times -= 1 self.times -= 1
# Call attended function
if self.call_data is None:
if d_init is None:
self.call() self.call()
else:
self.call(d_init)
elif isinstance(self.call_data, dict):
self.call(d_init, **self.call_data)
elif d_init is None:
self.call(self.call_data)
else:
self.call(d_init, self.call_data)