Mirrors/wttr.in
2
0
Fork 0
mirror of https://github.com/chubin/wttr.in synced 2024-11-15 00:27:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove cache operation from geoip; shortcut where possible

Browse source
This commit is contained in:
Gregory Danielson 2020-11-01 16:31:46 -06:00
parent e4ac3f266f
commit 996485adf1
No known key found for this signature in database
GPG key ID: 88D4EF22F6C14CA7
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/location.py
View file

@ -160,18 +160,12 @@ def ipinfo(ip_addr):
def geoip(ip_addr):
location = ipcache(ip_addr)
if location:
return location
try:
response = GEOIP_READER.city(ip_addr)
location = response.city.name, response.subdivisions.name, response.country.name
city, region, country = response.city.name, response.subdivisions.name, response.country.name
except geoip2.errors.AddressNotFoundError:
location = None, None, None
if location:
ipcachewrite(ip_addr, location)
return location
return None, None, None
return city, region, country
def workaround(city, region, country):
# workaround for the strange bug with the country name