Revize 953981d4

parse csv message payload

aswi2021vochomurka/service/message_parser.py

@@ +1 @@
+from paho.mqtt.client import MQTTMessage
+
+from aswi2021vochomurka.model.Message import Message
+
+
+class ParseException(Exception):
+    pass
+
+
+def parse_mqtt_message(message: MQTTMessage) -> Message:
+    data = message.payload.decode("utf-8")
+    parts = data.split(";")
+    if len(parts) != 4:
+        raise ParseException
+
+    try:
+        return Message(
+            message.topic,
+            int(parts[2]),
+            parts[0],
+            parts[1],
+            float(parts[3])
+        )
+    except Exception as error:
+        raise ParseException from error

aswi2021vochomurka/service/mqtt/mqtt_subscriber.py

@@ -1 +1 @@
 import paho.mqtt.client as mqtt
 
+from aswi2021vochomurka.service.message_parser import parse_mqtt_message, ParseException
 from aswi2021vochomurka.service.subscriber import Subscriber
-from aswi2021vochomurka.model.Message import Message
 
 
 class MQTTSubscriber(Subscriber):
@@ -17 +17 @@
             client.subscribe(topic)
 
     # The callback for when a PUBLISH message is received from the server.
-    def on_message(self, client, userdata, message):
-        print(message.topic + " " + str(message.payload.decode("utf-8")))
-        m = Message(message.topic, 0, '', '', 1)
-        self.callback.onMessage(m)
+    def on_message(self, client, userdata, message: mqtt.MQTTMessage):
+        try:
+            m = parse_mqtt_message(message)
+            print(m)
+            self.callback.onMessage(m)
+        except ParseException as error:
+            print('invalid message data format')
+            # TODO better reaction on bad format
+            pass
 
     def on_disconnect(self, client, userdata, rc):
         self.callback.onDisconnected()