Maintenance (sensor.bitcoin, sensor.yahoo_finance) (#4104)

* Add attribution

* Update ordering

* Update ordering
This commit is contained in:
Fabian Affolter 2016-10-29 22:21:09 +02:00 committed by Paulus Schoutsen
parent 942d630762
commit 892f455aee
3 changed files with 22 additions and 14 deletions

View File

@ -10,7 +10,7 @@ from datetime import timedelta
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import CONF_DISPLAY_OPTIONS from homeassistant.const import (CONF_DISPLAY_OPTIONS, ATTR_ATTRIBUTION)
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle from homeassistant.util import Throttle
@ -19,6 +19,7 @@ REQUIREMENTS = ['blockchain==1.3.3']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
CONF_ATTRIBUTION = "Data provided by blockchain.info"
CONF_CURRENCY = 'currency' CONF_CURRENCY = 'currency'
DEFAULT_CURRENCY = 'USD' DEFAULT_CURRENCY = 'USD'
@ -59,7 +60,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the Bitcoin sensors.""" """Set up the Bitcoin sensors."""
from blockchain import exchangerates from blockchain import exchangerates
currency = config.get(CONF_CURRENCY) currency = config.get(CONF_CURRENCY)
@ -111,6 +112,13 @@ class BitcoinSensor(Entity):
"""Return the icon to use in the frontend, if any.""" """Return the icon to use in the frontend, if any."""
return ICON return ICON
@property
def device_state_attributes(self):
"""Return the state attributes of the sensor."""
return {
ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
}
# pylint: disable=too-many-branches # pylint: disable=too-many-branches
def update(self): def update(self):
"""Get the latest data and updates the states.""" """Get the latest data and updates the states."""

View File

@ -46,13 +46,13 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the CoinMarketCap sensor.""" """Set up the CoinMarketCap sensor."""
currency = config.get(CONF_CURRENCY) currency = config.get(CONF_CURRENCY)
try: try:
CoinMarketCapData(currency).update() CoinMarketCapData(currency).update()
except HTTPError: except HTTPError:
_LOGGER.warning('Currency "%s" is not available. Using "bitcoin"', _LOGGER.warning("Currency '%s' is not available. Using 'bitcoin'",
currency) currency)
currency = DEFAULT_CURRENCY currency = DEFAULT_CURRENCY
@ -95,13 +95,13 @@ class CoinMarketCapSensor(Entity):
"""Return the state attributes of the sensor.""" """Return the state attributes of the sensor."""
return { return {
ATTR_24H_VOLUME_USD: self._ticker.get('24h_volume_usd'), ATTR_24H_VOLUME_USD: self._ticker.get('24h_volume_usd'),
ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
ATTR_AVAILABLE_SUPPLY: self._ticker.get('available_supply'), ATTR_AVAILABLE_SUPPLY: self._ticker.get('available_supply'),
ATTR_MARKET_CAP: self._ticker.get('market_cap_usd'), ATTR_MARKET_CAP: self._ticker.get('market_cap_usd'),
ATTR_PERCENT_CHANGE_24H: self._ticker.get('percent_change_24h'), ATTR_PERCENT_CHANGE_24H: self._ticker.get('percent_change_24h'),
ATTR_PERCENT_CHANGE_7D: self._ticker.get('percent_change_7d'), ATTR_PERCENT_CHANGE_7D: self._ticker.get('percent_change_7d'),
ATTR_SYMBOL: self._ticker.get('symbol'), ATTR_SYMBOL: self._ticker.get('symbol'),
ATTR_TOTAL_SUPPLY: self._ticker.get('total_supply'), ATTR_TOTAL_SUPPLY: self._ticker.get('total_supply'),
ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
} }
# pylint: disable=too-many-branches # pylint: disable=too-many-branches

View File

@ -10,7 +10,7 @@ from datetime import timedelta
import voluptuous as vol import voluptuous as vol
from homeassistant.components.sensor import PLATFORM_SCHEMA from homeassistant.components.sensor import PLATFORM_SCHEMA
from homeassistant.const import CONF_NAME, ATTR_ATTRIBUTION from homeassistant.const import (CONF_NAME, ATTR_ATTRIBUTION)
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.util import Throttle from homeassistant.util import Throttle
import homeassistant.helpers.config_validation as cv import homeassistant.helpers.config_validation as cv
@ -19,20 +19,20 @@ REQUIREMENTS = ['yahoo-finance==1.3.2']
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
ATTR_CHANGE = 'Change'
ATTR_OPEN = 'open'
ATTR_PREV_CLOSE = 'prev_close'
CONF_ATTRIBUTION = "Stock market information provided by Yahoo! Inc." CONF_ATTRIBUTION = "Stock market information provided by Yahoo! Inc."
CONF_SYMBOL = 'symbol' CONF_SYMBOL = 'symbol'
DEFAULT_SYMBOL = 'YHOO'
DEFAULT_NAME = 'Yahoo Stock' DEFAULT_NAME = 'Yahoo Stock'
DEFAULT_SYMBOL = 'YHOO'
ICON = 'mdi:currency-usd' ICON = 'mdi:currency-usd'
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1) MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=1)
ATTR_CHANGE = 'Change'
ATTR_OPEN = 'open'
ATTR_PREV_CLOSE = 'prev_close'
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
vol.Optional(CONF_SYMBOL, default=DEFAULT_SYMBOL): cv.string, vol.Optional(CONF_SYMBOL, default=DEFAULT_SYMBOL): cv.string,
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
def setup_platform(hass, config, add_devices, discovery_info=None): def setup_platform(hass, config, add_devices, discovery_info=None):
"""Setup the Yahoo Finance sensor.""" """Set up the Yahoo Finance sensor."""
name = config.get(CONF_NAME) name = config.get(CONF_NAME)
symbol = config.get(CONF_SYMBOL) symbol = config.get(CONF_SYMBOL)
@ -81,10 +81,10 @@ class YahooFinanceSensor(Entity):
"""Return the state attributes.""" """Return the state attributes."""
if self._state is not None: if self._state is not None:
return { return {
ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
ATTR_CHANGE: self.data.price_change, ATTR_CHANGE: self.data.price_change,
ATTR_OPEN: self.data.price_open, ATTR_OPEN: self.data.price_open,
ATTR_PREV_CLOSE: self.data.prev_close, ATTR_PREV_CLOSE: self.data.prev_close,
ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
} }
@property @property
@ -94,7 +94,7 @@ class YahooFinanceSensor(Entity):
def update(self): def update(self):
"""Get the latest data and updates the states.""" """Get the latest data and updates the states."""
_LOGGER.debug('Updating sensor %s - %s', self._name, self._state) _LOGGER.debug("Updating sensor %s - %s", self._name, self._state)
self.data.update() self.data.update()
self._state = self.data.state self._state = self.data.state