github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-20 13:23:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add user selection to history page

Browse source 
* Clean up buttons
This commit is contained in:
JonnyWong16 2016-04-26 21:36:09 -07:00
commit 4d057a1c5e
12 changed files with 172 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plexpy/pmsconnect.py
View file

@ -959,20 +959,20 @@ class PmsConnect(object):
if a.getElementsByTagName('Track'):
session_data = a.getElementsByTagName('Track')
session_type = 'track'
for session in session_data:
session_output = self.get_session_each(session_type, session)
for session_ in session_data:
session_output = self.get_session_each(session_type, session_)
session_list.append(session_output)
if a.getElementsByTagName('Video'):
session_data = a.getElementsByTagName('Video')
session_type = 'video'
for session in session_data:
session_output = self.get_session_each(session_type, session)
for session_ in session_data:
session_output = self.get_session_each(session_type, session_)
session_list.append(session_output)
if a.getElementsByTagName('Photo'):
session_data = a.getElementsByTagName('Photo')
session_type = 'photo'
for session in session_data:
session_output = self.get_session_each(session_type, session)
for session_ in session_data:
session_output = self.get_session_each(session_type, session_)
session_list.append(session_output)
output = {'stream_count': helpers.get_xml_attr(xml_head[0], 'size'),

10
plexpy/session.py
View file

@ -142,9 +142,11 @@ def friendly_name_to_username(list_of_dicts):
Reverts the friendly name back to the username of the current logged in session
"""
session_user = get_session_user()
for d in list_of_dicts:
if 'friendly_name' in d and d['friendly_name'] != session_user:
d['friendly_name'] = session_user
session_user_id = get_session_user_id()
if session_user_id:
for d in list_of_dicts:
if 'friendly_name' in d and d['friendly_name'] != session_user:
d['friendly_name'] = session_user
return list_of_dicts

2
plexpy/users.py
View file

@ -367,7 +367,7 @@ class Users(object):
user_details = {}
if result:
for item in result:
if session.get_session_user():
if session.get_session_user_id():
friendly_name = session.get_session_user()
elif item['friendly_name']:
friendly_name = item['friendly_name']

4
plexpy/webserve.py
View file

@ -861,8 +861,8 @@ class WebInterface(object):
custom_where.append(['session_history_metadata.section_id', section_id])
if 'media_type' in kwargs:
media_type = kwargs.get('media_type', "")
if media_type != 'all':
custom_where.append(['session_history.media_type', media_type])
if media_type:
custom_where.append(['session_history.media_type', media_type])
if 'transcode_decision' in kwargs:
transcode_decision = kwargs.get('transcode_decision', "")
if transcode_decision: