Change method for determining server list for OAuth

This commit is contained in:
samwiseg00 2018-08-15 20:51:51 -04:00
parent 13dac9c1ea
commit 56e9845b2c

View file

@ -211,17 +211,17 @@ class PlexTV(object):
def get_server_token(self): def get_server_token(self):
servers = self.get_plextv_server_list(output_format='xml') servers = self.get_plextv_resources(output_format='xml')
server_token = '' server_token = ''
try: try:
xml_head = servers.getElementsByTagName('Server') xml_head = servers.getElementsByTagName('Device')
except Exception as e: except Exception as e:
logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_token: %s." % e) logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_token: %s." % e)
return None return None
for a in xml_head: for a in xml_head:
if helpers.get_xml_attr(a, 'machineIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER: if helpers.get_xml_attr(a, 'clientIdentifier') == plexpy.CONFIG.PMS_IDENTIFIER:
server_token = helpers.get_xml_attr(a, 'accessToken') server_token = helpers.get_xml_attr(a, 'accessToken')
break break
@ -812,7 +812,7 @@ class PlexTV(object):
# Get proper download # Get proper download
releases = platform_downloads.get('releases', [{}]) releases = platform_downloads.get('releases', [{}])
release = next((r for r in releases if r['distro'] == plexpy.CONFIG.PMS_UPDATE_DISTRO and release = next((r for r in releases if r['distro'] == plexpy.CONFIG.PMS_UPDATE_DISTRO and
r['build'] == plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD), releases[0]) r['build'] == plexpy.CONFIG.PMS_UPDATE_DISTRO_BUILD), releases[0])
download_info = {'update_available': v_new > v_old, download_info = {'update_available': v_new > v_old,