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

[modules/weather] Fix location display for "auto"

Browse source 
When "auto" is used, the location was never shown.

Also, document the "showcity" parameter.

fixes #360
This commit is contained in:
Tobias Witek 2019-02-11 20:07:10 +01:00
parent bb65c1cd68
commit 451e3e48e5
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bumblebee/modules/weather.py
View file

@ -10,6 +10,7 @@ Parameters:
* weather.location: Set location (ISO 3166 country code), defaults to 'auto' for getting location from http://ipinfo.io * weather.location: Set location (ISO 3166 country code), 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
* 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.apikey: API key from http://api.openweathermap.org * weather.apikey: API key from http://api.openweathermap.org
""" """
@ -66,10 +67,7 @@ class Module(bumblebee.engine.Module):
return u"{}°{}".format(self._temperature, self._unit_suffix()) return u"{}°{}".format(self._temperature, self._unit_suffix())
def city(self): def city(self):
city = self._location[self._index] city = re.sub('[_-]', ' ', self._city)
if city == "auto":
city = ""
city = re.sub('[_-]', ' ', city)
return u"{} ".format(city) return u"{} ".format(city)
def output(self, widget): def output(self, widget):
@ -112,6 +110,7 @@ class Module(bumblebee.engine.Module):
self._city = location["city"] 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])
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._temperature = int(weather['main']['temp']) self._temperature = int(weather['main']['temp'])