Further reorg of code and bug fixes
This commit is contained in:
1 parent
b20bd6c9c0
commit
a96919f902
6 files changed
+95
-87
No files matched your search
+11
-8
@@ -1,11 +1,14 @@
|
||||
from collections import defaultdict
|
||||
from collections import defaultdict, namedtuple
|
||||
from threading import RLock
|
||||
from datetime import datetime
|
||||
|
||||
from app.EventBus import Event
|
||||
from app.util import ensure_list, matcher
|
||||
|
||||
EVENT_STATE_CHANGED = "state_changed"
|
||||
|
||||
state = namedtuple("State", ['state','last_changed'])
|
||||
|
||||
class StateMachine:
|
||||
|
||||
def __init__(self, eventBus):
|
||||
@@ -14,7 +17,7 @@ class StateMachine:
|
||||
self.lock = RLock()
|
||||
|
||||
def add_category(self, category, initialState):
|
||||
self.states[category] = initialState
|
||||
self.states[category] = state(initialState, datetime.now())
|
||||
|
||||
def set_state(self, category, newState):
|
||||
self.lock.acquire()
|
||||
@@ -23,17 +26,17 @@ class StateMachine:
|
||||
|
||||
oldState = self.states[category]
|
||||
|
||||
if oldState != newState:
|
||||
self.states[category] = newState
|
||||
if oldState.state != newState:
|
||||
self.states[category] = state(newState, datetime.now())
|
||||
|
||||
self.eventBus.fire(Event(EVENT_STATE_CHANGED, {'category':category, 'oldState':oldState, 'newState':newState}))
|
||||
self.eventBus.fire(Event(EVENT_STATE_CHANGED, {'category':category, 'oldState':oldState, 'newState':self.states[category]}))
|
||||
|
||||
self.lock.release()
|
||||
|
||||
def get_state(self, category):
|
||||
assert category in self.states, "Category does not exist: {}".format(category)
|
||||
|
||||
return self.states[category]
|
||||
return self.states[category]
|
||||
|
||||
|
||||
def track_state_change(eventBus, category, fromState, toState, action):
|
||||
@@ -44,8 +47,8 @@ def track_state_change(eventBus, category, fromState, toState, action):
|
||||
assert isinstance(event, Event), "event needs to be of Event type"
|
||||
|
||||
if category == event.data['category'] and \
|
||||
matcher(event.data['oldState'], fromState) and \
|
||||
matcher(event.data['newState'], toState):
|
||||
matcher(event.data['oldState'].state, fromState) and \
|
||||
matcher(event.data['newState'].state, toState):
|
||||
|
||||
action(event.data['category'], event.data['oldState'], event.data['newState'])
|
||||
|
||||
|
||||
Reference in new issue
Block a user