PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-04-26 13:01:07 -05:00
Code Issues Projects Releases Wiki Activity

NuWeather: use .json files from WWIS directly

Browse Source
This commit is contained in:
James Lu 2022-05-28 01:30:47 -07:00
parent 396dc4d20e
commit eb376d8554
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NuWeather/plugin.py
View File

@ -268,8 +268,7 @@ class NuWeather(callbacks.Plugin):
_wwis_cities = {} _wwis_cities = {}
def _wwis_load_cities(self, lang='en'): def _wwis_load_cities(self, lang='en'):
wwis_cache_path = conf.supybot.directories.data.dirize("wwis-cities.json") wwis_cache_path = conf.supybot.directories.data.dirize("wwis-cities.json")
# Ignore the xml extension, this is actually json! url = 'https://worldweather.wmo.int/en/json/Country_en.json'
url = 'https://worldweather.wmo.int/en/json/Country_en.xml'
wwis_cities_raw = self._load_check_time(url, wwis_cache_path, "WWIS cities data", self._WWIS_CITIES_REFRESH_INTERVAL) wwis_cities_raw = self._load_check_time(url, wwis_cache_path, "WWIS cities data", self._WWIS_CITIES_REFRESH_INTERVAL)
if not self._wwis_cities: if not self._wwis_cities:
@ -304,8 +303,7 @@ class NuWeather(callbacks.Plugin):
# Load current conditions (wind, humidity, ...) # Load current conditions (wind, humidity, ...)
# These are served from a separate endpoint with all(!) locations at once! # These are served from a separate endpoint with all(!) locations at once!
wwis_cache_path = conf.supybot.directories.data.dirize("wwis-current.json") wwis_cache_path = conf.supybot.directories.data.dirize("wwis-current.json")
# Ignore the xml extension, this is actually json! url = 'https://worldweather.wmo.int/en/json/present.json'
url = 'https://worldweather.wmo.int/en/json/present.xml'
return self._load_check_time(url, wwis_cache_path, "WWIS current data", return self._load_check_time(url, wwis_cache_path, "WWIS current data",
self._WWIS_CURRENT_REFRESH_INTERVAL) self._WWIS_CURRENT_REFRESH_INTERVAL)
@ -315,6 +313,7 @@ class NuWeather(callbacks.Plugin):
cityid, geocode_backend = self._wwis_get_closest_city(location, geobackend=geobackend) cityid, geocode_backend = self._wwis_get_closest_city(location, geobackend=geobackend)
city_url = f'https://worldweather.wmo.int/en/json/{cityid}_en.json' city_url = f'https://worldweather.wmo.int/en/json/{cityid}_en.json'
log.debug('NuWeather: fetching current conditions for %s from %s', location, city_url)
city_data = utils.web.getUrl(city_url, headers=HEADERS).decode('utf-8') city_data = utils.web.getUrl(city_url, headers=HEADERS).decode('utf-8')
city_data = json.loads(city_data) city_data = json.loads(city_data)
city_data = city_data['city'] city_data = city_data['city']