Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions hatasmota/status_sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ class TasmotaStatusSensor(TasmotaAvailability, TasmotaEntity):
def __init__(self, **kwds):
"""Initialize."""
self._sub_state = None
self._sub_state_lock = asyncio.Lock()
self._attributes = {}
super().__init__(**kwds)

Expand Down Expand Up @@ -229,24 +230,27 @@ def state_message_received(msg):
}
topics = {**topics, **availability_topics}

self._sub_state = await self._mqtt_client.subscribe(
self._sub_state,
topics,
)
async with self._sub_state_lock:
self._sub_state = await self._mqtt_client.subscribe(
self._sub_state,
topics,
)
if self._cfg.state:
self._on_state_callback(self._cfg.state)

async def _unsubscribe_state_topics(self):
"""Unsubscribe from state topics."""
availability_topics = self.get_availability_topics()
self._sub_state = await self._mqtt_client.subscribe(
self._sub_state,
availability_topics,
)
async with self._sub_state_lock:
self._sub_state = await self._mqtt_client.subscribe(
self._sub_state,
availability_topics,
)

async def unsubscribe_topics(self):
"""Unsubscribe from all MQTT topics."""
self._sub_state = await self._mqtt_client.unsubscribe(self._sub_state)
async with self._sub_state_lock:
self._sub_state = await self._mqtt_client.unsubscribe(self._sub_state)

@property
def quantity(self):
Expand Down