l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #388 from david-perez/master

Browse source 
Add support for city ids to weather module.
This commit is contained in:
tobi-wan-kenobi 2019-05-21 18:23:00 +02:00 committed by GitHub
commit 222be20138
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bumblebee/modules/weather.py
View file

@ -7,8 +7,9 @@ Requires the following python packages:
* requests * requests
Parameters: Parameters:
* weather.location: Set location (ISO 3166 country code), defaults to 'auto' for getting location from http://ipinfo.io * weather.location: Set location, defaults to 'auto' for getting location from http://ipinfo.io
If set to a comma-separated list, left-click and right-click can be used to rotate the locations If set to a comma-separated list, left-click and right-click can be used to rotate the locations.
Locations should be city names or city ids.
* weather.unit: metric (default), kelvin, imperial * weather.unit: metric (default), kelvin, imperial
* weather.showcity: If set to true, show location information, otherwise hide it (defaults to true) * weather.showcity: If set to true, show location information, otherwise hide it (defaults to true)
* weather.apikey: API key from http://api.openweathermap.org * weather.apikey: API key from http://api.openweathermap.org
@ -107,12 +108,13 @@ class Module(bumblebee.engine.Module):
location_url = "http://ipinfo.io/json" location_url = "http://ipinfo.io/json"
location = requests.get(location_url).json() location = requests.get(location_url).json()
coord = location["loc"].split(",") coord = location["loc"].split(",")
self._city = location["city"]
weather_url = "{url}&lat={lat}&lon={lon}".format(url=weather_url, lat=coord[0], lon=coord[1]) weather_url = "{url}&lat={lat}&lon={lon}".format(url=weather_url, lat=coord[0], lon=coord[1])
elif self._location[self._index].isdigit():
weather_url = "{url}&id={id}".format(url=weather_url, id=self._location[self._index])
else: else:
self._city = self._location[self._index]
weather_url = "{url}&q={city}".format(url=weather_url, city=self._location[self._index]) weather_url = "{url}&q={city}".format(url=weather_url, city=self._location[self._index])
weather = requests.get(weather_url).json() weather = requests.get(weather_url).json()
self._city = weather['name']
self._temperature = int(weather['main']['temp']) self._temperature = int(weather['main']['temp'])
self._weather = weather['weather'][0]['main'].lower() self._weather = weather['weather'][0]['main'].lower()
self._valid = True self._valid = True