evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #757 from fabaff/glances-name

Browse source 
Include name
This commit is contained in:
Paulus Schoutsen 2015-12-16 08:10:34 -08:00
commit 0a44750441
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
homeassistant/components/sensor/glances.py
View file

@ -79,7 +79,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
if resource not in SENSOR_TYPES: if resource not in SENSOR_TYPES:
_LOGGER.error('Sensor type: "%s" does not exist', resource) _LOGGER.error('Sensor type: "%s" does not exist', resource)
else: else:
dev.append(GlancesSensor(rest, resource)) dev.append(GlancesSensor(rest, config.get('name'), resource))
add_devices(dev) add_devices(dev)
@ -87,9 +87,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
class GlancesSensor(Entity): class GlancesSensor(Entity):
""" Implements a Glances sensor. """ """ Implements a Glances sensor. """
def __init__(self, rest, sensor_type): def __init__(self, rest, name, sensor_type):
self.rest = rest self.rest = rest
self._name = SENSOR_TYPES[sensor_type][0] self._name = name
self.type = sensor_type self.type = sensor_type
self._state = STATE_UNKNOWN self._state = STATE_UNKNOWN
self._unit_of_measurement = SENSOR_TYPES[sensor_type][1] self._unit_of_measurement = SENSOR_TYPES[sensor_type][1]
@ -98,7 +98,10 @@ class GlancesSensor(Entity):
@property @property
def name(self): def name(self):
""" The name of the sensor. """ """ The name of the sensor. """
return self._name if self._name is None:
return SENSOR_TYPES[self.type][0]
else:
return '{} {}'.format(self._name, SENSOR_TYPES[self.type][0])
@property @property
def unit_of_measurement(self): def unit_of_measurement(self):