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

[modules/weather] Update to new API

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-04-02 22:10:18 +02:00
parent d0200b656d
commit 5ff0269662
2 changed files with 63 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/NOTES.md
View file

@ -36,3 +36,4 @@
- brightness: read from CLI tools - brightness: read from CLI tools
- input: use events? - input: use events?
- themes: rotating icons (battery!) - themes: rotating icons (battery!)
- weather: improve code

128
modules/core/weather.py
View file

@ -1,7 +1,7 @@
# -*- coding: UTF-8 -*- # -*- coding: UTF-8 -*-
# pylint: disable=C0111,R0903 # pylint: disable=C0111,R0903
'''Displays the temperature on the current location based on the ip """Displays the temperature on the current location based on the ip
Requires the following python packages: Requires the following python packages:
* requests * requests
@ -14,11 +14,14 @@ Parameters:
* 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.showminmax: If set to true, show the minimum and maximum temperature, otherwise hide it (defaults to false) * weather.showminmax: If set to true, show the minimum and maximum temperature, otherwise hide it (defaults to false)
* weather.apikey: API key from http://api.openweathermap.org * weather.apikey: API key from http://api.openweathermap.org
''' """
import core.module
import core.widget
import core.input
import util.format
import bumblebee.input
import bumblebee.output
import bumblebee.engine
import re import re
try: try:
@ -27,112 +30,105 @@ try:
except ImportError: except ImportError:
pass pass
class Module(bumblebee.engine.Module): class Module(core.module.Module):
def __init__(self, engine, config): @core.decorators.every(minutes=15)
super(Module, self).__init__(engine, config, def __init__(self, config):
bumblebee.output.Widget(full_text=self.output) super().__init__(config, core.widget.Widget(self.output))
)
self._temperature = 0
self._apikey = self.parameter('apikey', 'af7bfe22287c652d032a3064ffa44088')
self._location = self.parameter('location', 'auto')
if ',' in self._location:
self._location = self._location.split(',')
else:
self._location = [self._location]
self._index = 0
self._showcity = bumblebee.util.asbool(self.parameter('showcity', True))
self._showminmax = bumblebee.util.asbool(self.parameter('showminmax', False))
self._unit = self.parameter('unit', 'metric')
self._valid = False
self.interval_factor(60)
self.interval(15)
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, cmd=self._next_location) self.__temperature = 0
engine.input.register_callback(self, button=bumblebee.input.RIGHT_MOUSE, cmd=self._prev_location) self.__apikey = self.parameter('apikey', 'af7bfe22287c652d032a3064ffa44088')
self.__location = util.format.aslist(self.parameter('location', 'auto'))
def _next_location(self, event): self.__index = 0
self._index = 0 if self._index >= len(self._location) - 1 else self._index + 1 self.__showcity = util.format.asbool(self.parameter('showcity', True))
self.__showminmax = util.format.asbool(self.parameter('showminmax', False))
self.__unit = self.parameter('unit', 'metric')
self.__valid = False
core.input.register(self, button=core.input.LEFT_MOUSE, cmd=self.__next_location)
core.input.register(self, button=core.input.RIGHT_MOUSE, cmd=self.__prev_location)
def __next_location(self, event):
self.__index = (self.__index + 1) % len(self.__location)
self.update(self.widgets()) self.update(self.widgets())
def _prev_location(self, event): def __prev_location(self, event):
self._index = len(self._location)-1 if self._index <= 0 else self._index - 1 self.__index = len(self.__location) - 1 if self.__index <= 0 else self.__index - 1
self.update(self.widgets()) self.update(self.widgets())
def _unit_suffix(self): def __unit_suffix(self):
if self._unit == 'metric': if self.__unit == 'metric':
return 'C' return 'C'
if self._unit == 'kelvin': if self.__unit == 'kelvin':
return 'K' return 'K'
if self._unit == 'imperial': if self.__unit == 'imperial':
return 'F' return 'F'
return '' return ''
def temperature(self): def temperature(self):
return u'{}°{}'.format(self._temperature, self._unit_suffix()) return u'{}°{}'.format(self.__temperature, self.__unit_suffix())
def tempmin(self): def tempmin(self):
return u'{}°{}'.format(self._tempmin, self._unit_suffix()) return u'{}°{}'.format(self.__tempmin, self.__unit_suffix())
def tempmax(self): def tempmax(self):
return u'{}°{}'.format(self._tempmax, self._unit_suffix()) return u'{}°{}'.format(self.__tempmax, self.__unit_suffix())
def city(self): def city(self):
city = re.sub('[_-]', ' ', self._city) city = re.sub('[_-]', ' ', self.__city)
return u'{} '.format(city) return u'{} '.format(city)
def output(self, widget): def output(self, widget):
if not self._valid: if not self.__valid:
return u'?' return u'?'
if self._showminmax: if self.__showminmax:
self._showcity=False self.__showcity=False
return self.city() + self.temperature() + ' Hi:' + self.tempmax() + ' Lo:' + self.tempmin() return self.city() + self.temperature() + ' Hi:' + self.tempmax() + ' Lo:' + self.tempmin()
elif self._showcity: elif self.__showcity:
return self.city() + self.temperature() return self.city() + self.temperature()
else: else:
return self.temperature() return self.temperature()
def state(self, widget): def state(self, widget):
if self._valid: if self.__valid:
if 'thunderstorm' in self._weather: if 'thunderstorm' in self.__weather:
return ['thunder'] return ['thunder']
elif 'drizzle' in self._weather: elif 'drizzle' in self.__weather:
return ['rain'] return ['rain']
elif 'rain' in self._weather: elif 'rain' in self.__weather:
return ['rain'] return ['rain']
elif 'snow' in self._weather: elif 'snow' in self.__weather:
return ['snow'] return ['snow']
elif 'sleet' in self._weather: elif 'sleet' in self.__weather:
return ['sleet'] return ['sleet']
elif 'clear' in self._weather: elif 'clear' in self.__weather:
return ['clear'] return ['clear']
elif 'cloud' in self._weather: elif 'cloud' in self.__weather:
return ['clouds'] return ['clouds']
else:
return []
return [] return []
def update(self, widgets): def update(self):
try: try:
weather_url = 'http://api.openweathermap.org/data/2.5/weather?appid={}'.format(self._apikey) weather_url = 'http://api.openweathermap.org/data/2.5/weather?appid={}'.format(self.__apikey)
weather_url = '{}&units={}'.format(weather_url, self._unit) weather_url = '{}&units={}'.format(weather_url, self.__unit)
if self._location[self._index] == 'auto': if self.__location[self.__index] == 'auto':
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(',')
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(): elif self.__location[self.__index].isdigit():
weather_url = '{url}&id={id}'.format(url=weather_url, id=self._location[self._index]) weather_url = '{url}&id={id}'.format(url=weather_url, id=self.__location[self.__index])
else: else:
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.__city = weather['name']
self._temperature = int(weather['main']['temp']) self.__temperature = int(weather['main']['temp'])
self._tempmin = int(weather['main']['temp_min']) self.__tempmin = int(weather['main']['temp_min'])
self._tempmax = int(weather['main']['temp_max']) self.__tempmax = int(weather['main']['temp_max'])
self._weather = weather['weather'][0]['main'].lower() self.__weather = weather['weather'][0]['main'].lower()
self._valid = True self.__valid = True
except Exception: except Exception:
self._valid = False self.__valid = False
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4