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

ip2location fixes

Browse Source
This commit is contained in:
Igor Chubin
2018-10-26 19:35:13 +02:00
parent 68f9c8cb3c
commit 0c67b15e8a
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/location.py
View File

@ -89,21 +89,25 @@ def ip2location(ip_addr):
if not os.path.exists(IP2LCACHE):
os.makedirs(IP2LCACHE)
location = None
if os.path.exists(cached):
location = open(cached, 'r').read()
return location
else:
try:
ip2location_response = requests\
.get('http://api.ip2location.com/?ip=%s&key=%s&package=WS10' \
% (ip_addr, IP2LOCATION_KEY)).text
if ';' in ip2location_response:
open(cached, 'w').write(ip2location_response)
location = ip2location_response
except requests.exceptions.ConnectionError:
pass
try:
ip2location_response = requests\
.get('http://api.ip2location.com/?ip=%s&key=%s&package=WS10' \
% (IP2LOCATION_KEY, ip_addr)).text
if ';' in ip2location_response:
location = ip2location_response.split(';')[3]
open(cached, 'w').write(location)
print "ip2location says: %s" % location
return location
except requests.exceptions.ConnectionError:
return None
if ';' in location:
location = "%s,%s" % (location.split(';')[3], location.split(';')[1])
return location
def get_location(ip_addr):
"""