lobo/wttr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fxed a regression (geolocation cache)

Browse source
This commit is contained in:
Igor Chubin 2020-09-20 11:09:04 +02:00
parent 5e3ecaeaf4
commit a62e3d979d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/location.py
View file

@ -105,7 +105,14 @@ def ipcache(ip_addr):
if os.path.exists(cached): if os.path.exists(cached):
location = open(cached, 'r').read().split(';') location = open(cached, 'r').read().split(';')
return location if len(location) > 3:
return location[3], location[1]
elif len(location) > 1:
return location[0], location[1]
else:
return location[0], None
return None, None
def ip2location(ip_addr): def ip2location(ip_addr):
"Convert IP address `ip_addr` to a location name" "Convert IP address `ip_addr` to a location name"
@ -125,12 +132,11 @@ def ip2location(ip_addr):
pass pass
if location and ';' in location: if location and ';' in location:
ipcachewrite(ip_addr, location)
location = location.split(';')[3], location.split(';')[1] location = location.split(';')[3], location.split(';')[1]
else: else:
location = location, None location = location, None
if location:
ipcachewrite(ip_addr, location)
return location return location