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

Log DLNA platform

Browse source
This commit is contained in:
JonnyWong16 2016-10-13 21:07:01 -07:00 • committed by JonnyWong16
parent 6d0327f662
commit 1b1e4639fd
2 changed files with 39 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/js/script.js
View file

@ -259,6 +259,8 @@ function getPlatformImagePath(platformName) {
return 'images/platforms/wp.png';
} else if (platformName.indexOf("Plex Media Player") > -1) {
return 'images/platforms/pmp.png';
} else if (platformName.indexOf("DLNA") > -1) {
return 'images/platforms/dlna.png';
} else {
return 'images/platforms/default.png';
}

74
plexpy/pmsconnect.py
View file

@ -1091,10 +1091,10 @@ class PmsConnect(object):
user_details = user_data.get_details(
user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title'))
if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Track'):
machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')[:-6]
else:
machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')
player = session.getElementsByTagName('Player')[0]
platform = helpers.get_xml_attr(player, 'platform')
if not platform and helpers.get_xml_attr(player, 'product') == 'DLNA':
platform = 'DLNA'
labels = []
if session.getElementsByTagName('Label'):
@ -1114,11 +1114,11 @@ class PmsConnect(object):
'user_id': user_details['user_id'],
'friendly_name': user_details['friendly_name'],
'user_thumb': user_details['user_thumb'],
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
'machine_id': machine_id,
'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
'ip_address': helpers.get_xml_attr(player, 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(player, 'title'),
'platform': platform,
'machine_id': helpers.get_xml_attr(player, 'machineIdentifier').rstrip('_Track'),
'state': helpers.get_xml_attr(player, 'state'),
'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
'title': helpers.get_xml_attr(session, 'title'),
@ -1233,10 +1233,10 @@ class PmsConnect(object):
user_details = user_data.get_details(
user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title'))
if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Video'):
machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')[:-6]
else:
machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')
player = session.getElementsByTagName('Player')[0]
platform = helpers.get_xml_attr(player, 'platform')
if not platform and helpers.get_xml_attr(player, 'product') == 'DLNA':
platform = 'DLNA'
labels = []
if session.getElementsByTagName('Label'):
@ -1257,11 +1257,11 @@ class PmsConnect(object):
'user_id': user_details['user_id'],
'friendly_name': user_details['friendly_name'],
'user_thumb': user_details['user_thumb'],
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
'machine_id': machine_id,
'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
'ip_address': helpers.get_xml_attr(player, 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(player, 'title'),
'platform': platform,
'machine_id': helpers.get_xml_attr(player, 'machineIdentifier').rstrip('_Video'),
'state': helpers.get_xml_attr(player, 'state'),
'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
'title': helpers.get_xml_attr(session, 'title'),
@ -1321,11 +1321,11 @@ class PmsConnect(object):
'user_id': user_details['user_id'],
'friendly_name': user_details['friendly_name'],
'user_thumb': user_details['user_thumb'],
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
'machine_id': machine_id,
'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
'ip_address': helpers.get_xml_attr(player, 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(player, 'title'),
'platform': platform,
'machine_id': helpers.get_xml_attr(player, 'machineIdentifier').rstrip('_Video'),
'state': helpers.get_xml_attr(player, 'state'),
'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
'title': helpers.get_xml_attr(session, 'title'),
@ -1384,11 +1384,11 @@ class PmsConnect(object):
'user_id': user_details['user_id'],
'friendly_name': user_details['friendly_name'],
'user_thumb': user_details['user_thumb'],
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
'machine_id': machine_id,
'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
'ip_address': helpers.get_xml_attr(player, 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(player, 'title'),
'platform': platform,
'machine_id': helpers.get_xml_attr(player, 'machineIdentifier').rstrip('_Video'),
'state': helpers.get_xml_attr(player, 'state'),
'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
'title': helpers.get_xml_attr(session, 'title'),
@ -1467,10 +1467,10 @@ class PmsConnect(object):
user_details = user_data.get_details(
user=helpers.get_xml_attr(session.getElementsByTagName('User')[0], 'title'))
if helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier').endswith('_Photo'):
machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')[:-6]
else:
machine_id = helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'machineIdentifier')
player = session.getElementsByTagName('Player')[0]
platform = helpers.get_xml_attr(player, 'platform')
if not platform and helpers.get_xml_attr(player, 'product') == 'DLNA':
platform = 'DLNA'
labels = []
if session.getElementsByTagName('Label'):
@ -1490,11 +1490,11 @@ class PmsConnect(object):
'user_id': user_details['user_id'],
'friendly_name': user_details['friendly_name'],
'user_thumb': user_details['user_thumb'],
'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'title'),
'platform': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'platform'),
'machine_id': machine_id,
'state': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'state'),
'ip_address': helpers.get_xml_attr(player, 'address').split('::ffff:')[-1],
'player': helpers.get_xml_attr(player, 'title'),
'platform': platform,
'machine_id': helpers.get_xml_attr(player, 'machineIdentifier').rstrip('_Photo'),
'state': helpers.get_xml_attr(player, 'state'),
'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
'title': helpers.get_xml_attr(session, 'title'),