anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Missing GeoLite2 database message link to settings page

Browse Source
This commit is contained in:
JonnyWong16
2016-06-30 22:02:17 -07:00
parent c96b1eb09d
commit 82341642f4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plexpy/helpers.py
View File

@@ -579,7 +579,8 @@ def install_geoip_db():
def geoip_lookup(ip_address): def geoip_lookup(ip_address):
if not plexpy.CONFIG.GEOIP_DB: if not plexpy.CONFIG.GEOIP_DB:
return 'GeoLite2 database not installed. Please install from the Settings page.' return 'GeoLite2 database not installed. Please install from the ' \
'<a href="settings?install_geoip=true">Settings</a> page.'
if not ip_address: if not ip_address:
return 'No IP address provided.' return 'No IP address provided.'
@@ -589,7 +590,8 @@ def geoip_lookup(ip_address):
geo = reader.city(ip_address) geo = reader.city(ip_address)
reader.close() reader.close()
except IOError as e: except IOError as e:
return 'Missing GeoLite2 database. Please reinstall from the Settings page.' return 'Missing GeoLite2 database. Please reinstall from the ' \
'<a href="settings?install_geoip=true">Settings</a> page.'
except ValueError as e: except ValueError as e:
return 'Unable to read GeoLite2 database: %s' % e return 'Unable to read GeoLite2 database: %s' % e
except maxminddb.InvalidDatabaseError as e: except maxminddb.InvalidDatabaseError as e: