github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use Plex.tv for geoip lookup instead of MaxMind database

Browse source
This commit is contained in:
JonnyWong16 2020-04-27 17:28:44 -07:00
parent 2162210393
commit 82ab732144
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
3 changed files with 60 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
plexpy/webserve.py
View file

@ -5751,10 +5751,22 @@ class WebInterface(object):
}
```
"""
geo_info = helpers.geoip_lookup(ip_address)
if isinstance(geo_info, basestring):
return {'error': geo_info}
return geo_info
message = ''
if not ip_address:
message = 'No IP address provided.'
elif not helpers.is_valid_ip(ip_address):
message = 'Invalid IP address provided: %s' % ip_address
elif not helpers.is_public_ip(ip_address):
message = 'Non-public IP address provided: %s' % ip_address
if message:
return {'result': 'error', 'message': message}
plex_tv = plextv.PlexTV()
geo_info = plex_tv.get_geoip_lookup(ip_address)
if geo_info:
return {'result': 'success', 'data': geo_info}
return {'result': 'error', 'message': 'Failed to lookup GeoIP info for address: %s' % ip_address}
@cherrypy.expose
@cherrypy.tools.json_out()