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

Correctly remove contextual timers from src/Timers.py

Browse source
This commit is contained in:
jesopo 2018-10-13 01:13:14 +01:00
parent 00e5890a92
commit 561d686643
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Timers.py
View file

@ -1,8 +1,9 @@
import time, uuid import time, uuid
class Timer(object): class Timer(object):
def __init__(self, id, name, delay, next_due, kwargs): def __init__(self, id, context, name, delay, next_due, kwargs):
self.id = id self.id = id
self.context = context
self.name = name self.name = name
self.delay = delay self.delay = delay
if next_due: if next_due:
@ -60,7 +61,12 @@ class Timers(object):
"name": timer.name, "delay": timer.delay, "name": timer.name, "delay": timer.delay,
"next-due": timer.next_due, "kwargs": timer.kwargs}) "next-due": timer.next_due, "kwargs": timer.kwargs})
def _remove(self, timer): def _remove(self, timer):
self.timers.remove(timer) if timer.context:
self.context_timers[timer.context].remove(timer)
if not self.context_timers[timer.context]:
del self.context_timers[timer.conteext]
else:
self.timers.remove(timer)
self.database.bot_settings.delete("timer-%s" % timer.id) self.database.bot_settings.delete("timer-%s" % timer.id)
def add(self, name, delay, next_due=None, **kwargs): def add(self, name, delay, next_due=None, **kwargs):
@ -69,7 +75,7 @@ class Timers(object):
self._add(None, name, delay, next_due, None, True, kwargs) self._add(None, name, delay, next_due, None, True, kwargs)
def _add(self, context, name, delay, next_due, id, persist, kwargs): def _add(self, context, name, delay, next_due, id, persist, kwargs):
id = id or uuid.uuid4().hex id = id or uuid.uuid4().hex
timer = Timer(id, name, delay, next_due, kwargs) timer = Timer(id, context, name, delay, next_due, kwargs)
if persist: if persist:
self._persist(timer) self._persist(timer)