masq/i3pystatus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weather.com weather provider after upstream change (#665)

Browse Source 
The format for the JSON data we scrape from the webpage has changed,
this updates the module to handle the new format.
This commit is contained in:
Erik Johnson 2018-08-21 10:22:32 -05:00 committed by GitHub
parent f6e3b40b24
commit bfdff2edbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
i3pystatus/weather/weathercom.py
View File

@ -81,7 +81,7 @@ class WeathercomHTMLParser(HTMLParser):
structural changes to this data. structural changes to this data.
''' '''
if isinstance(data, dict): if isinstance(data, dict):
if 'observation' in data and 'dailyForecast' in data: if 'Observation' in data and 'DailyForecast' in data:
return data return data
else: else:
for key in data: for key in data:
@ -214,7 +214,15 @@ class Weathercom(WeatherBackend):
return return
try: try:
observed = self.parser.weather_data['observation']['data']['vt1observation'] observed = self.parser.weather_data['Observation']
# Observation data stored under a sub-key containing the
# lat/long coordinates. For example:
#
# geocode:41.77,-88.35:language:en-US:units:e
#
# Since this is the only key under "Observation", we can just
# use next(iter(observed)) to get it.
observed = observed[next(iter(observed))]['data']['vt1observation']
except KeyError: except KeyError:
self.logger.error( self.logger.error(
'Failed to retrieve current conditions from API response. ' 'Failed to retrieve current conditions from API response. '
@ -224,7 +232,11 @@ class Weathercom(WeatherBackend):
return return
try: try:
forecast = self.parser.weather_data['dailyForecast']['data']['vt1dailyForecast'][0] forecast = self.parser.weather_data['DailyForecast']
# Same as above, use next(iter(forecast)) to drill down to the
# correct nested dict level.
forecast = forecast[next(iter(forecast))]
forecast = forecast['data']['vt1dailyForecast'][0]
except (IndexError, KeyError): except (IndexError, KeyError):
self.logger.error( self.logger.error(
'Failed to retrieve forecast data from API response. ' 'Failed to retrieve forecast data from API response. '
@ -234,7 +246,11 @@ class Weathercom(WeatherBackend):
return return
try: try:
self.city_name = self.parser.weather_data['location']['prsntNm'] self.city_name = self.parser.weather_data['Location']
# Again, same technique as above used to get down to the
# correct nested dict level.
self.city_name = self.city_name[next(iter(self.city_name))]
self.city_name = self.city_name['data']['prsntNm']
except KeyError: except KeyError:
self.logger.warning( self.logger.warning(
'Failed to get city name from API response, falling back ' 'Failed to get city name from API response, falling back '