From a6e117ffd9966a0d94da6bb863cd18efce288bbe Mon Sep 17 00:00:00 2001
From: Ralf Ramsauer <ralf@binary-kitchen.de>
Date: Sun, 18 Mar 2018 17:47:50 +0100
Subject: [PATCH] doorlockd.py: move emit status to Logic class

Signed-off-by: Ralf Ramsauer <ralf@binary-kitchen.de>
---
 doorlockd-new/doorlockd.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/doorlockd-new/doorlockd.py b/doorlockd-new/doorlockd.py
index b6844bc..7aec9c2 100755
--- a/doorlockd-new/doorlockd.py
+++ b/doorlockd-new/doorlockd.py
@@ -183,8 +183,18 @@ class Logic:
 
     def request(self, state, credentials):
         err = self._request(state, credentials)
+        self.emit_status(err)
         return err
 
+    def emit_status(self, message=None):
+        led = self.state.to_img()
+        if message is None:
+            message = self.state.to_html()
+        else:
+            message = message.to_html()
+
+        socketio.emit('status', {'led': led, 'message': message})
+
     @property
     def state(self):
         return self.door_handler.state
@@ -210,19 +220,9 @@ class AuthenticationForm(FlaskForm):
         return True
 
 
-def emit_status(message=None):
-    led = logic.state.to_img()
-    if message is None:
-        message = logic.state.to_html()
-    else:
-        message = message.to_html()
-
-    socketio.emit('status', {'led': led, 'message': message})
-
-
 @socketio.on('connect')
 def on_connect():
-	emit_status()
+	logic.emit_status()
 
 
 @webapp.route('/display')
@@ -252,8 +252,6 @@ def home():
         # Don't trust python, zero credentials
         user = password = credentials = None
 
-    emit_status(response)
-
     return render_template('index.html',
                            authentication_form=authentication_form,
                            response=response,