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

weathercom.py: Honour units parameter. (#582)

Browse Source 
Potential fix for #577
This commit is contained in:
Facetoe 2017-06-15 08:48:08 +07:00 committed by GitHub
parent c5757fc7c2
commit 4c0bba59ab
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
i3pystatus/weather/weathercom.py
View File

@ -1,13 +1,11 @@
from i3pystatus.core.util import internet, require
from i3pystatus.weather import WeatherBackend
from datetime import datetime
from urllib.request import urlopen
from html.parser import HTMLParser
import json import json
import re import re
from datetime import datetime
from html.parser import HTMLParser
from urllib.request import urlopen
WEATHER_URL = 'https://weather.com/weather/today/l/%s' from i3pystatus.core.util import internet, require
from i3pystatus.weather import WeatherBackend
class WeathercomHTMLParser(HTMLParser): class WeathercomHTMLParser(HTMLParser):
@ -16,13 +14,12 @@ class WeathercomHTMLParser(HTMLParser):
through some other source at runtime and added as <script> elements to the through some other source at runtime and added as <script> elements to the
page source. page source.
''' '''
def __init__(self, logger, location_code):
def __init__(self, logger):
self.logger = logger self.logger = logger
self.location_code = location_code
super(WeathercomHTMLParser, self).__init__() super(WeathercomHTMLParser, self).__init__()
def get_weather_data(self): def get_weather_data(self, url):
url = WEATHER_URL % self.location_code
self.logger.debug('Making request to %s to retrieve weather data', url) self.logger.debug('Making request to %s to retrieve weather data', url)
self.weather_data = None self.weather_data = None
with urlopen(url) as content: with urlopen(url) as content:
@ -164,6 +161,8 @@ class Weathercom(WeatherBackend):
units = 'metric' units = 'metric'
update_error = '!' update_error = '!'
url_template = 'https://weather.com/{locale}/weather/today/l/{location_code}'
# This will be set in the init based on the passed location code # This will be set in the init based on the passed location code
forecast_url = None forecast_url = None
@ -173,8 +172,13 @@ class Weathercom(WeatherBackend):
# Ensure that the location code is a string, in the event that a # Ensure that the location code is a string, in the event that a
# ZIP code (or other all-numeric code) is passed as a non-string. # ZIP code (or other all-numeric code) is passed as a non-string.
self.location_code = str(self.location_code) self.location_code = str(self.location_code)
self.forecast_url = WEATHER_URL % self.location_code
self.parser = WeathercomHTMLParser(self.logger, self.location_code) # Setting the locale to en-AU returns units in metric. Leaving it blank
# causes weather.com to return the default, which is imperial.
self.locale = 'en-AU' if self.units == 'metric' else ''
self.forecast_url = self.url_template.format(**vars(self))
self.parser = WeathercomHTMLParser(self.logger)
def check_response(self, response): def check_response(self, response):
# Errors for weather.com API manifest in HTTP error codes, not in the # Errors for weather.com API manifest in HTTP error codes, not in the
@ -186,6 +190,10 @@ class Weathercom(WeatherBackend):
''' '''
Fetches the current weather from wxdata.weather.com service. Fetches the current weather from wxdata.weather.com service.
''' '''
if self.units not in ('imperial', 'metric'):
raise Exception("units must be one of (imperial, metric)!")
if self.location_code is None: if self.location_code is None:
self.logger.error( self.logger.error(
'A location_code is required to check Weather.com. See the ' 'A location_code is required to check Weather.com. See the '
@ -196,7 +204,7 @@ class Weathercom(WeatherBackend):
self.data['update_error'] = '' self.data['update_error'] = ''
try: try:
self.parser.get_weather_data() self.parser.get_weather_data(self.forecast_url)
if self.parser.weather_data is None: if self.parser.weather_data is None:
self.logger.error( self.logger.error(
'Failed to read weather data from page. Run module with ' 'Failed to read weather data from page. Run module with '