Revize 2bef6e38

Re #8566 - setup callback

aswi2021vochomurka/model/Message.py

@@ +1 @@
+from recordclass import RecordClass
+
+
+class Message(RecordClass):
+    topic: str
+    index: int
+    date: str
+    time: str
+    value: float

aswi2021vochomurka/service/mqtt/mqtt_subscriber.py

@@ -1 +1 @@
 import paho.mqtt.client as mqtt
 
 from aswi2021vochomurka.service.subscriber import Subscriber
+from aswi2021vochomurka.model.Message import Message
 
 
 class MQTTSubscriber(Subscriber):
@@ -8 +9 @@
     # 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()
+        self.callback.onConnected()
         # Subscribing in on_connect() means that if we lose the connection and
         # reconnect then subscriptions will be renewed.
         client.subscribe("#")
@@ -16 +17 @@
     # 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")))
+        m = Message(message.topic, 0, '', '', 1)
+        self.callback.onMessage(m)
 
     def on_disconnect(self, client, userdata, rc):
-        self.disconnected.emit()
+        self.callback.onDisconnected()
 
     def start(self):
         client = mqtt.Client()

aswi2021vochomurka/service/subscriber.py

@@ -1 +1 @@
 from PyQt5.QtCore import pyqtSignal, QObject
 
+from aswi2021vochomurka.service.subscriber_callback import SubscriberCallback
 
-class Subscriber(QObject):
-    connected = pyqtSignal()
-    disconnected = pyqtSignal()
-    error = pyqtSignal(Exception)
-    newMessage = pyqtSignal(str)
+
+class Subscriber:
+    callback: SubscriberCallback
+
+    def __init__(self, callback: SubscriberCallback):
+        self.callback = callback
 
     def start(self): raise NotImplementedError

aswi2021vochomurka/service/subscriber_callback.py

@@ +1 @@
+from aswi2021vochomurka.model.Message import Message
+
+
+class SubscriberCallback:
+    def onConnected(self): raise NotImplementedError
+
+    def onDisconnected(self): raise NotImplementedError
+
+    def onError(self): raise NotImplementedError
+
+    def onMessage(self, message: Message): raise NotImplementedError

aswi2021vochomurka/view/main_view.py

@@ -1 @@
-from PyQt5.QtCore import QSize, QThread
+from PyQt5.QtCore import QSize, QThread, QObject, pyqtSignal
 from PyQt5.QtWidgets import QMainWindow, QPlainTextEdit
 
+from aswi2021vochomurka.model.Message import Message
 from aswi2021vochomurka.service.mqtt.mqtt_subscriber import MQTTSubscriber
+from aswi2021vochomurka.service.subscriber import Subscriber
+from aswi2021vochomurka.service.subscriber_callback import SubscriberCallback
+
+
+class Worker(QObject, SubscriberCallback):
+    connected = pyqtSignal()
+    disconnected = pyqtSignal()
+    error = pyqtSignal(Exception)
+    newMessage = pyqtSignal(str)
+    subscriber: Subscriber = None
+
+    def start(self):
+        self.subscriber = MQTTSubscriber(self)
+        self.subscriber.start()
+
+    def onConnected(self):
+        self.connected.emit()
+
+    def onDisconnected(self):
+        self.disconnected.emit()
+
+    def onError(self):
+        self.error.emit()
+
+    def onMessage(self, message: Message):
+        self.newMessage.emit(message.topic)
 
 
 class MainView(QMainWindow):
-    worker = None
-    workerThread = None
+    worker: Worker = None
+    workerThread: QThread = None
 
     def __init__(self):
         QMainWindow.__init__(self)
@@ -24 +51 @@
 
     def initSubscriber(self):
         self.workerThread = QThread()
-        self.worker = MQTTSubscriber()
+        self.worker = Worker()
         self.worker.moveToThread(self.workerThread)
         self.workerThread.started.connect(self.worker.start)
         self.worker.newMessage.connect(

poetry.lock

@@ -26 +26 @@
 optional = false
 python-versions = ">=3.5"
 
+[[package]]
+name = "recordclass"
+version = "0.14.3"
+description = "Mutable variants of tuple (mutabletuple) and collections.namedtuple (recordclass), which support assignments and more memory saving variants (dataobject, structclass, litelist, ...)."
+category = "main"
+optional = false
+python-versions = "*"
+
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "095d3d22c000ec45381dc27326be154edd194e5d574bc0af2941f0cf8a385159"
+content-hash = "2880a04cfc48e9d672fd4b9e4a1f82906e5f77f098ecbd615194242e0ee76ad0"
 
 [metadata.files]
 pyqt5 = [
@@ -68 +76 @@
     {file = "PyQt5_sip-12.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:f168f0a7f32b81bfeffdf003c36f25d81c97dee5eb67072a5183e761fe250f13"},
     {file = "PyQt5_sip-12.8.1.tar.gz", hash = "sha256:30e944db9abee9cc757aea16906d4198129558533eb7fadbe48c5da2bd18e0bd"},
 ]
+recordclass = [
+    {file = "recordclass-0.14.3-cp27-cp27m-win32.whl", hash = "sha256:016a70b9e1d93e184a065a23d9bd15387c154375a166fd8868db96f362d77d94"},
+    {file = "recordclass-0.14.3-cp27-cp27m-win_amd64.whl", hash = "sha256:c9941edde67077f95e83dfd69795b2bc6cff13e05ef537b4a57cddfb8fac55f9"},
+    {file = "recordclass-0.14.3-cp36-cp36m-win32.whl", hash = "sha256:867f94a6c96474e2b52d50359adbcd1eaf18202c11654b662022a700831dfb7d"},
+    {file = "recordclass-0.14.3-cp36-cp36m-win_amd64.whl", hash = "sha256:3ced6c8d7d34d573fd7f926b47b5cdb2875b986841f1464eb9d41777edb63f7e"},
+    {file = "recordclass-0.14.3-cp37-cp37m-win32.whl", hash = "sha256:2c7dd437b2d766954e0468bdd49e444f24fc82bb080f57a4901e3718c678fcf6"},
+    {file = "recordclass-0.14.3-cp37-cp37m-win_amd64.whl", hash = "sha256:3c885d6d92c3306846c36797a03712e7c9dea6cc01b61f45305a815c87ea5a0c"},
+    {file = "recordclass-0.14.3-cp38-cp38-win32.whl", hash = "sha256:b5c25065b5d2825122fd67ac43053033bd85c209b261264ca3e2460b8308336d"},
+    {file = "recordclass-0.14.3-cp38-cp38-win_amd64.whl", hash = "sha256:57ba80fe2b3fc61cd878b3cd90ca1445a48292baf5d154055d671dc76c521bc1"},
+    {file = "recordclass-0.14.3-cp39-cp39-win32.whl", hash = "sha256:8a99639842291349667133a0c4076b2e5e483c4628da342715072037902d5884"},
+    {file = "recordclass-0.14.3-cp39-cp39-win_amd64.whl", hash = "sha256:176af306e9b3a13a97b3e8e87228a2975f87173048ab5eafbd0ba9f2838cadb0"},
+    {file = "recordclass-0.14.3.tar.gz", hash = "sha256:f2a0a42ec1128be81e28b8ba82ef1a1dccc41efbec6ecf97866915649645222f"},
+]

pyproject.toml

@@ -7 +7 @@
 [tool.poetry.dependencies]
 python = "^3.8"
 PyQt5 = "^5.15.4"
+recordclass = "^0.14.3"
 
 [tool.poetry.dev-dependencies]