Skip to content

Commit e97eeaa

Browse files
bouwewbouwew
committed
Use match-case construct in get_state()
1 parent 54694ee commit e97eeaa

File tree

6 files changed

+85
-67
lines changed

6 files changed

+85
-67
lines changed

‎plugwise_usb/nodes/circle.py‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,34 +1158,35 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
11581158
f"Update of feature '{feature}' is not supported for {self.name}"
11591159
)
11601160

1161-
if feature == NodeFeature.ENERGY:
1162-
states[feature] = await self.energy_update()
1163-
_LOGGER.debug(
1164-
"async_get_state %s - energy: %s",
1165-
self._mac_in_str,
1166-
states[feature],
1167-
)
1168-
elif feature == NodeFeature.RELAY:
1169-
states[feature] = self._relay_state
1170-
_LOGGER.debug(
1171-
"async_get_state %s - relay: %s",
1172-
self._mac_in_str,
1173-
states[feature],
1174-
)
1175-
elif feature == NodeFeature.RELAY_LOCK:
1176-
states[feature] = self._relay_lock
1177-
elif feature == NodeFeature.RELAY_INIT:
1178-
states[feature] = self._relay_config
1179-
elif feature == NodeFeature.POWER:
1180-
states[feature] = await self.power_update()
1181-
_LOGGER.debug(
1182-
"async_get_state %s - power: %s",
1183-
self._mac_in_str,
1184-
states[feature],
1185-
)
1186-
else:
1187-
state_result = await super().get_state((feature,))
1188-
states[feature] = state_result[feature]
1161+
match feature:
1162+
case NodeFeature.ENERGY:
1163+
states[feature] = await self.energy_update()
1164+
_LOGGER.debug(
1165+
"async_get_state %s - energy: %s",
1166+
self._mac_in_str,
1167+
states[feature],
1168+
)
1169+
case == NodeFeature.RELAY:
1170+
states[feature] = self._relay_state
1171+
_LOGGER.debug(
1172+
"async_get_state %s - relay: %s",
1173+
self._mac_in_str,
1174+
states[feature],
1175+
)
1176+
case NodeFeature.RELAY_LOCK:
1177+
states[feature] = self._relay_lock
1178+
case NodeFeature.RELAY_INIT:
1179+
states[feature] = self._relay_config
1180+
case NodeFeature.POWER:
1181+
states[feature] = await self.power_update()
1182+
_LOGGER.debug(
1183+
"async_get_state %s - power: %s",
1184+
self._mac_in_str,
1185+
states[feature],
1186+
)
1187+
case _:
1188+
state_result = await super().get_state((feature,))
1189+
states[feature] = state_result[feature]
11891190

11901191
if NodeFeature.AVAILABLE not in states:
11911192
states[NodeFeature.AVAILABLE] = self.available_state

‎plugwise_usb/nodes/node.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -613,17 +613,20 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
613613
f"Update of feature '{feature.name}' is "
614614
+ f"not supported for {self.mac}"
615615
)
616-
if feature == NodeFeature.INFO:
617-
states[NodeFeature.INFO] = await self.node_info_update()
618-
elif feature == NodeFeature.AVAILABLE:
619-
states[NodeFeature.AVAILABLE] = self.available_state
620-
elif feature == NodeFeature.PING:
621-
states[NodeFeature.PING] = await self.ping_update()
622-
else:
623-
raise NodeError(
624-
f"Update of feature '{feature.name}' is "
625-
+ f"not supported for {self.mac}"
626-
)
616+
617+
match feature:
618+
case NodeFeature.INFO:
619+
states[NodeFeature.INFO] = await self.node_info_update()
620+
case NodeFeature.AVAILABLE:
621+
states[NodeFeature.AVAILABLE] = self.available_state
622+
case NodeFeature.PING:
623+
states[NodeFeature.PING] = await self.ping_update()
624+
case _:
625+
raise NodeError(
626+
f"Update of feature '{feature.name}' is "
627+
+ f"not supported for {self.mac}"
628+
)
629+
627630
return states
628631

629632
async def unload(self) -> None:

‎plugwise_usb/nodes/scan.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -566,13 +566,16 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
566566
f"Update of feature '{feature.name}' is "
567567
+ f"not supported for {self.mac}"
568568
)
569-
if feature == NodeFeature.MOTION:
570-
states[NodeFeature.MOTION] = self._motion_state
571-
elif feature == NodeFeature.MOTION_CONFIG:
572-
states[NodeFeature.MOTION_CONFIG] = self._motion_config
573-
else:
574-
state_result = await super().get_state((feature,))
575-
states[feature] = state_result[feature]
569+
570+
match feature:
571+
case NodeFeature.MOTION:
572+
states[NodeFeature.MOTION] = self._motion_state
573+
case NodeFeature.MOTION_CONFIG:
574+
states[NodeFeature.MOTION_CONFIG] = self._motion_config
575+
case _
576+
state_result = await super().get_state((feature,))
577+
states[feature] = state_result[feature]
578+
576579
if NodeFeature.AVAILABLE not in states:
577580
states[NodeFeature.AVAILABLE] = self.available_state
578581
return states

‎plugwise_usb/nodes/sed.py‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -756,11 +756,14 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
756756
f"Update of feature '{feature.name}' is "
757757
+ f"not supported for {self.mac}"
758758
)
759-
if feature == NodeFeature.INFO:
760-
states[NodeFeature.INFO] = await self.node_info_update()
761-
elif feature == NodeFeature.BATTERY:
762-
states[NodeFeature.BATTERY] = self._battery_config
763-
else:
764-
state_result = await super().get_state((feature,))
765-
states[feature] = state_result[feature]
759+
760+
match feature:
761+
case NodeFeature.INFO:
762+
states[NodeFeature.INFO] = await self.node_info_update()
763+
case NodeFeature.BATTERY:
764+
states[NodeFeature.BATTERY] = self._battery_config
765+
case _:
766+
state_result = await super().get_state((feature,))
767+
states[feature] = state_result[feature]
768+
766769
return states

‎plugwise_usb/nodes/sense.py‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -134,15 +134,19 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
134134
raise NodeError(
135135
f"Update of feature '{feature.name}' is not supported for {self.mac}"
136136
)
137-
if feature == NodeFeature.TEMPERATURE:
138-
states[NodeFeature.TEMPERATURE] = self._temperature
139-
elif feature == NodeFeature.HUMIDITY:
140-
states[NodeFeature.HUMIDITY] = self._humidity
141-
elif feature == NodeFeature.PING:
142-
states[NodeFeature.PING] = await self.ping_update()
143-
else:
144-
state_result = await super().get_state((feature,))
145-
states[feature] = state_result[feature]
137+
138+
match feature:
139+
case NodeFeature.TEMPERATURE:
140+
states[NodeFeature.TEMPERATURE] = self._temperature
141+
case NodeFeature.HUMIDITY:
142+
states[NodeFeature.HUMIDITY] = self._humidity
143+
case NodeFeature.PING:
144+
states[NodeFeature.PING] = await self.ping_update()
145+
case _:
146+
state_result = await super().get_state((feature,))
147+
states[feature] = state_result[feature]
148+
146149
if NodeFeature.AVAILABLE not in states:
147150
states[NodeFeature.AVAILABLE] = self.available_state
151+
148152
return states

‎plugwise_usb/nodes/switch.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,15 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
147147
f"Update of feature '{feature.name}' is "
148148
+ f"not supported for {self.mac}"
149149
)
150-
if feature == NodeFeature.SWITCH:
151-
states[NodeFeature.SWITCH] = self._switch_state
152-
else:
153-
state_result = await super().get_state((feature,))
154-
states[feature] = state_result[feature]
150+
151+
match feature:
152+
case NodeFeature.SWITCH:
153+
states[NodeFeature.SWITCH] = self._switch_state
154+
case _:
155+
state_result = await super().get_state((feature,))
156+
states[feature] = state_result[feature]
157+
155158
if NodeFeature.AVAILABLE not in states:
156159
states[NodeFeature.AVAILABLE] = self.available_state
160+
157161
return states

0 commit comments

Comments
 (0)