Mirrors/wttr.in
2
0
Fork 0
mirror of https://github.com/chubin/wttr.in synced 2025-01-26 10:45:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework ipcache write to include new data from all sources

Browse source
This commit is contained in:
Gregory Danielson 2020-11-15 11:10:19 -06:00
parent c349dc2f17
commit bdcb24742d
No known key found for this signature in database
GPG key ID: 88D4EF22F6C14CA7
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/location.py
View file

@ -102,12 +102,13 @@ def ipcachewrite(ip_addr, location):
os.makedirs(IP2LCACHE)
with open(cachefile, 'w') as file:
file.write(location[0] + ';' + location[1] + ';' + location[2])
# like ip2location format, but reversed
file.write(location[3] + ';' + location[2] + ';' + location[1] + ';' + location[0] + ';' + location[4] + ';' + location[5])
# like ip2location format
def ipcache(ip_addr):
""" Retrieve a location from cache by ip addr
Returns a triple of (CITY, REGION, COUNTRY) or None
TODO: When cache becomes more robust, transition to using latlong
"""
cachefile = os.path.join(IP2LCACHE, ip_addr)
if not os.path.exists(IP2LCACHE):
@ -115,10 +116,11 @@ def ipcache(ip_addr):
if os.path.exists(cachefile):
try:
city, region, country = open(cachefile, 'r').read().split(';')
_, country, region, city, *_ = open(cachefile, 'r').read().split(';')
return city, region, country
except ValueError:
# cache entry is malformed: should be city;region;country
# cache entry is malformed: should be
# [ccode];country;region;city;[lat];[long];...
return None
return None