Mirrored_Repos/JBOPS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from blacktwin/blacktwin-patch-1

Browse Source 
resolve n/a returns from geolite2
This commit is contained in:
blacktwin 2017-07-21 09:30:05 -04:00 committed by GitHub
commit adbc61342f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maps/ips_to_maps.py
View File

@ -136,7 +136,6 @@ def get_geoip_info(ip_address=''):
try: try:
r = requests.get(PLEXPY_URL.rstrip('/') + '/api/v2', params=payload) r = requests.get(PLEXPY_URL.rstrip('/') + '/api/v2', params=payload)
response = r.json() response = r.json()
# print(json.dumps(response, indent=4, sort_keys=True))
if response['response']['result'] == 'success': if response['response']['result'] == 'success':
data = response['response']['data'] data = response['response']['data']
if data.get('error'): if data.get('error'):
@ -148,7 +147,7 @@ def get_geoip_info(ip_address=''):
raise Exception(response['response']['message']) raise Exception(response['response']['message'])
except Exception as e: except Exception as e:
sys.stderr.write("PlexPy API 'get_geoip_lookup' request failed: {0}.".format(e)) sys.stderr.write("PlexPy API 'get_geoip_lookup' request failed: {0}.".format(e))
return GeoData() pass
def get_stream_type_by_top_10_platforms(): def get_stream_type_by_top_10_platforms():
# Get the user IP list from PlexPy # Get the user IP list from PlexPy
@ -192,6 +191,9 @@ def get_geo_dict(length, users):
'ip': ip, 'play_count': a.play_count, 'ip': ip, 'play_count': a.play_count,
'platform':a.platform, 'location_count': city_cnt}) 'platform':a.platform, 'location_count': city_cnt})
except AttributeError:
print('User: {} IP: {} caused error in geo_dict.'.format(a.friendly_name, a.ip_address))
pass
except Exception as e: except Exception as e:
print(e) print(e)
pass pass