Cleaning up code

This commit is contained in:
Paulus Schoutsen committed 2013-09-20 10:00:31 -07:00
1 parent 90c343d16b
commit 7636092c7d
10 files changed
+403 -423

No files matched your search

+34 -35
View File
@@ -1,4 +1,4 @@
from collections import defaultdict, namedtuple
from collections import namedtuple
from threading import RLock
from datetime import datetime
@@ -7,54 +7,53 @@ from app.util import ensure_list, matcher
EVENT_STATE_CHANGED = "state_changed"
state = namedtuple("State", ['state','last_changed'])
State = namedtuple("State", ['state','last_changed'])
class StateMachine:
class StateMachine(object):
def __init__(self, eventBus):
self.states = dict()
self.eventBus = eventBus
self.lock = RLock()
def __init__(self, eventbus):
self.states = dict()
self.eventbus = eventbus
self.lock = RLock()
def add_category(self, category, initialState):
self.states[category] = state(initialState, datetime.now())
def add_category(self, category, initial_state):
self.states[category] = State(initial_state, datetime.now())
def set_state(self, category, newState):
self.lock.acquire()
def set_state(self, category, new_state):
self.lock.acquire()
assert category in self.states, "Category does not exist: {}".format(category)
oldState = self.states[category]
assert category in self.states, "Category does not exist: {}".format(category)
if oldState.state != newState:
self.states[category] = state(newState, datetime.now())
old_state = self.states[category]
self.eventBus.fire(Event(EVENT_STATE_CHANGED, {'category':category, 'oldState':oldState, 'newState':self.states[category]}))
if old_state.state != new_state:
self.states[category] = State(new_state, datetime.now())
self.lock.release()
self.eventbus.fire(Event(EVENT_STATE_CHANGED, {'category':category, 'old_state':old_state, 'new_state':self.states[category]}))
def get_state(self, category):
assert category in self.states, "Category does not exist: {}".format(category)
self.lock.release()
return self.states[category]
def get_state(self, category):
assert category in self.states, "Category does not exist: {}".format(category)
def get_states(self):
for category in sorted(self.states.keys()):
yield category, self.states[category].state, self.states[category].last_changed
return self.states[category]
def get_states(self):
for category in sorted(self.states.keys()):
yield category, self.states[category].state, self.states[category].last_changed
def track_state_change(eventBus, category, fromState, toState, action):
fromState = ensure_list(fromState)
toState = ensure_list(toState)
def track_state_change(eventbus, category, from_state, to_state, action):
from_state = ensure_list(from_state)
to_state = ensure_list(to_state)
def listener(event):
assert isinstance(event, Event), "event needs to be of Event type"
def listener(event):
assert isinstance(event, Event), "event needs to be of Event type"
if category == event.data['category'] and \
matcher(event.data['oldState'].state, fromState) and \
matcher(event.data['newState'].state, toState):
action(event.data['category'], event.data['oldState'], event.data['newState'])
if category == event.data['category'] and \
matcher(event.data['old_state'].state, from_state) and \
matcher(event.data['new_state'].state, to_state):
eventBus.listen(EVENT_STATE_CHANGED, listener)
action(event.data['category'], event.data['old_state'], event.data['new_state'])
eventbus.listen(EVENT_STATE_CHANGED, listener)