Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid multiple options and current_option lookups in select entites (#96630)

pull/96709/head
J. Nick Koston 2023-07-16 06:22:36 -10:00 committed by GitHub
parent 28540b0cb2
commit cde1903e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
homeassistant/components/select/__init__.py
View File

@ -144,9 +144,10 @@ class SelectEntity(Entity):
@final
def state(self) -> str | None:
"""Return the entity state."""
if self.current_option is None or self.current_option not in self.options:
current_option = self.current_option
if current_option is None or current_option not in self.options:
return None
return self.current_option
return current_option
@property
def options(self) -> list[str]:
@ -209,21 +210,24 @@ class SelectEntity(Entity):
async def _async_offset_index(self, offset: int, cycle: bool) -> None:
"""Offset current index."""
current_index = 0
if self.current_option is not None and self.current_option in self.options:
current_index = self.options.index(self.current_option)
current_option = self.current_option
options = self.options
if current_option is not None and current_option in self.options:
current_index = self.options.index(current_option)
new_index = current_index + offset
if cycle:
new_index = new_index % len(self.options)
new_index = new_index % len(options)
elif new_index < 0:
new_index = 0
elif new_index >= len(self.options):
new_index = len(self.options) - 1
elif new_index >= len(options):
new_index = len(options) - 1
await self.async_select_option(self.options[new_index])
await self.async_select_option(options[new_index])
@final
async def _async_select_index(self, idx: int) -> None:
"""Select new option by index."""
new_index = idx % len(self.options)
await self.async_select_option(self.options[new_index])
options = self.options
new_index = idx % len(options)
await self.async_select_option(options[new_index])