mirror of
https://github.com/home-assistant/core.git
synced 2025-07-19 03:07:37 +00:00
Remove temporary variable by only retrieving needed value (#42522)
This commit is contained in:
parent
65ab8cbc71
commit
d5efb3e3de
@ -995,14 +995,14 @@ async def async_api_set_mode(hass, config, directive, context):
|
|||||||
|
|
||||||
# Fan Direction
|
# Fan Direction
|
||||||
if instance == f"{fan.DOMAIN}.{fan.ATTR_DIRECTION}":
|
if instance == f"{fan.DOMAIN}.{fan.ATTR_DIRECTION}":
|
||||||
_, direction = mode.split(".")
|
direction = mode.split(".")[1]
|
||||||
if direction in (fan.DIRECTION_REVERSE, fan.DIRECTION_FORWARD):
|
if direction in (fan.DIRECTION_REVERSE, fan.DIRECTION_FORWARD):
|
||||||
service = fan.SERVICE_SET_DIRECTION
|
service = fan.SERVICE_SET_DIRECTION
|
||||||
data[fan.ATTR_DIRECTION] = direction
|
data[fan.ATTR_DIRECTION] = direction
|
||||||
|
|
||||||
# Cover Position
|
# Cover Position
|
||||||
elif instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
|
elif instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
|
||||||
_, position = mode.split(".")
|
position = mode.split(".")[1]
|
||||||
|
|
||||||
if position == cover.STATE_CLOSED:
|
if position == cover.STATE_CLOSED:
|
||||||
service = cover.SERVICE_CLOSE_COVER
|
service = cover.SERVICE_CLOSE_COVER
|
||||||
|
@ -125,7 +125,7 @@ class BMWConnectedDriveSensor(Entity):
|
|||||||
@property
|
@property
|
||||||
def unit_of_measurement(self) -> str:
|
def unit_of_measurement(self) -> str:
|
||||||
"""Get the unit of measurement."""
|
"""Get the unit of measurement."""
|
||||||
_, unit = self._attribute_info.get(self._attribute, [None, None])
|
unit = self._attribute_info.get(self._attribute, [None, None])[1]
|
||||||
return unit
|
return unit
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -41,8 +41,8 @@ class BroadlinkFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
|
|||||||
"""Define a device for the config flow."""
|
"""Define a device for the config flow."""
|
||||||
supported_types = {
|
supported_types = {
|
||||||
device_type
|
device_type
|
||||||
for _, device_types in DOMAINS_AND_TYPES
|
for device_types in DOMAINS_AND_TYPES
|
||||||
for device_type in device_types
|
for device_type in device_types[1]
|
||||||
}
|
}
|
||||||
if device.type not in supported_types:
|
if device.type not in supported_types:
|
||||||
_LOGGER.error(
|
_LOGGER.error(
|
||||||
|
@ -601,7 +601,7 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
@property
|
@property
|
||||||
def state(self):
|
def state(self):
|
||||||
"""Return the state of the player."""
|
"""Return the state of the player."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
|
|
||||||
if media_status is None:
|
if media_status is None:
|
||||||
return None
|
return None
|
||||||
@ -633,13 +633,13 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
@property
|
@property
|
||||||
def media_content_id(self):
|
def media_content_id(self):
|
||||||
"""Content ID of current playing media."""
|
"""Content ID of current playing media."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.content_id if media_status else None
|
return media_status.content_id if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_content_type(self):
|
def media_content_type(self):
|
||||||
"""Content type of current playing media."""
|
"""Content type of current playing media."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
if media_status is None:
|
if media_status is None:
|
||||||
return None
|
return None
|
||||||
if media_status.media_is_tvshow:
|
if media_status.media_is_tvshow:
|
||||||
@ -653,13 +653,13 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
@property
|
@property
|
||||||
def media_duration(self):
|
def media_duration(self):
|
||||||
"""Duration of current playing media in seconds."""
|
"""Duration of current playing media in seconds."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.duration if media_status else None
|
return media_status.duration if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_image_url(self):
|
def media_image_url(self):
|
||||||
"""Image url of current playing media."""
|
"""Image url of current playing media."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
if media_status is None:
|
if media_status is None:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@ -677,49 +677,49 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
@property
|
@property
|
||||||
def media_title(self):
|
def media_title(self):
|
||||||
"""Title of current playing media."""
|
"""Title of current playing media."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.title if media_status else None
|
return media_status.title if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_artist(self):
|
def media_artist(self):
|
||||||
"""Artist of current playing media (Music track only)."""
|
"""Artist of current playing media (Music track only)."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.artist if media_status else None
|
return media_status.artist if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_album_name(self):
|
def media_album_name(self):
|
||||||
"""Album of current playing media (Music track only)."""
|
"""Album of current playing media (Music track only)."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.album_name if media_status else None
|
return media_status.album_name if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_album_artist(self):
|
def media_album_artist(self):
|
||||||
"""Album artist of current playing media (Music track only)."""
|
"""Album artist of current playing media (Music track only)."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.album_artist if media_status else None
|
return media_status.album_artist if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_track(self):
|
def media_track(self):
|
||||||
"""Track number of current playing media (Music track only)."""
|
"""Track number of current playing media (Music track only)."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.track if media_status else None
|
return media_status.track if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_series_title(self):
|
def media_series_title(self):
|
||||||
"""Return the title of the series of current playing media."""
|
"""Return the title of the series of current playing media."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.series_title if media_status else None
|
return media_status.series_title if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_season(self):
|
def media_season(self):
|
||||||
"""Season of current playing media (TV Show only)."""
|
"""Season of current playing media (TV Show only)."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.season if media_status else None
|
return media_status.season if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def media_episode(self):
|
def media_episode(self):
|
||||||
"""Episode of current playing media (TV Show only)."""
|
"""Episode of current playing media (TV Show only)."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
return media_status.episode if media_status else None
|
return media_status.episode if media_status else None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -736,7 +736,7 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
def supported_features(self):
|
def supported_features(self):
|
||||||
"""Flag media player features that are supported."""
|
"""Flag media player features that are supported."""
|
||||||
support = SUPPORT_CAST
|
support = SUPPORT_CAST
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
|
|
||||||
if media_status:
|
if media_status:
|
||||||
if media_status.supports_queue_next:
|
if media_status.supports_queue_next:
|
||||||
@ -754,7 +754,7 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
@property
|
@property
|
||||||
def media_position(self):
|
def media_position(self):
|
||||||
"""Position of current playing media in seconds."""
|
"""Position of current playing media in seconds."""
|
||||||
media_status, _ = self._media_status()
|
media_status = self._media_status()[0]
|
||||||
if media_status is None or not (
|
if media_status is None or not (
|
||||||
media_status.player_is_playing
|
media_status.player_is_playing
|
||||||
or media_status.player_is_paused
|
or media_status.player_is_paused
|
||||||
@ -769,7 +769,7 @@ class CastDevice(MediaPlayerEntity):
|
|||||||
|
|
||||||
Returns value from homeassistant.util.dt.utcnow().
|
Returns value from homeassistant.util.dt.utcnow().
|
||||||
"""
|
"""
|
||||||
_, media_status_recevied = self._media_status()
|
media_status_recevied = self._media_status()[1]
|
||||||
return media_status_recevied
|
return media_status_recevied
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
@ -13,7 +13,7 @@ def async_describe_events(hass, async_describe_event):
|
|||||||
@callback
|
@callback
|
||||||
def async_describe_logbook_event(event):
|
def async_describe_logbook_event(event):
|
||||||
"""Describe a logbook event."""
|
"""Describe a logbook event."""
|
||||||
_, doorbird_event = event.event_type.split("_", 1)
|
doorbird_event = event.event_type.split("_", 1)[1]
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"name": "Doorbird",
|
"name": "Doorbird",
|
||||||
|
@ -85,7 +85,7 @@ class MySensorsSensor(mysensors.device.MySensorsEntity):
|
|||||||
@property
|
@property
|
||||||
def icon(self):
|
def icon(self):
|
||||||
"""Return the icon to use in the frontend, if any."""
|
"""Return the icon to use in the frontend, if any."""
|
||||||
_, icon = self._get_sensor_type()
|
icon = self._get_sensor_type()[1]
|
||||||
return icon
|
return icon
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@ -97,7 +97,7 @@ class MySensorsSensor(mysensors.device.MySensorsEntity):
|
|||||||
and set_req.V_UNIT_PREFIX in self._values
|
and set_req.V_UNIT_PREFIX in self._values
|
||||||
):
|
):
|
||||||
return self._values[set_req.V_UNIT_PREFIX]
|
return self._values[set_req.V_UNIT_PREFIX]
|
||||||
unit, _ = self._get_sensor_type()
|
unit = self._get_sensor_type()[0]
|
||||||
return unit
|
return unit
|
||||||
|
|
||||||
def _get_sensor_type(self):
|
def _get_sensor_type(self):
|
||||||
|
@ -131,7 +131,7 @@ class SCSGate:
|
|||||||
|
|
||||||
with self._devices_to_register_lock:
|
with self._devices_to_register_lock:
|
||||||
while self._devices_to_register:
|
while self._devices_to_register:
|
||||||
_, device = self._devices_to_register.popitem()
|
device = self._devices_to_register.popitem()[1]
|
||||||
self._devices[device.scs_id] = device
|
self._devices[device.scs_id] = device
|
||||||
self._device_being_registered = device.scs_id
|
self._device_being_registered = device.scs_id
|
||||||
self._reactor.append_task(GetStatusTask(target=device.scs_id))
|
self._reactor.append_task(GetStatusTask(target=device.scs_id))
|
||||||
|
@ -345,9 +345,9 @@ class UniFiController:
|
|||||||
|
|
||||||
mac = ""
|
mac = ""
|
||||||
if entity.domain == TRACKER_DOMAIN:
|
if entity.domain == TRACKER_DOMAIN:
|
||||||
mac, _ = entity.unique_id.split("-", 1)
|
mac = entity.unique_id.split("-", 1)[0]
|
||||||
elif entity.domain == SWITCH_DOMAIN:
|
elif entity.domain == SWITCH_DOMAIN:
|
||||||
_, mac = entity.unique_id.split("-", 1)
|
mac = entity.unique_id.split("-", 1)[1]
|
||||||
|
|
||||||
if mac in self.api.clients or mac not in self.api.clients_all:
|
if mac in self.api.clients or mac not in self.api.clients_all:
|
||||||
continue
|
continue
|
||||||
|
@ -84,7 +84,7 @@ class XboxSource(MediaSource):
|
|||||||
async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
|
async def async_resolve_media(self, item: MediaSourceItem) -> PlayMedia:
|
||||||
"""Resolve media to a url."""
|
"""Resolve media to a url."""
|
||||||
_, category, url = async_parse_identifier(item)
|
_, category, url = async_parse_identifier(item)
|
||||||
_, kind = category.split("#", 1)
|
kind = category.split("#", 1)[1]
|
||||||
return PlayMedia(url, MIME_TYPE_MAP[kind])
|
return PlayMedia(url, MIME_TYPE_MAP[kind])
|
||||||
|
|
||||||
async def async_browse_media(
|
async def async_browse_media(
|
||||||
@ -267,7 +267,7 @@ def _build_categories(title):
|
|||||||
|
|
||||||
def _build_media_item(title: str, category: str, item: XboxMediaItem):
|
def _build_media_item(title: str, category: str, item: XboxMediaItem):
|
||||||
"""Build individual media item."""
|
"""Build individual media item."""
|
||||||
_, kind = category.split("#", 1)
|
kind = category.split("#", 1)[1]
|
||||||
return BrowseMediaSource(
|
return BrowseMediaSource(
|
||||||
domain=DOMAIN,
|
domain=DOMAIN,
|
||||||
identifier=f"{title}~~{category}~~{item.uri}",
|
identifier=f"{title}~~{category}~~{item.uri}",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user