extern/wttr.in
1
0
Fork 0
mirror of https://github.com/chubin/wttr.in.git synced 2025-08-18 01:20:21 +02:00
Code Issues Packages Projects Releases 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
1 changed files with 3 additions and 9 deletions
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): def geoip(ip_addr):
location = ipcache(ip_addr)
if location:
return location
try: try:
response = GEOIP_READER.city(ip_addr) 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: except geoip2.errors.AddressNotFoundError:
location = None, None, None return None, None, None
if location: return city, region, country
ipcachewrite(ip_addr, location)
return location
def workaround(city, region, country): def workaround(city, region, country):
# workaround for the strange bug with the country name # workaround for the strange bug with the country name