Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve version sensor #18292

Merged
merged 4 commits into from Nov 7, 2018
Merged

Improve version sensor #18292

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28de9b5
Validate value against valid list
tjorim Nov 7, 2018
534e37f
Show correct name
tjorim Nov 7, 2018
1094631
Add icon
tjorim Nov 7, 2018
3b832e7
Unnecessary "elif" after "return" (no-else-return)
tjorim Nov 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 25 additions & 8 deletions homeassistant/components/sensor/version.py
View file
Open in desktop
Expand Up @@ -20,11 +20,21 @@

_LOGGER = logging.getLogger(__name__)

ALL_IMAGES = [
'default', 'intel-nuc', 'qemux86', 'qemux86-64', 'qemuarm',
'qemuarm-64', 'raspberrypi', 'raspberrypi2', 'raspberrypi3',
'raspberrypi3-64', 'tinker', 'odroid-c2', 'odroid-xu'
]
ALL_SOURCES = [
'local', 'pypi', 'hassio', 'docker'
]

CONF_BETA = 'beta'
CONF_IMAGE = 'image'

DEFAULT_IMAGE = 'default'
DEFAULT_NAME = "Current Version"
DEFAULT_NAME_LATEST = "Latest Version"
DEFAULT_NAME_LOCAL = "Current Version"
DEFAULT_SOURCE = 'local'

ICON = 'mdi:package-up'
Expand All @@ -33,11 +43,9 @@

PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_BETA, default=False): cv.boolean,
vol.Optional(CONF_IMAGE, default=DEFAULT_IMAGE): vol.All(cv.string,
vol.Lower),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_SOURCE, default=DEFAULT_SOURCE): vol.All(cv.string,
vol.Lower),
vol.Optional(CONF_IMAGE, default=DEFAULT_IMAGE): vol.In(ALL_IMAGES),
vol.Optional(CONF_NAME, default=''): cv.string,
vol.Optional(CONF_SOURCE, default=DEFAULT_SOURCE): vol.In(ALL_SOURCES),
})


Expand All @@ -63,7 +71,7 @@ async def async_setup_platform(
class VersionSensor(Entity):
"""Representation of a Home Assistant version sensor."""

def __init__(self, haversion, name):
def __init__(self, haversion, name=''):
"""Initialize the Version sensor."""
self.haversion = haversion
self._name = name
Expand All @@ -76,7 +84,11 @@ async def async_update(self):
@property
def name(self):
"""Return the name of the sensor."""
return self._name
if self._name:
return self._name
if self.haversion.source == DEFAULT_SOURCE:
return DEFAULT_NAME_LOCAL
return DEFAULT_NAME_LATEST

@property
def state(self):
Expand All @@ -88,6 +100,11 @@ def device_state_attributes(self):
"""Return attributes for the sensor."""
return self.haversion.api.version_data

@property
def icon(self):
"""Return the icon to use in the frontend, if any."""
return ICON


class VersionData:
"""Get the latest data and update the states."""
Expand Down