github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-31 03:50:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/version.py
#	plexpy/webserve.py
This commit is contained in:
JonnyWong16 2020-05-16 16:22:10 -07:00
commit 17a01d65aa
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
9 changed files with 39 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plexpy/pmsconnect.py
View file

@ -1585,7 +1585,11 @@ class PmsConnect(object):
# Get the user details
user_info = session.getElementsByTagName('User')[0]
user_details = users.Users().get_details(user=helpers.get_xml_attr(user_info, 'title'))
user_id = helpers.get_xml_attr(user_info, 'id')
if user_id == '1': # Admin user
user_details = users.Users().get_details(user=helpers.get_xml_attr(user_info, 'title'))
else:
user_details = users.Users().get_details(user_id=user_id)
# Get the player details
player_info = session.getElementsByTagName('Player')[0]
@ -1818,7 +1822,8 @@ class PmsConnect(object):
'stream_subtitle_location': helpers.get_xml_attr(subtitle_stream_info, 'location'),
'stream_subtitle_language': helpers.get_xml_attr(subtitle_stream_info, 'language'),
'stream_subtitle_language_code': helpers.get_xml_attr(subtitle_stream_info, 'languageCode'),
'stream_subtitle_decision': helpers.get_xml_attr(subtitle_stream_info, 'decision')
'stream_subtitle_decision': helpers.get_xml_attr(subtitle_stream_info, 'decision'),
'stream_subtitle_transient': int(helpers.get_xml_attr(subtitle_stream_info, 'transient') == '1')
}
else:
subtitle_selected = None
@ -1829,7 +1834,8 @@ class PmsConnect(object):
'stream_subtitle_location': '',
'stream_subtitle_language': '',
'stream_subtitle_language_code': '',
'stream_subtitle_decision': ''
'stream_subtitle_decision': '',
'stream_subtitle_transient': 0
}
# Get the bif thumbnail