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

Improved get server friendly name

Browse source 
* Add server friendly name to page title
This commit is contained in:
Jonathan Wong 2015-11-15 21:35:53 -08:00
parent e9bc767c3b
commit f8b75eadc6
5 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/base.html
View file

@ -7,7 +7,7 @@ from plexpy import version
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>PlexPy - ${title}</title> <title>PlexPy - ${title} | ${server_name}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">

12
data/interfaces/default/index.html
View file

@ -100,20 +100,12 @@
function getLibraryStatsHeader() { function getLibraryStatsHeader() {
$.ajax({ $.ajax({
"url": "get_servers_info", url: 'get_server_friendly_name',
type: "post",
cache: false, cache: false,
async: true, async: true,
data: { }, data: { },
complete: function (xhr, status) { complete: function (xhr, status) {
server_info = $.parseJSON(xhr.responseText); server_name = xhr.responseText;
var server_name = 'Server name not found';
for (var i in server_info) {
if (server_info[i].machine_identifier == '${config['pms_identifier']}') {
server_name = server_info[i].name
break;
}
}
$('#library-statistics-header h3').append(' <small>' + server_name + '</small>') $('#library-statistics-header h3').append(' <small>' + server_name + '</small>')
} }
}); });

9
plexpy/notification_handler.py
View file

@ -270,14 +270,7 @@ def build_notify_text(session=None, timeline=None, state=None):
# Get the server name # Get the server name
pms_connect = pmsconnect.PmsConnect() pms_connect = pmsconnect.PmsConnect()
server_name = pms_connect.get_server_pref(pref='FriendlyName') server_name = pms_connect.get_server_friendly_name()
# If friendly name is blank
if not server_name:
servers_info = pms_connect.get_servers_info()
for server in servers_info:
if server['machine_identifier'] == plexpy.CONFIG.PMS_IDENTIFIER:
server_name = server['name']
break
# Get metadata feed for item # Get metadata feed for item
if session: if session:

16
plexpy/pmsconnect.py
View file

@ -1631,4 +1631,18 @@ class PmsConnect(object):
'children': parents} 'children': parents}
} }
return key_list return key_list
def get_server_friendly_name(self):
server_name = self.get_server_pref(pref='FriendlyName')
# If friendly name is blank
if not server_name:
servers_info = self.get_servers_info()
for server in servers_info:
if server['machine_identifier'] == plexpy.CONFIG.PMS_IDENTIFIER:
server_name = server['name']
break
return server_name

25
plexpy/webserve.py
View file

@ -46,9 +46,13 @@ def serve_template(templatename, **kwargs):
_hplookup = TemplateLookup(directories=[template_dir]) _hplookup = TemplateLookup(directories=[template_dir])
# Get the server name
pms_connect = pmsconnect.PmsConnect()
server_name = pms_connect.get_server_friendly_name()
try: try:
template = _hplookup.get_template(templatename) template = _hplookup.get_template(templatename)
return template.render(**kwargs) return template.render(server_name=server_name, **kwargs)
except: except:
return exceptions.html_error_template().render() return exceptions.html_error_template().render()
@ -1137,10 +1141,25 @@ class WebInterface(object):
logger.warn('Unable to retrieve data.') logger.warn('Unable to retrieve data.')
@cherrypy.expose @cherrypy.expose
def get_server_prefs(self, **kwargs): def get_server_friendly_name(self, **kwargs):
pms_connect = pmsconnect.PmsConnect() pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_server_prefs(output_format='json') result = pms_connect.get_server_friendly_name()
if result:
cherrypy.response.headers['Content-type'] = 'application/json'
return result
else:
logger.warn('Unable to retrieve data.')
@cherrypy.expose
def get_server_prefs(self, pref=None, **kwargs):
if pref:
pms_connect = pmsconnect.PmsConnect()
result = pms_connect.get_server_pref(pref=pref)
else:
result = None
if result: if result:
cherrypy.response.headers['Content-type'] = 'application/json' cherrypy.response.headers['Content-type'] = 'application/json'