michal/craftbeerpi3
1
0
Fork 0
mirror of https://github.com/Manuel83/craftbeerpi3 synced 2026-08-10 02:55:27 +02:00
Code Issues Releases Wiki Activity

Merge pull request #47 from jalim/hotfix/message-event-bus-patch

Browse Source 
Change to notification to use message event bus
This commit is contained in:
Manuel83
2017-06-28 09:32:44 +02:00
committed by GitHub
parent 10a989cee9 7d35538962
commit e67baeabb0
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/core.py
+1 -3
View File
@@ -224,9 +224,7 @@ class CraftBeerPi(ActorAPI, SensorAPI):
def notify(self, headline, message, type="success", timeout=5000): def notify(self, headline, message, type="success", timeout=5000):
self.beep() self.beep()
msg = {"id": str(uuid.uuid1()), "type": type, "headline": headline, "message": message, "timeout": timeout} msg = {"id": str(uuid.uuid1()), "type": type, "headline": headline, "message": message, "timeout": timeout}
if timeout is None: self.emit_message(msg)
self.cache["messages"].append(msg)
self.emit("NOTIFY", msg)
def beep(self): def beep(self):
if self.buzzer is not None: if self.buzzer is not None:
modules/notification/__init__.py
+3 -4
View File
@@ -32,10 +32,9 @@ def messageEvent(message, **kwargs):
:param kwargs: other parameter :param kwargs: other parameter
:return: None :return: None
""" """
if message["timeout"] is None:
msg = {"id": len(cbpi.cache["messages"]), "type": "info", "message": message, "read": False} cbpi.cache["messages"].append(message)
cbpi.cache["messages"].append(msg) cbpi.emit("NOTIFY", message)
cbpi.emit('MESSAGE', msg,)
@cbpi.initalizer(order=2) @cbpi.initalizer(order=2)
def init(cbpi): def init(cbpi):