Skip to content

Add option to set language of openweathermap sensor, and handle updating errors #8046

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

Merged
fabaff merged 2 commits into from
Jun 17, 2017
+17 −6
Merged

Add option to set language of openweathermap sensor, and handle updating errors #8046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b119ab
Add option to set language of openweathermap sensor messages
azogue Jun 15, 2017
347422c
handle error updating openweathermap sensor
azogue Jun 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions homeassistant/components/sensor/openweathermap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

CONF_ATTRIBUTION = "Data provided by OpenWeatherMap"
CONF_FORECAST = 'forecast'
CONF_LANGUAGE = 'language'

DEFAULT_NAME = 'OWM'

Expand All @@ -45,7 +46,8 @@
vol.Optional(CONF_MONITORED_CONDITIONS, default=[]):
vol.All(cv.ensure_list, [vol.In(SENSOR_TYPES)]),
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
vol.Optional(CONF_FORECAST, default=False): cv.boolean
vol.Optional(CONF_FORECAST, default=False): cv.boolean,
vol.Optional(CONF_LANGUAGE, default=None): cv.string,
})


Expand All @@ -61,8 +63,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):

name = config.get(CONF_NAME)
forecast = config.get(CONF_FORECAST)
language = config.get(CONF_LANGUAGE)
if isinstance(language, str):
language = language.lower()[:2]

owm = OWM(config.get(CONF_API_KEY))
owm = OWM(API_key=config.get(CONF_API_KEY), language=language)

if not owm:
_LOGGER.error("Unable to connect to OpenWeatherMap")
Expand Down Expand Up @@ -178,14 +183,20 @@ def __init__(self, owm, forecast, latitude, longitude):
@Throttle(MIN_TIME_BETWEEN_UPDATES)
def update(self):
"""Get the latest data from OpenWeatherMap."""
obs = self.owm.weather_at_coords(self.latitude, self.longitude)
try:
obs = self.owm.weather_at_coords(self.latitude, self.longitude)
except TypeError:
obs = None
if obs is None:
_LOGGER.warning("Failed to fetch data from OpenWeatherMap")
return

self.data = obs.get_weather()

if self.forecast == 1:
obs = self.owm.three_hours_forecast_at_coords(
self.latitude, self.longitude)
self.fc_data = obs.get_forecast()
try:
obs = self.owm.three_hours_forecast_at_coords(
self.latitude, self.longitude)
self.fc_data = obs.get_forecast()
except TypeError:
_LOGGER.warning("Failed to fetch forecast from OpenWeatherMap")