diff --git a/data/interfaces/default/user_player_stats.html b/data/interfaces/default/user_player_stats.html
index 6520cfec..bbe73666 100644
--- a/data/interfaces/default/user_player_stats.html
+++ b/data/interfaces/default/user_player_stats.html
@@ -12,7 +12,8 @@ data[array_index] :: Usable parameters
== Global keys ==
result_id Returns a unique identifier for the result.
player_name Returns the name of the player.
-platform_type Returns the name of the platform
+platform Returns the name of the platform
+platform_name Returns the id name of the platform
total_plays Returns the play count for the player.
DOCUMENTATION :: END
@@ -23,7 +24,9 @@ DOCUMENTATION :: END
-
-
+
${a['player_name']}
@@ -34,9 +37,6 @@ DOCUMENTATION :: END
-
% endfor
% else:
No stats to show.
diff --git a/plexpy/common.py b/plexpy/common.py
index 0fbc45dc..53805e05 100644
--- a/plexpy/common.py
+++ b/plexpy/common.py
@@ -19,6 +19,7 @@ Created on Aug 1, 2011
@author: Michael
'''
import platform
+from collections import OrderedDict
import version
@@ -46,6 +47,39 @@ PLATFORM_NAME_OVERRIDES = {'Konvergo': 'Plex Media Player',
PMS_PLATFORM_NAME_OVERRIDES = {'MacOSX': 'Mac'
}
+PLATFORM_NAMES = {'android': 'android',
+ 'apple tv': 'atv',
+ 'chrome': 'chrome',
+ 'chromecast': 'chromecast',
+ 'dlna': 'dlna',
+ 'firefox': 'firefox',
+ 'internet explorer': 'ie',
+ 'ios': 'ios',
+ 'ipad': 'ios',
+ 'iphone': 'ios',
+ 'kodi': 'kodi',
+ 'linux': 'linux',
+ 'nexus': 'android',
+ 'microsoft edge': 'msedge',
+ 'opera': 'opera',
+ 'playstation': 'playstation',
+ 'plex home theater': 'plex',
+ 'plex media player': 'plex',
+ 'plexamp': 'plexamp',
+ 'plextogether': 'plextogether',
+ 'roku': 'roku',
+ 'safari': 'safari',
+ 'samsung': 'samsung',
+ 'tvos': 'atv',
+ 'vizio': 'opera',
+ 'windows': 'windows',
+ 'windows phone': 'wp',
+ 'wiiu': 'wiiu',
+ 'xbmc': 'xbmc',
+ 'xbox': 'xbox'
+ }
+PLATFORM_NAMES = OrderedDict(sorted(PLATFORM_NAMES.items(), key=lambda k: k[0], reverse=True))
+
MEDIA_FLAGS_AUDIO = {'ac.?3': 'dolby_digital',
'truehd': 'dolby_truehd',
'(dca|dta)': 'dts',
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 08c82b65..078d6aff 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -321,7 +321,7 @@ class DataFactory(object):
'labels': item['labels'].split(';') if item['labels'] else (),
'user': '',
'friendly_name': '',
- 'platform_type': '',
+ 'platform': '',
'platform': '',
'row_id': item['id']
}
@@ -371,7 +371,6 @@ class DataFactory(object):
'labels': item['labels'].split(';') if item['labels'] else (),
'user': '',
'friendly_name': '',
- 'platform_type': '',
'platform': '',
'row_id': item['id']
}
@@ -420,7 +419,6 @@ class DataFactory(object):
'labels': item['labels'].split(';') if item['labels'] else (),
'user': '',
'friendly_name': '',
- 'platform_type': '',
'platform': '',
'row_id': item['id']
}
@@ -470,7 +468,6 @@ class DataFactory(object):
'labels': item['labels'].split(';') if item['labels'] else (),
'user': '',
'friendly_name': '',
- 'platform_type': '',
'platform': '',
'row_id': item['id']
}
@@ -519,7 +516,6 @@ class DataFactory(object):
'labels': item['labels'].split(';') if item['labels'] else (),
'user': '',
'friendly_name': '',
- 'platform_type': '',
'platform': '',
'row_id': item['id']
}
@@ -569,7 +565,6 @@ class DataFactory(object):
'labels': item['labels'].split(';') if item['labels'] else (),
'user': '',
'friendly_name': '',
- 'platform_type': '',
'platform': '',
'row_id': item['id']
}
@@ -624,7 +619,6 @@ class DataFactory(object):
'users_watched': '',
'rating_key': '',
'title': '',
- 'platform_type': '',
'platform': '',
'row_id': ''
}
@@ -659,13 +653,15 @@ class DataFactory(object):
for item in result:
# Rename Mystery platform names
- platform_type = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
+ platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
+ platform_name = next((v for k, v in common.PLATFORM_NAMES.iteritems() if k in platform.lower()), 'default')
row = {'platform': item['platform'],
'total_plays': item['total_plays'],
'total_duration': item['total_duration'],
'last_play': item['last_watch'],
- 'platform_type': platform_type,
+ 'platform': platform,
+ 'platform_name': platform_name,
'title': '',
'thumb': '',
'grandparent_thumb': '',
diff --git a/plexpy/libraries.py b/plexpy/libraries.py
index 4deee3a7..d6a2a8c0 100644
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -262,7 +262,7 @@ class Libraries(object):
row = {'section_id': item['section_id'],
'section_name': item['section_name'],
- 'section_type': item['section_type'].capitalize(),
+ 'section_type': item['section_type'],
'count': item['count'],
'parent_count': item['parent_count'],
'child_count': item['child_count'],
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index ce30ec91..4b86d86e 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -1277,21 +1277,18 @@ 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_)
+ session_output = self.get_session_each(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_)
+ session_output = self.get_session_each(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_)
+ session_output = self.get_session_each(session_)
session_list.append(session_output)
session_list = sorted(session_list, key=lambda k: k['session_key'])
@@ -1302,13 +1299,12 @@ class PmsConnect(object):
return output
- def get_session_each(self, stream_type='', session=None):
+ def get_session_each(self, session=None):
"""
Return selected data from current sessions.
This function processes and validates session data
- Parameters required: stream_type { track or video }
- session { the session dictionary }
+ Parameters required: session { the session dictionary }
Output: dict
"""
@@ -1328,10 +1324,13 @@ class PmsConnect(object):
if not platform and helpers.get_xml_attr(player_info, 'product') == 'DLNA':
platform = 'DLNA'
+ platform_name = next((v for k, v in common.PLATFORM_NAMES.iteritems() if k in platform.lower()), 'default')
+
player_details = {'ip_address': helpers.get_xml_attr(player_info, 'address').split('::ffff:')[-1],
'ip_address_public': helpers.get_xml_attr(player_info, 'remotePublicAddress').split('::ffff:')[-1],
'device': helpers.get_xml_attr(player_info, 'device'),
'platform': platform,
+ 'platform_name': platform_name,
'platform_version': helpers.get_xml_attr(player_info, 'platformVersion'),
'product': helpers.get_xml_attr(player_info, 'product'),
'product_version': helpers.get_xml_attr(player_info, 'version'),
diff --git a/plexpy/users.py b/plexpy/users.py
index 4ba68f9f..3a7a8238 100644
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -452,10 +452,12 @@ class Users(object):
for item in result:
# Rename Mystery platform names
- platform_type = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
+ platform = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
+ platform_name = next((v for k, v in common.PLATFORM_NAMES.iteritems() if k in platform.lower()), 'default')
row = {'player_name': item['player'],
- 'platform_type': platform_type,
+ 'platform': platform,
+ 'platform_name': platform_name,
'total_plays': item['player_count'],
'result_id': result_id
}