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

Merge pull request #854 from mihaimorariu/fix/publicip-exception

Browse source 
Fix publicip
This commit is contained in:
tobi-wan-kenobi 2022-02-14 15:19:58 +01:00 committed by GitHub
commit 8897c1bde5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bumblebee_status/modules/contrib/sun.py
View file

@ -39,7 +39,11 @@ class Module(core.module.Module):
self.__sun = None self.__sun = None
if not lat or not lon: if not lat or not lon:
try:
lat, lon = util.location.coordinates() lat, lon = util.location.coordinates()
except Exception:
pass
if lat and lon: if lat and lon:
self.__sun = Sun(float(lat), float(lon)) self.__sun = Sun(float(lat), float(lon))
@ -55,6 +59,10 @@ class Module(core.module.Module):
return "n/a" return "n/a"
def __calculate_times(self): def __calculate_times(self):
if not self.__sun:
self.__sunset = self.__sunrise = None
return
self.__isup = False self.__isup = False
order_matters = True order_matters = True

4
bumblebee_status/util/location.py
View file

@ -59,11 +59,11 @@ def __load():
__next = time.time() + 60 * 30 # error - try again every 30m __next = time.time() + 60 * 30 # error - try again every 30m
def __get(name, default=None): def __get(name):
global __data global __data
if not __data or __expired(): if not __data or __expired():
__load() __load()
return __data.get(name, default) return __data[name]
def reset(): def reset():