pysmarlaapi 0.10.2__tar.gz → 0.10.3__tar.gz

{pysmarlaapi-0.10.2 → pysmarlaapi-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysmarlaapi
-Version: 0.10.2
+Version: 0.10.3
 Summary: Swing2Sleep Smarla API
 Author-email: Robin Lintermann <robin.lintermann@explicatis.com>
 Requires-Python: >=3.11

{pysmarlaapi-0.10.2 → pysmarlaapi-0.10.3}/pysmarlaapi/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.10.2"
+__version__ = "0.10.3"
 
 from .classes import Connection
 from .federwiege import Federwiege

{pysmarlaapi-0.10.2 → pysmarlaapi-0.10.3}/pysmarlaapi/connection_hub/__init__.py

@@ -38,6 +38,7 @@ class ConnectionHub:
         self,
         event_loop: asyncio.AbstractEventLoop,
         connection: Connection,
+        listener,
         max_delay: int = 256,
     ):
         self.connection: Connection = connection
@@ -47,7 +48,7 @@ class ConnectionHub:
 
         self.logger = logging.getLogger(f"{__package__}[{self.connection.token.serialNumber}]")
 
-        self.listeners = set()
+        self.connection_callback = listener
 
         self._running = False
         self._wake = asyncio.Event()
@@ -58,9 +59,11 @@ class ConnectionHub:
     async def notifycontrollerconnection(self, args):
         value = args[0]
         if value == "ControllerConnected":
-            await self.notify_listeners(True)
+            self.logger.info("Controller connected")
+            await self.connection_callback(True)
         else:
-            await self.notify_listeners(False)
+            self.logger.info("Controller disconnected")
+            await self.connection_callback(False)
 
     def setup(self):
         self.client = SignalRClient(self.connection.url + "/MobileAppHub", retry_count=1)
@@ -69,20 +72,6 @@ class ConnectionHub:
         self.client.on_error(self.on_error)
         self.client.on("SetNotifyAppConnectionCallback", self.notifycontrollerconnection)
 
-    def add_listener(self, listener):
-        if self.running:
-            return
-        self.listeners.add(listener)
-
-    def remove_listener(self, listener):
-        if self.running:
-            return
-        self.listeners.remove(listener)
-
-    async def notify_listeners(self, value):
-        for listener in self.listeners:
-            await listener(value)
-
     async def on_open_function(self):
         self._retry_delay = 1
         self.logger.info("Connection to server established")

{pysmarlaapi-0.10.2 → pysmarlaapi-0.10.3}/pysmarlaapi/federwiege/__init__.py

@@ -18,14 +18,14 @@ class Federwiege:
     def connected(self):
         return self.hub.connected
 
-    async def on_controller_connection_change(self, value):
+    async def on_connection_change(self, value):
         self.available = value
-        if value:
+        if self.available:
             self.sync()
 
     def __init__(self, event_loop: asyncio.AbstractEventLoop, connection: Connection):
         self.serial_number = connection.token.serialNumber
-        self.hub = ConnectionHub(event_loop, connection)
+        self.hub = ConnectionHub(event_loop, connection, self.on_connection_change)
         self.services: dict[str, Service] = {
             "babywiege": BabywiegeService(self.hub),
             "analyser": AnalyserService(self.hub),
@@ -66,7 +66,6 @@ class Federwiege:
         with self._lock:
             if self.registered:
                 return
-            self.registered = True
-            self.hub.add_listener(self.on_controller_connection_change)
             for service in self.services.values():
                 service.register()
+            self.registered = True