extern/wttr.in
1
0
Fork 0
mirror of https://github.com/chubin/wttr.in.git synced 2025-08-15 00:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rework ip2location to include ccode, lat, long for cache purposes

Browse Source
This commit is contained in:
Gregory Danielson
2020-11-15 10:56:43 -06:00
parent 66802657a5
commit b7517bce65
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/location.py
View File

@ -128,19 +128,18 @@ def ip2location(ip_addr):
# if IP2LOCATION_KEY is not set, do not query,
# because the query wont be processed anyway
if not IP2LOCATION_KEY:
return None, None, None
return None
try:
r = requests.get(
'http://api.ip2location.com/?ip=%s&key=%s&package=WS3'
'http://api.ip2location.com/?ip=%s&key=%s&package=WS5'
% (ip_addr, IP2LOCATION_KEY))
r.raise_for_status()
location = r.text
if location and ';' in location:
_, country, region, city = location.split(';')
location = city, region, country
ccode, country, region, city, lat, long, *_ = location.split(';')
except requests.exceptions.RequestException:
return None, None, None
return city, region, country
return None
return city, region, country, ccode, lat, long
def ipinfo(ip_addr):