github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-14 02:26:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix get_server_friendly_name

Browse source
This commit is contained in:
Jonathan Wong 2015-11-16 22:51:21 -08:00
commit 1983597cf1
4 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

37
plexpy/pmsconnect.py
View file

@ -19,6 +19,23 @@ from urlparse import urlparse
import plexpy
import urllib2
def get_server_friendly_name():
logger.info("Requesting name from server...")
server_name = PmsConnect().get_server_pref(pref='FriendlyName')
# If friendly name is blank
if not server_name:
servers_info = PmsConnect().get_servers_info()
for server in servers_info:
if server['machine_identifier'] == plexpy.CONFIG.PMS_IDENTIFIER:
server_name = server['name']
break
if server_name and server_name != plexpy.CONFIG.PMS_NAME:
plexpy.CONFIG.__setattr__('PMS_NAME', server_name)
plexpy.CONFIG.write()
return server_name
class PmsConnect(object):
"""
@ -1631,22 +1648,4 @@ class PmsConnect(object):
'children': parents}
}
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
if server_name != plexpy.CONFIG.PMS_NAME:
plexpy.CONFIG.__setattr__('PMS_NAME', server_name)
plexpy.CONFIG.write()
return server_name
return key_list