Revize 1c9b8c16

Re #8489 - move subscriber to service package

aswi2021vochomurka/service/mqtt/mqtt_subscriber.py

@@ +1 @@
+import paho.mqtt.client as mqtt
+
+from aswi2021vochomurka.service.subscriber import Subscriber
+
+
+class MQTTSubscriber(Subscriber):
+
+    # The callback for when the client receives a CONNACK response from the server.
+    def on_connect(self, client, userdata, flags, rc, properties=None):
+        print("Connected with result code " + str(rc))
+        self.connected.emit()
+        # Subscribing in on_connect() means that if we lose the connection and
+        # reconnect then subscriptions will be renewed.
+        client.subscribe("#")
+
+    # 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")))
+        self.newMessage.emit(message.topic + " " + str(message.payload.decode("utf-8")))
+
+    def on_disconnect(self, client, userdata, rc):
+        self.disconnected.emit()
+
+    def start(self):
+        client = mqtt.Client()
+        client.on_connect = self.on_connect
+        client.on_message = self.on_message
+        client.on_disconnect = self.on_disconnect
+
+        try:
+            client.connect("localhost", 1884, 60)
+        except Exception as error:
+            self.error.emit(error)
+            return
+
+        client.loop_forever()

aswi2021vochomurka/service/subscriber.py

@@ -1 @@
-import paho.mqtt.client as mqtt
+from PyQt5.QtCore import pyqtSignal, QObject
 
 
-class MQTTSubscriber:
+class Subscriber(QObject):
+    connected = pyqtSignal()
+    disconnected = pyqtSignal()
+    error = pyqtSignal(Exception)
+    newMessage = pyqtSignal(str)
 
-    # The callback for when the client receives a CONNACK response from the server.
-    def on_connect(self, client, userdata, flags, rc, properties=None):
-        print("Connected with result code " + str(rc))
-        # Subscribing in on_connect() means that if we lose the connection and
-        # reconnect then subscriptions will be renewed.
-        client.subscribe("#")
-
-    # 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")))
-
-    def start(self):
-        client = mqtt.Client()
-        client.on_connect = self.on_connect
-        client.on_message = self.on_message
-
-        client.connect("localhost", 1883, 60)
-
-        # Blocking call that processes network traffic, dispatches callbacks and
-        # handles reconnecting.
-        # Other loop*() functions are available that give a threaded interface and a
-        # manual interface.
-        client.loop_forever()
+    def start(self): raise NotImplementedError

aswi2021vochomurka/view/main_view.py

@@ -1 @@
-from PyQt5.QtCore import QSize, QObject, pyqtSignal, QThread
+from PyQt5.QtCore import QSize, QThread
 from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit
-import paho.mqtt.client as mqtt
 
-
-class Worker(QObject):
-    connected = pyqtSignal()
-    newMessage = pyqtSignal(str)
-
-    def on_connect(self, client, userdata, flags, rc, properties=None):
-        print("Connected with result code " + str(rc))
-        self.connected.emit()
-        # Subscribing in on_connect() means that if we lose the connection and
-        # reconnect then subscriptions will be renewed.
-        client.subscribe("#")
-
-    # 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")))
-        self.newMessage.emit(message.topic + " " + str(message.payload.decode("utf-8")))
-
-    def start(self):
-        client = mqtt.Client()
-        client.on_connect = self.on_connect
-        client.on_message = self.on_message
-
-        client.connect("localhost", 1883, 60)
-
-        # Blocking call that processes network traffic, dispatches callbacks and
-        # handles reconnecting.
-        # Other loop*() functions are available that give a threaded interface and a
-        # manual interface.
-        client.loop_forever()
+from aswi2021vochomurka.service.mqtt.mqtt_subscriber import MQTTSubscriber
 
 
 class MainView(QMainWindow):
+    worker = None
+    workerThread = None
 
     def __init__(self):
         QMainWindow.__init__(self)
@@ -47 +20 @@
         self.b.move(10, 10)
         self.b.resize(400, 200)
 
-        self.thread = QThread()
-        self.worker = Worker()
-        self.worker.moveToThread(self.thread)
-        self.thread.started.connect(self.worker.start)
+        self.initSubscriber()
+
+    def initSubscriber(self):
+        self.workerThread = QThread()
+        self.worker = MQTTSubscriber()
+        self.worker.moveToThread(self.workerThread)
+        self.workerThread.started.connect(self.worker.start)
         self.worker.newMessage.connect(
             lambda message: self.b.insertPlainText(message + "\n")
         )
-
-        self.thread.start()
+        self.workerThread.start()