Catch RequestException when fetching weather
This commit is contained in:
parent
f0bacdecd8
commit
d826e250c8
1 changed files with 16 additions and 12 deletions
|
@ -20,6 +20,7 @@ import json
|
|||
import time
|
||||
try:
|
||||
import requests
|
||||
from requests.exceptions import RequestException
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
@ -50,17 +51,20 @@ class Module(bumblebee.engine.Module):
|
|||
def update(self, widgets):
|
||||
timestamp = int(time.time())
|
||||
if self._nextcheck < int(time.time()):
|
||||
self._nextcheck = int(time.time()) + self._interval*60
|
||||
weather_url = "http://api.openweathermap.org/data/2.5/weather?appid={}".format(self._apikey)
|
||||
weather_url = "{}&units={}".format(weather_url, self._unit)
|
||||
if self._location == "auto":
|
||||
location_url = "http://ipinfo.io/json"
|
||||
location = json.loads(requests.get(location_url).text)
|
||||
coord = location["loc"].split(",")
|
||||
weather_url = "{url}&lat={lat}&lon={lon}".format(url=weather_url, lat=coord[0], lon=coord[1])
|
||||
else:
|
||||
weather_url = "{url}&q={city}".format(url=weather_url, city=self._location)
|
||||
weather = json.loads(requests.get(weather_url).text)
|
||||
self._temperature = int(weather['main']['temp'])
|
||||
try:
|
||||
self._nextcheck = int(time.time()) + self._interval*60
|
||||
weather_url = "http://api.openweathermap.org/data/2.5/weather?appid={}".format(self._apikey)
|
||||
weather_url = "{}&units={}".format(weather_url, self._unit)
|
||||
if self._location == "auto":
|
||||
location_url = "http://ipinfo.io/json"
|
||||
location = json.loads(requests.get(location_url).text)
|
||||
coord = location["loc"].split(",")
|
||||
weather_url = "{url}&lat={lat}&lon={lon}".format(url=weather_url, lat=coord[0], lon=coord[1])
|
||||
else:
|
||||
weather_url = "{url}&q={city}".format(url=weather_url, city=self._location)
|
||||
weather = json.loads(requests.get(weather_url).text)
|
||||
self._temperature = int(weather['main']['temp'])
|
||||
except RequestException:
|
||||
pass
|
||||
|
||||
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
|
||||
|
|
Loading…
Reference in a new issue