From c501923f2bd3cb2e164aa8a6abf05408695d7c01 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Fri, 27 Nov 2015 18:13:20 -0800 Subject: [PATCH 01/22] Hide Pushalot notifier response logging --- plexpy/notifiers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index c072cefc..a933c840 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -896,9 +896,9 @@ class PUSHALOT(object): response = http_handler.getresponse() request_status = response.status - logger.debug(u"Pushalot response status: %r" % request_status) - logger.debug(u"Pushalot response headers: %r" % response.getheaders()) - logger.debug(u"Pushalot response body: %r" % response.read()) + #logger.debug(u"Pushalot response status: %r" % request_status) + #logger.debug(u"Pushalot response headers: %r" % response.getheaders()) + #logger.debug(u"Pushalot response body: %r" % response.read()) if request_status == 200: logger.info(u"Pushalot notifications sent.") From 1c00f82097738a9777abe635288bd45cdcbefb2a Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Fri, 27 Nov 2015 21:13:17 -0800 Subject: [PATCH 02/22] Add ability to delete users --- data/interfaces/default/css/plexpy.css | 3 +- data/interfaces/default/js/tables/users.js | 40 ++++++++++++++-- data/interfaces/default/users.html | 53 +++++++++++++++++----- plexpy/__init__.py | 13 +++++- plexpy/datafactory.py | 34 ++++++++++++++ plexpy/users.py | 4 +- plexpy/webserve.py | 34 ++++++++++++++ 7 files changed, 160 insertions(+), 21 deletions(-) diff --git a/data/interfaces/default/css/plexpy.css b/data/interfaces/default/css/plexpy.css index e2e11185..af57d0c1 100644 --- a/data/interfaces/default/css/plexpy.css +++ b/data/interfaces/default/css/plexpy.css @@ -2374,7 +2374,8 @@ a .home-platforms-instance-list-oval:hover, top: 5px; left: 12px; } -#users-to-delete > li { +#users-to-delete > li, +#users-to-purge > li { color: #e9a049; } #updatebar { diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index 78240a3e..ab03435e 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -1,3 +1,4 @@ +var users_to_delete = []; var users_to_purge = []; users_list_table_options = { @@ -22,7 +23,8 @@ users_list_table_options = { "targets": [0], "data": null, "createdCell": function (td, cellData, rowData, row, col) { - $(td).html('
   ' + + $(td).html('
 ' + + '   ' + ' ' + ' '); // Show/hide user currently doesn't work @@ -286,16 +288,44 @@ $('#users_list_table').on('change', 'td.edit-control > .edit-user-toggles > inpu }); }); -$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button', function () { +$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button.delete-user', function () { var tr = $(this).parents('tr'); var row = users_list_table.row(tr); var rowData = row.data(); - var index = $.inArray(rowData['user_id'], users_to_purge); - if (index === -1) { + var index_delete = $.inArray(rowData['user_id'], users_to_delete); + var index_purge = $.inArray(rowData['user_id'], users_to_purge); + + if (index_delete === -1) { + users_to_delete.push(rowData['user_id']); + if (index_purge === -1) { + tr.find('button.purge-user').click(); + } + } else { + users_to_delete.splice(index_delete, 1); + if (index_purge != -1) { + tr.find('button.purge-user').click(); + } + } + $(this).toggleClass('btn-warning').toggleClass('btn-danger'); + +}); + +$('#users_list_table').on('click', 'td.edit-control > .edit-user-toggles > button.purge-user', function () { + var tr = $(this).parents('tr'); + var row = users_list_table.row(tr); + var rowData = row.data(); + + var index_delete = $.inArray(rowData['user_id'], users_to_delete); + var index_purge = $.inArray(rowData['user_id'], users_to_purge); + + if (index_purge === -1) { users_to_purge.push(rowData['user_id']); } else { - users_to_purge.splice(index, 1); + users_to_purge.splice(index_purge, 1); + if (index_delete != -1) { + tr.find('button.delete-user').click(); + } } $(this).toggleClass('btn-warning').toggleClass('btn-danger'); }); \ No newline at end of file diff --git a/data/interfaces/default/users.html b/data/interfaces/default/users.html index f4bc65c2..c97c46e8 100644 --- a/data/interfaces/default/users.html +++ b/data/interfaces/default/users.html @@ -16,7 +16,7 @@   - +
@@ -46,16 +46,16 @@
- +
-

Are you REALLY sure you want to purge all history for the following users:

    +

      This is permanent and cannot be undone!

      - +
      @@ -74,8 +74,8 @@ diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 9e3e25c6..88fb73f7 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -406,9 +406,9 @@ def dbcheck(): c_db.execute( 'CREATE TABLE IF NOT EXISTS users (id INTEGER PRIMARY KEY AUTOINCREMENT, ' 'user_id INTEGER DEFAULT NULL UNIQUE, username TEXT NOT NULL UNIQUE, ' - 'friendly_name TEXT, thumb TEXT, email TEXT, is_home_user INTEGER DEFAULT NULL, ' + 'friendly_name TEXT, thumb TEXT, email TEXT, custom_avatar_url TEXT, is_home_user INTEGER DEFAULT NULL, ' 'is_allow_sync INTEGER DEFAULT NULL, is_restricted INTEGER DEFAULT NULL, do_notify INTEGER DEFAULT 1, ' - 'keep_history INTEGER DEFAULT 1, custom_avatar_url TEXT)' + 'keep_history INTEGER DEFAULT 1, deleted_user INTEGER DEFAULT 0)' ) # Upgrade sessions table from earlier versions @@ -664,6 +664,15 @@ def dbcheck(): 'WHERE t1.id = session_history.id) ' ) + # Upgrade users table from earlier versions + try: + c_db.execute('SELECT deleted_user from users') + except sqlite3.OperationalError: + logger.debug(u"Altering database. Updating database table users.") + c_db.execute( + 'ALTER TABLE users ADD COLUMN deleted_user INTEGER DEFAULT 0' + ) + conn_db.commit() c_db.close() diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 948b8fa4..544df9f7 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -800,6 +800,40 @@ class DataFactory(object): else: return 'Unable to delete items. Input user_id not valid.' + def delete_user(self, user_id=None): + monitor_db = database.MonitorDatabase() + + if user_id.isdigit(): + self.delete_all_user_history(user_id) + logger.info(u"PlexPy DataFactory :: Deleting user with id %s from database." % user_id) + monitor_db.action('UPDATE users SET deleted_user = 1 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET keep_history = 0 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET do_notify = 0 WHERE user_id = ?', [user_id]) + + return 'Deleted user with id %s.' % user_id + else: + return 'Unable to delete user. Input user_id not valid.' + + def undelete_user(self, user_id=None, username=None): + monitor_db = database.MonitorDatabase() + + if user_id and user_id.isdigit(): + logger.info(u"PlexPy DataFactory :: Re-adding user with id %s to database." % user_id) + monitor_db.action('UPDATE users SET deleted_user = 0 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET keep_history = 1 WHERE user_id = ?', [user_id]) + monitor_db.action('UPDATE users SET do_notify = 1 WHERE user_id = ?', [user_id]) + + return 'Re-added user with id %s.' % user_id + elif username: + logger.info(u"PlexPy DataFactory :: Re-adding user with username %s to database." % username) + monitor_db.action('UPDATE users SET deleted_user = 0 WHERE username = ?', [username]) + monitor_db.action('UPDATE users SET keep_history = 1 WHERE username = ?', [username]) + monitor_db.action('UPDATE users SET do_notify = 1 WHERE username = ?', [username]) + + return 'Re-added user with username %s.' % username + else: + return 'Unable to re-add user. Input user_id or username not valid.' + def get_search_query(self, rating_key=''): monitor_db = database.MonitorDatabase() diff --git a/plexpy/users.py b/plexpy/users.py index 1c0c23a7..bccda2f7 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -24,6 +24,8 @@ class Users(object): def get_user_list(self, kwargs=None): data_tables = datatables.DataTables() + custom_where = ['users.deleted_user', 0] + columns = ['session_history.id', 'users.user_id as user_id', 'users.custom_avatar_url as user_thumb', @@ -48,7 +50,7 @@ class Users(object): try: query = data_tables.ssp_query(table_name='users', columns=columns, - custom_where=[], + custom_where=[custom_where], group_by=['users.user_id'], join_types=['LEFT OUTER JOIN', 'LEFT OUTER JOIN', diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 62b16cc5..85be241f 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1397,6 +1397,40 @@ class WebInterface(object): cherrypy.response.headers['Content-type'] = 'application/json' return json.dumps({'message': 'no data received'}) + @cherrypy.expose + def delete_user(self, user_id, **kwargs): + data_factory = datafactory.DataFactory() + + if user_id: + delete_row = data_factory.delete_user(user_id=user_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + + @cherrypy.expose + def undelete_user(self, user_id=None, username=None, **kwargs): + data_factory = datafactory.DataFactory() + + if user_id: + delete_row = data_factory.undelete_user(user_id=user_id) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + elif username: + delete_row = data_factory.undelete_user(username=username) + + if delete_row: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': delete_row}) + else: + cherrypy.response.headers['Content-type'] = 'application/json' + return json.dumps({'message': 'no data received'}) + @cherrypy.expose def search(self, query=''): From d7284c40bd4cd0b9e63f75242ac4c8ebd70691b6 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 1 Dec 2015 20:03:25 -0800 Subject: [PATCH 03/22] Allow unicode in notification subject and body --- plexpy/config.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/plexpy/config.py b/plexpy/config.py index 08054742..3064af10 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -154,24 +154,24 @@ _CONFIG_DEFINITIONS = { 'NOTIFY_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 0), 'NOTIFY_RECENTLY_ADDED_DELAY': (int, 'Monitoring', 60), 'NOTIFY_WATCHED_PERCENT': (int, 'Monitoring', 85), - 'NOTIFY_ON_START_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_START_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) started playing {title}.'), - 'NOTIFY_ON_STOP_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_STOP_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has stopped {title}.'), - 'NOTIFY_ON_PAUSE_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_PAUSE_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has paused {title}.'), - 'NOTIFY_ON_RESUME_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_RESUME_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has resumed {title}.'), - 'NOTIFY_ON_BUFFER_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_BUFFER_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) is buffering {title}.'), - 'NOTIFY_ON_WATCHED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_WATCHED_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has watched {title}.'), - 'NOTIFY_ON_CREATED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_CREATED_BODY_TEXT': (str, 'Monitoring', '{title} was recently added to Plex.'), - 'NOTIFY_ON_EXTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_EXTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex Media Server remote access is down.'), - 'NOTIFY_ON_INTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'), - 'NOTIFY_ON_INTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex Media Server is down.'), + 'NOTIFY_ON_START_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_START_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) started playing {title}.'), + 'NOTIFY_ON_STOP_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_STOP_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has stopped {title}.'), + 'NOTIFY_ON_PAUSE_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_PAUSE_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has paused {title}.'), + 'NOTIFY_ON_RESUME_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_RESUME_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has resumed {title}.'), + 'NOTIFY_ON_BUFFER_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_BUFFER_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) is buffering {title}.'), + 'NOTIFY_ON_WATCHED_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_WATCHED_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has watched {title}.'), + 'NOTIFY_ON_CREATED_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_CREATED_BODY_TEXT': (unicode, 'Monitoring', '{title} was recently added to Plex.'), + 'NOTIFY_ON_EXTDOWN_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_EXTDOWN_BODY_TEXT': (unicode, 'Monitoring', 'The Plex Media Server remote access is down.'), + 'NOTIFY_ON_INTDOWN_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'), + 'NOTIFY_ON_INTDOWN_BODY_TEXT': (unicode, 'Monitoring', 'The Plex Media Server is down.'), 'OSX_NOTIFY_APP': (str, 'OSX_Notify', '/Applications/PlexPy'), 'OSX_NOTIFY_ENABLED': (int, 'OSX_Notify', 0), 'OSX_NOTIFY_ON_PLAY': (int, 'OSX_Notify', 0), From c65d9898c8202f8450557fb760d111dc9130196f Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 1 Dec 2015 20:05:37 -0800 Subject: [PATCH 04/22] Add icon for Apple tvOS --- data/interfaces/default/js/script.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 50348c46..4332ecc2 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -176,7 +176,9 @@ function getPlatformImagePath(platformName) { if (platformName.indexOf("Roku") > -1) { return 'interfaces/default/images/platforms/roku.png'; } else if (platformName.indexOf("Apple TV") > -1) { - return 'interfaces/default/images/platforms/appletv.png'; + return 'interfaces/default/images/platforms/atv.png'; + } else if (platformName.indexOf("tvOS") > -1) { + return 'interfaces/default/images/platforms/atv.png'; } else if (platformName.indexOf("Firefox") > -1) { return 'interfaces/default/images/platforms/firefox.png'; } else if (platformName.indexOf("Chromecast") > -1) { From bac5018b275b5908053e7b92f8a40ca15f2c0058 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 1 Dec 2015 21:31:48 -0800 Subject: [PATCH 05/22] Add channel support to Telegram notifier --- plexpy/config.py | 2 +- plexpy/notifiers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plexpy/config.py b/plexpy/config.py index 3064af10..381fe064 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -250,7 +250,7 @@ _CONFIG_DEFINITIONS = { 'REFRESH_USERS_ON_STARTUP': (int, 'Monitoring', 1), 'TELEGRAM_BOT_TOKEN': (str, 'Telegram', ''), 'TELEGRAM_ENABLED': (int, 'Telegram', 0), - 'TELEGRAM_CHAT_ID': (int, 'Telegram', 0), + 'TELEGRAM_CHAT_ID': (str, 'Telegram', ''), 'TELEGRAM_ON_PLAY': (int, 'Telegram', 0), 'TELEGRAM_ON_STOP': (int, 'Telegram', 0), 'TELEGRAM_ON_PAUSE': (int, 'Telegram', 0), diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index a933c840..23bf66b1 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -1526,7 +1526,7 @@ class TELEGRAM(object): {'label': 'Telegram Chat ID', 'value': self.chat_id, 'name': 'telegram_chat_id', - 'description': 'Your Telegram Chat ID or Group ID. Contact @myidbot on Telegram to get an ID.', + 'description': 'Your Telegram Chat ID, Group ID, or channel username. Contact @myidbot on Telegram to get an ID.', 'input_type': 'text' } ] From b8d9c8cc47b8165c3f54d936858bf9c422d4dd5d Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 1 Dec 2015 21:50:47 -0800 Subject: [PATCH 06/22] Set blank metadata so recently added check continues when and item isn't found --- plexpy/activity_pinger.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index aa41d1fe..e57a0c91 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -180,6 +180,8 @@ def check_recently_added(): recently_added = recently_added_list['recently_added'] for item in recently_added: + metadata = [] + if item['media_type'] == 'movie': metadata_list = pms_connect.get_metadata_details(item['rating_key']) if metadata_list: From 10c54c2d108e8caf8bcfc201c034999b3013d9ee Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 1 Dec 2015 21:57:02 -0800 Subject: [PATCH 07/22] Only show IPv4 addresses --- plexpy/activity_processor.py | 36 ++++++++++++++++++------------------ plexpy/pmsconnect.py | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index bdc2b83d..fb1a2376 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -286,16 +286,16 @@ class ActivityProcessor(object): # The logged IP will always be the first match and we don't want localhost entries if ipv4[0] != '127.0.0.1': # check if IPv4 mapped IPv6 address (::ffff:xxx.xxx.xxx.xxx) - if '::ffff:' + ipv4[0] in line: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " - u"and machineIdentifier %s." - % ('::ffff:' + ipv4[0], rating_key, machine_id)) - return '::ffff:' + ipv4[0] - else: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " - u"and machineIdentifier %s." - % (ipv4[0], rating_key, machine_id)) - return ipv4[0] + #if '::ffff:' + ipv4[0] in line: + # logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " + # u"and machineIdentifier %s." + # % ('::ffff:' + ipv4[0], rating_key, machine_id)) + # return '::ffff:' + ipv4[0] + #else: + logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s " + u"and machineIdentifier %s." + % (ipv4[0], rating_key, machine_id)) + return ipv4[0] logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on first pass. " u"Attempting fallback check in 5 seconds...") @@ -315,14 +315,14 @@ class ActivityProcessor(object): if ipv4: # The logged IP will always be the first match and we don't want localhost entries if ipv4[0] != '127.0.0.1': - if '::ffff:' + ipv4[0] in line: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % - ('::ffff:' + ipv4[0], rating_key)) - return '::ffff:' + ipv4[0] - else: - logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % - (ipv4[0], rating_key)) - return ipv4[0] + #if '::ffff:' + ipv4[0] in line: + # logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % + # ('::ffff:' + ipv4[0], rating_key)) + # return '::ffff:' + ipv4[0] + #else: + logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." % + (ipv4[0], rating_key)) + return ipv4[0] logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on fallback search. Not logging IP address.") diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py index a313813a..d52ff65a 100644 --- a/plexpy/pmsconnect.py +++ b/plexpy/pmsconnect.py @@ -803,7 +803,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], 'user_thumb': user_details['thumb'], - 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'), + 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-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, @@ -924,7 +924,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], 'user_thumb': user_details['thumb'], - 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'), + 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-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, @@ -981,7 +981,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], 'user_thumb': user_details['thumb'], - 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'), + 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-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, @@ -1038,7 +1038,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], 'user_thumb': user_details['thumb'], - 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'), + 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-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, @@ -1128,7 +1128,7 @@ class PmsConnect(object): 'user_id': user_details['user_id'], 'friendly_name': user_details['friendly_name'], 'user_thumb': user_details['thumb'], - 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address'), + 'ip_address': helpers.get_xml_attr(session.getElementsByTagName('Player')[0], 'address').split(':')[-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, From 7540b5fb3463aa175addb332cdc094b458a9eca8 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Tue, 1 Dec 2015 22:54:58 -0800 Subject: [PATCH 08/22] Fix recently added notification delay --- plexpy/activity_pinger.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index e57a0c91..4063a7dd 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -201,7 +201,7 @@ def check_recently_added(): if metadata: if not plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: for item in metadata: - if 0 < int(item['added_at']) - time_threshold <= time_interval: + if 0 < time_threshold - int(item['added_at']) <= time_interval: logger.debug(u"PlexPy Monitor :: Library item %s has been added to Plex." % str(item['rating_key'])) # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, @@ -210,7 +210,7 @@ def check_recently_added(): else: item = max(metadata, key=lambda x:x['added_at']) - if 0 < int(item['added_at']) - time_threshold <= time_interval: + if 0 < time_threshold - int(item['added_at']) <= time_interval: if item['media_type'] == 'episode' or item['media_type'] == 'track': metadata_list = pms_connect.get_metadata_details(item['grandparent_rating_key']) From ede07595c3d6f50fd496291092d1f1eb9fcbccb1 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Wed, 2 Dec 2015 19:15:46 -0800 Subject: [PATCH 09/22] Match newline characters in notification text --- plexpy/notification_handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plexpy/notification_handler.py b/plexpy/notification_handler.py index 29d65097..2f91a5df 100644 --- a/plexpy/notification_handler.py +++ b/plexpy/notification_handler.py @@ -315,13 +315,13 @@ def build_notify_text(session=None, timeline=None, state=None): # Check for exclusion tags if metadata['media_type'] == 'movie': # Regex pattern to remove the text in the tags we don't want - pattern = re.compile('[^>]+.|[^>]+.', re.IGNORECASE) + pattern = re.compile('[^>]+.|[^>]+.', re.IGNORECASE|re.DOTALL) elif metadata['media_type'] == 'show' or metadata['media_type'] == 'episode': # Regex pattern to remove the text in the tags we don't want - pattern = re.compile('[^>]+.|[^>]+.', re.IGNORECASE) + pattern = re.compile('[^>]+.|[^>]+.', re.IGNORECASE|re.DOTALL) elif metadata['media_type'] == 'artist' or metadata['media_type'] == 'track': # Regex pattern to remove the text in the tags we don't want - pattern = re.compile('[^>]+.|[^>]+.', re.IGNORECASE) + pattern = re.compile('[^>]+.|[^>]+.', re.IGNORECASE|re.DOTALL) else: pattern = None From 112811f3e20845394c38f433abd6887c3351eba0 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Wed, 2 Dec 2015 19:18:04 -0800 Subject: [PATCH 10/22] Fix subject UTF-8 encode for Prowl notifier --- plexpy/notifiers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexpy/notifiers.py b/plexpy/notifiers.py index 23bf66b1..d8124917 100644 --- a/plexpy/notifiers.py +++ b/plexpy/notifiers.py @@ -505,7 +505,7 @@ class PROWL(object): data = {'apikey': plexpy.CONFIG.PROWL_KEYS, 'application': 'PlexPy', - 'event': event, + 'event': event.encode("utf-8"), 'description': message.encode("utf-8"), 'priority': plexpy.CONFIG.PROWL_PRIORITY} From 89f581f63ec4579bfd341f6ec740320830cd10bf Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Thu, 3 Dec 2015 18:40:18 -0800 Subject: [PATCH 11/22] Only schedule job for recently added or monitor remote access if setting enabled --- data/interfaces/default/settings.html | 5 +++++ plexpy/__init__.py | 18 ++++++++++++---- plexpy/activity_pinger.py | 31 +++++++++++++-------------- plexpy/config.py | 1 + plexpy/webserve.py | 11 +++++++++- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index fd3dd1c5..e8d3dfa4 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -499,6 +499,11 @@ available_notification_agents = sorted(notifiers.available_notification_agents() Enable Music Notifications +
      + +

      Current Activity Notifications

      diff --git a/plexpy/__init__.py b/plexpy/__init__.py index 88fb73f7..bbd234da 100644 --- a/plexpy/__init__.py +++ b/plexpy/__init__.py @@ -285,10 +285,20 @@ def initialize_scheduler(): hours=12, minutes=0, seconds=0) schedule_job(pmsconnect.get_server_friendly_name, 'Refresh Plex Server Name', hours=12, minutes=0, seconds=0) - schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', - hours=0, minutes=0, seconds=seconds) - schedule_job(activity_pinger.check_server_response, 'Check for server response', - hours=0, minutes=0, seconds=seconds) + + if CONFIG.NOTIFY_RECENTLY_ADDED: + schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', + hours=0, minutes=0, seconds=seconds) + else: + schedule_job(activity_pinger.check_recently_added, 'Check for recently added items', + hours=0, minutes=0, seconds=0) + + if CONFIG.MONITOR_REMOTE_ACCESS: + schedule_job(activity_pinger.check_server_response, 'Check for server response', + hours=0, minutes=0, seconds=seconds) + else: + schedule_job(activity_pinger.check_server_response, 'Check for server response', + hours=0, minutes=0, seconds=0) # If we're not using websockets then fall back to polling if not CONFIG.MONITORING_USE_WEBSOCKET or POLLING_FAILOVER: diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index 4063a7dd..28a340e7 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -33,7 +33,11 @@ def check_active_sessions(ws_request=False): monitor_process = activity_processor.ActivityProcessor() # logger.debug(u"PlexPy Monitor :: Checking for active streams.") + global int_ping_count + if session_list: + int_ping_count = 0 + media_container = session_list['sessions'] # Check our temp table for what we must do with the new streams @@ -165,6 +169,16 @@ def check_active_sessions(ws_request=False): else: logger.debug(u"PlexPy Monitor :: Unable to read session list.") + int_ping_count += 1 + logger.warn(u"PlexPy Monitor :: Unable to get an internal response from the server, ping attempt %s." \ + % str(int_ping_count)) + + if int_ping_count == 3: + # Fire off notifications + threading.Thread(target=notification_handler.notify_timeline, + kwargs=dict(notify_action='intdown')).start() + + def check_recently_added(): with monitor_lock: @@ -231,20 +245,10 @@ def check_server_response(): pms_connect = pmsconnect.PmsConnect() server_response = pms_connect.get_server_response() - global int_ping_count global ext_ping_count - # Check for internal server response - if not server_response: - int_ping_count += 1 - logger.warn(u"PlexPy Monitor :: Unable to get an internal response from the server, ping attempt %s." \ - % str(int_ping_count)) - # Reset internal ping counter - else: - int_ping_count = 0 - # Check for remote access - if server_response and plexpy.CONFIG.MONITOR_REMOTE_ACCESS: + if server_response: mapping_state = server_response['mapping_state'] mapping_error = server_response['mapping_error'] @@ -263,11 +267,6 @@ def check_server_response(): else: ext_ping_count = 0 - if int_ping_count == 3: - # Fire off notifications - threading.Thread(target=notification_handler.notify_timeline, - kwargs=dict(notify_action='intdown')).start() - if ext_ping_count == 3: # Fire off notifications threading.Thread(target=notification_handler.notify_timeline, diff --git a/plexpy/config.py b/plexpy/config.py index 381fe064..491f2081 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -151,6 +151,7 @@ _CONFIG_DEFINITIONS = { 'NMA_ON_EXTDOWN': (int, 'NMA', 0), 'NMA_ON_INTDOWN': (int, 'NMA', 0), 'NOTIFY_CONSECUTIVE': (int, 'Monitoring', 1), + 'NOTIFY_RECENTLY_ADDED': (int, 'Monitoring', 0), 'NOTIFY_RECENTLY_ADDED_GRANDPARENT': (int, 'Monitoring', 0), 'NOTIFY_RECENTLY_ADDED_DELAY': (int, 'Monitoring', 60), 'NOTIFY_WATCHED_PERCENT': (int, 'Monitoring', 85), diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 85be241f..89065bf5 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -448,6 +448,7 @@ class WebInterface(object): "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL, "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE), "notify_consecutive": checked(plexpy.CONFIG.NOTIFY_CONSECUTIVE), + "notify_recently_added": checked(plexpy.CONFIG.NOTIFY_RECENTLY_ADDED), "notify_recently_added_grandparent": checked(plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT), "notify_recently_added_delay": plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_DELAY, "notify_watched_percent": plexpy.CONFIG.NOTIFY_WATCHED_PERCENT, @@ -494,7 +495,7 @@ class WebInterface(object): "tv_notify_on_pause", "movie_notify_on_pause", "music_notify_on_pause", "refresh_users_on_startup", "ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable", "pms_is_remote", "home_stats_type", "group_history_tables", "notify_consecutive", - "notify_recently_added_grandparent", "monitor_remote_access" + "notify_recently_added", "notify_recently_added_grandparent", "monitor_remote_access" ] for checked_config in checked_configs: if checked_config not in kwargs: @@ -519,6 +520,14 @@ class WebInterface(object): if (kwargs['monitoring_interval'] != str(plexpy.CONFIG.MONITORING_INTERVAL)) or \ (kwargs['refresh_users_interval'] != str(plexpy.CONFIG.REFRESH_USERS_INTERVAL)): reschedule = True + + if 'notify_recently_added' in kwargs and \ + (kwargs['notify_recently_added'] != plexpy.CONFIG.NOTIFY_RECENTLY_ADDED): + reschedule = True + + if 'monitor_remote_access' in kwargs and \ + (kwargs['monitor_remote_access'] != plexpy.CONFIG.MONITOR_REMOTE_ACCESS): + reschedule = True if 'pms_ip' in kwargs: if kwargs['pms_ip'] != plexpy.CONFIG.PMS_IP: From ef6ef9854131dd6d0a0aac143b0921dd304a230d Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Thu, 3 Dec 2015 19:07:24 -0800 Subject: [PATCH 12/22] Clean up settings help text and wording --- data/interfaces/default/settings.html | 15 +++++++-------- data/interfaces/default/welcome.html | 6 +++--- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index e8d3dfa4..6cef6983 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -313,7 +313,8 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
      -

      Set the complete folder path where your Plex Server logs are, shortcuts are not recognized.
      Click here for help. This is required if you enable IP logging.

      +

      Set the complete folder path where your Plex Server logs are, shortcuts are not recognized.
      + Click here for help. This is required if you enable IP logging (for PMS 0.9.12 and below).

      @@ -414,23 +415,21 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

      History Logging

      +

      Keep records of all movie, TV show, or music items played from your Plex Media Server.

      -

      Keep records of all movie items played from your Plex Media Server.

      -

      Keep records of all TV show items played from your Plex Media Server.

      -

      Keep records of all music items played from your Plex Media Server.

      @@ -534,7 +533,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents() -

      Enable to only get one notification for recently added Episodes or Tracks. Movies are unaffected.

      +

      Enable to only get one TV Show or Artist notification for recently added Episodes or Tracks. Movies are unaffected.

      diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index a841eb92..93a5b518 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -106,13 +106,13 @@ from plexpy import common

      Monitoring

      Keep records of all movie, TV show, or music items played from your Plex Media Server.

      - Log Movies + Enable Movie Logging
      - Log TV Shows + Enable TV Show Logging
      - Log Music + Enable Music Logging
      From bb5aa2be3dfb7eb753ea4322a67fce25c16ade4a Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Thu, 3 Dec 2015 19:50:46 -0800 Subject: [PATCH 13/22] Remember previous recently added items * Only pull metadata if there are new recently added items since the last check --- plexpy/activity_pinger.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index 28a340e7..daccd60e 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -22,6 +22,7 @@ import time monitor_lock = threading.Lock() ext_ping_count = 0 int_ping_count = 0 +prev_keys = [0] * 10 def check_active_sessions(ws_request=False): @@ -191,7 +192,12 @@ def check_recently_added(): recently_added_list = pms_connect.get_recently_added_details(count='10') if recently_added_list: - recently_added = recently_added_list['recently_added'] + new_recently_added = recently_added_list['recently_added'] + + global prev_keys + new_keys = [item['rating_key'] for item in new_recently_added] + recently_added = [new_recently_added[i] for i, x in enumerate(new_keys) if x != prev_keys[i]] + prev_keys = new_keys for item in recently_added: metadata = [] From deb16428ed8126a163ffd1ff99158932fe9d2885 Mon Sep 17 00:00:00 2001 From: zobe123 Date: Sat, 5 Dec 2015 12:57:26 +0100 Subject: [PATCH 14/22] Update script.js --- data/interfaces/default/js/script.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 4332ecc2..5d82f90c 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -203,6 +203,8 @@ function getPlatformImagePath(platformName) { return 'interfaces/default/images/platforms/safari.png'; } else if (platformName.indexOf("Internet Explorer") > -1) { return 'interfaces/default/images/platforms/ie.png'; + } else if (platformName.indexOf("Microsoft Edge") > -1) { + return 'interfaces/default/images/platforms/msedge.png'; } else if (platformName.indexOf("Unknown Browser") > -1) { return 'interfaces/default/images/platforms/dafault.png'; } else if (platformName.indexOf("Windows-XBMC") > -1) { From d12b57e1dede6fa534c61c2becafd1489b6bdc79 Mon Sep 17 00:00:00 2001 From: zobe123 Date: Sat, 5 Dec 2015 13:02:19 +0100 Subject: [PATCH 15/22] Add Image for Microsoft Edge --- .../default/images/platforms/msedge.png | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 data/interfaces/default/images/platforms/msedge.png diff --git a/data/interfaces/default/images/platforms/msedge.png b/data/interfaces/default/images/platforms/msedge.png new file mode 100644 index 00000000..ab9095fd --- /dev/null +++ b/data/interfaces/default/images/platforms/msedge.png @@ -0,0 +1,41 @@ +Enter file contents here‰PNG + + +IHDR n n Æ[&û pHYs   šœ +OiCCPPhotoshop ICC profile xڝSgTSé=÷ÞôBKˆ€”KoR RB‹€‘&*! Jˆ!¡ÙQÁEEÈ ˆŽŽ€ŒQ, Š +Øä!¢Žƒ£ˆŠÊûá{£kÖ¼÷æÍþµ×>ç¬ó³ÏÀ –H3Q5€ ©BàƒÇÄÆáä.@ +$p ³d!sý# ø~<<+"À¾ xÓ  ÀM›À0‡ÿêB™\€„Àt‘8K€ @zŽB¦ @F€˜&S   `Ëcbã P- `'æÓ €ø™{ [”! ‘ eˆD h; ¬ÏVŠE X0 fKÄ9 Ø- 0IWfH °· ÀÎ ²  0Qˆ…) { `È##x „™ FòW<ñ+®ç* x™²<¹$9E[-qWW.(ÎI+6aaš@.Ây™24àóÌ  ‘àƒóýxήÎÎ6Ž¶_-ê¿ÿ"bbãþåÏ«p@ át~Ñþ,/³€;€mþ¢%îh^  u÷‹f²@µ  éÚWópø~<ß5 °j>{‘-¨]cöK'XtÀâ÷ ò»oÁÔ(€hƒáÏwÿï?ýG % €fI’q ^D$.Tʳ?Ç D *°AôÁ,ÀÁÜÁ ü`6„B$ÄÂBB +d€r`)¬‚B(†Í°*`/Ô@4ÀQh†“p.ÂU¸=púažÁ(¼ AÈa!ÚˆbŠX#Ž™…ø!ÁH‹$ ɈQ"K‘5H1RŠT UHò=r9‡\Fº‘;È 2‚ü†¼G1”²Q=Ô µC¹¨7„F¢ Ðdt1š ›Ðr´=Œ6¡çЫhڏ>CÇ0Àè3Äl0.ÆÃB±8, “c˱"¬ «Æ°V¬»‰õcϱwEÀ 6wB aAHXLXNØH¨ $4Ú 7 „QÂ'"“¨K´&ºùÄb21‡XH,#֏/{ˆCÄ7$‰C2'¹I±¤TÒÒFÒnR#é,©›4H#“ÉÚdk²9”, +È…ääÃä3ää!ò[ +b@q¤øSâ(RÊjJåå4åe˜2AU£šRݨ¡T5ZB­¡¶R¯Q‡¨4uš9̓IK¥­¢•Óhh÷i¯ètºÝ•N—ÐWÒËéGè—èôw +†ƒÇˆg(›gw¯˜L¦Ó‹ÇT071ë˜ç™™oUX*¶*|‘Ê +•J•&•*/T©ª¦ªÞª UóUËT©^S}®FU3Sã© Ô–«UªPëSSg©;¨‡ªg¨oT?¤~Yý‰YÃLÃOC¤Q ±_ã¼Æ c³x,!k +«†u5Ä&±ÍÙ|v*»˜ý»‹=ª©¡9C3J3W³Ró”f?ã˜qøœtN ç(§—ó~ŠÞï)â)¦4L¹1e\kª–—–X«H«Q«Gë½6®í§¦½E»YûAÇJ'\'GgÎçSÙSݧ +§M=:õ®.ªk¥¡»Dw¿n§î˜ž¾^€žLo§Þy½çú}/ýTýmú§õG X³ $Û Î<Å5qo</ÇÛñQC]Ã@C¥a•a—á„‘¹Ñ<£ÕFFŒiÆ\ã$ãmÆmÆ£&&!&KMêMîšRM¹¦)¦;L;LÇÍÌÍ¢ÍÖ™5›=1×2ç›ç›×›ß·`ZxZ,¶¨¶¸eI²äZ¦Yn…Z9Y¥XUZ]³F­­%Ö»­»§§¹N“N«žÖgðñ¶É¶©·°åØÛ®¶m¶}agbg·Å®Ã“}º}ý= +‡Ù«Z~s´r:V:ޚΜî?}Åô–é/gXÏÏØ3ã¶Ë)ÄiS›ÓGgg¹sƒóˆ‹‰K‚Ë.—>.›ÆÝȽäJtõq]ázÒõ›³›Âí¨Û¯î6îiî‡ÜŸÌ4Ÿ)žY3sÐÃÈCàQåÑ? Ÿ•0k߬~OCOgµç#/c/‘W­×°·¥wª÷aï>ö>rŸã>ã<7Þ2ÞY_Ì7À·È·ËOÃož_…ßC#ÿdÿzÿÑ §€%g‰A[ûøz|!¿Ž?:Ûeö²ÙíAŒ ¹AA‚­‚åÁ­!hÈ쐭!÷ç˜Î‘Îi…P~èÖÐaæa‹Ã~ '…‡…W†?ŽpˆXÑ1—5wÑÜCsßDúD–DÞ›g1O9¯-J5*>ª.j<Ú7º4º?Æ.fYÌÕXXIlK9.*®6nl¾ßüíó‡ââ ã{˜/È]py¡ÎÂô…§©.,:–@LˆN8”ðA*¨Œ%òw%Ž +yÂÂg"/Ñ6шØC\*NòH*Mz’쑼5y$Å3¥,幄'©¼L +LÝ›:žšv m2=:½1ƒ’‘qBª!M“¶gêgæfvˬe…²þÅn‹·/•Ék³¬Y- +¶B¦èTZ(×*²geWf¿Í‰Ê9–«ž+Íí̳Êې7œïŸÿíÂá’¶¥†KW-X潬j9²‰Š®Û—Ø(Üxå‡oÊ¿™Ü”´©«Ä¹dÏfÒféæÞ-ž[–ª—æ—n +ÙÚ´ +ßV´íõöEÛ/—Í(Û»ƒ¶C¹£¿<¸¼e§ÉÎÍ;?T¤TôTúT6îÒݵa×ønÑî{¼ö4ìÕÛ[¼÷ý>ɾÛUUMÕfÕeûIû³÷?®‰ªéø–ûm]­NmqíÇÒý#¶×¹ÔÕÒ=TRÖ+ëGǾþïw- +6 +UœÆâ#pDyäé÷ ß÷ +:ÚvŒ{¬áÓvg/jBšòšF›Sšû[b[ºOÌ>ÑÖêÞzüGÛœ499â?rýéü§CÏdÏ&žþ¢þË®/~øÕë×Îјѡ—ò—“¿m|¥ýêÀë¯ÛÆÂƾÉx31^ôVûíÁwÜwï£ßOä| (ÿhù±õSЧû“““ÿ˜óüc3-Û cHRM z% €ƒ ùÿ €é u0 ê` :˜ o’_ÅF ¶IDATxÚìYlÇÇÿ¼WKŠ¤HQÔAë eëHì V Çnä&FŒ¢Mêælš +ò ð["ˆ>ô2‚ +ܤyèñÒ6  hkŽ¸°‹Ú’HÑŸ²D‰”HKGty¿–û€5  î¹Û›$2êÛ¡ë܃†P×ØQUu ©¦—>âçÅÂéH§$n#¾Kÿ†ïʹâ.F®‚œÕA¥3ƒ1´A¡1@ª`JVÆèÊ +¸†ß£àdDpΠݢ$êŒ`›»¡6wƒ1X Pë!S©!‘) ‘H‘’ø5ðœ×Um£ˆ.ß(ª¬žÉÓÐ[÷¢¾}7̝͜üu^ÁˆT®@½eô;÷£¾­¿€$YDh~®‘÷ó9 +./c܆¾~SÒÖ\u-.4?ö•ÒäuZï;„ÆþG7…åbZ@šAÆhò¹O¡³>M[?ìgßApÊ÷/Á3uÍ{ŸªÍ1NL Xþìï9Z˜æ#è{éMX_Þ$-hƒý“ßCØâ4˜LÅÂúÝŸ5/é™<!­Mqœ}Ñ +3öÑ´õ£çÇa9ø +”ã¦ð|áÌ Ø†Þ€¾{”õ[#d +t> +™Š-¨ìÉè*Vg?­Mqž©3»³–}Ïa糿 kÞ¾y6ãÆ®ð:×/ÂÐ;ˆ†û >¿Jß Ó®Âç#×.ÔÞ¸^ºtga˜zt> +}÷¾ŒÇ¸FÞÇÊè?nw£­ûXt9Œ÷‚{bbZ((=à9”Ú¦Úiq«7Fî¨,•¾;žùyFi¢ÄÂÇoÝ– º®’vý:j¢ÅEnÎ@L Pé›±ýûDzJóL†ÿÊùMÛÙÆŽ’>#Ëvþ|àþÚiqaçeHå*l⵬¡|Ü¿×Åw³äajDWfK(9 >V¸ K)*V\ÜïDÇᣨ3ufÝÇyñoYg⃶±MÝg¹ÔRgì$gp^ºŒÐÂx®èµNYÄ™ȝôz&O¨È&´0ëCëCÏÃÐ{™¼D-,Î1 +ïôÇàS Öd%q Äê`è{dËOÁyÎ ûÙwàž<cß· ëÜÆ`É;ØY'ãuÏ!4ÿ8Ç4ÁåM2I\Ì{¾ÿ•ó_ý©§Lãž×§××ð{` °¦N¨ôÍPj͐³ZHeŠ +’ð?x΋xÀ…˜ÏTŒËÑ +“$.Wti8‚›Ÿ~Pðoˆi1Ÿ£¨3R!³lûÙCóÀ‘ªû0‰ U0èxìǐHed©šÄ€º¥–ƒ¯¥j MßxæŸ$SÕ& ,ƒ/—õEyWmÿí‡^…T®(k9Ò)žÄmÓßÁÎg õæ3K0i·íªˆº¨ªOûnL‚}—ÎÂ=1žóÞõó)4zÑxÿc` m$®XRñüWÿÿås%ÿ,¡œÑ@ÝÚ‹† ³@ÎÔWÔµWµ¸uD!…°ë*Bó_ â¼>ⶸ>S"S@©m‚ºe4­}дöõ¦êݦêÿïÀ­J—CÛ¾Ú2‚‚Ä‘8‚Ä$ŽÄ$Ž q‰#q‰#H‰#HAâGâG8G8‚Ä$ŽÄ$Ž q_oþ7 bÁ“*·³ IEND®B`‚ From 36f0f60c49f030ae51225f39bb71fa855a2f3e00 Mon Sep 17 00:00:00 2001 From: zobe123 Date: Sat, 5 Dec 2015 13:02:53 +0100 Subject: [PATCH 16/22] Update msedge.png --- data/interfaces/default/images/platforms/msedge.png | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/images/platforms/msedge.png b/data/interfaces/default/images/platforms/msedge.png index ab9095fd..d50cd078 100644 --- a/data/interfaces/default/images/platforms/msedge.png +++ b/data/interfaces/default/images/platforms/msedge.png @@ -1,4 +1,4 @@ -Enter file contents here‰PNG +‰PNG  IHDR n n Æ[&û pHYs   šœ From 2fff6647fd8cfddbf0e3ab913706c104daa5fcab Mon Sep 17 00:00:00 2001 From: zobe123 Date: Sat, 5 Dec 2015 13:29:01 +0100 Subject: [PATCH 17/22] Revert "Update msedge.png" This reverts commit 36f0f60c49f030ae51225f39bb71fa855a2f3e00. --- data/interfaces/default/images/platforms/msedge.png | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/default/images/platforms/msedge.png b/data/interfaces/default/images/platforms/msedge.png index d50cd078..ab9095fd 100644 --- a/data/interfaces/default/images/platforms/msedge.png +++ b/data/interfaces/default/images/platforms/msedge.png @@ -1,4 +1,4 @@ -‰PNG +Enter file contents here‰PNG  IHDR n n Æ[&û pHYs   šœ From 93c4a0652e0e57ea7eec05521d4543c7d9c4f9a1 Mon Sep 17 00:00:00 2001 From: zobe123 Date: Sat, 5 Dec 2015 13:29:10 +0100 Subject: [PATCH 18/22] Revert "Add Image for Microsoft Edge" This reverts commit d12b57e1dede6fa534c61c2becafd1489b6bdc79. --- .../default/images/platforms/msedge.png | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 data/interfaces/default/images/platforms/msedge.png diff --git a/data/interfaces/default/images/platforms/msedge.png b/data/interfaces/default/images/platforms/msedge.png deleted file mode 100644 index ab9095fd..00000000 --- a/data/interfaces/default/images/platforms/msedge.png +++ /dev/null @@ -1,41 +0,0 @@ -Enter file contents here‰PNG - - -IHDR n n Æ[&û pHYs   šœ -OiCCPPhotoshop ICC profile xڝSgTSé=÷ÞôBKˆ€”KoR RB‹€‘&*! Jˆ!¡ÙQÁEEÈ ˆŽŽ€ŒQ, Š -Øä!¢Žƒ£ˆŠÊûá{£kÖ¼÷æÍþµ×>ç¬ó³ÏÀ –H3Q5€ ©BàƒÇÄÆáä.@ -$p ³d!sý# ø~<<+"À¾ xÓ  ÀM›À0‡ÿêB™\€„Àt‘8K€ @zŽB¦ @F€˜&S   `Ëcbã P- `'æÓ €ø™{ [”! ‘ eˆD h; ¬ÏVŠE X0 fKÄ9 Ø- 0IWfH °· ÀÎ ²  0Qˆ…) { `È##x „™ FòW<ñ+®ç* x™²<¹$9E[-qWW.(ÎI+6aaš@.Ây™24àóÌ  ‘àƒóýxήÎÎ6Ž¶_-ê¿ÿ"bbãþåÏ«p@ át~Ñþ,/³€;€mþ¢%îh^  u÷‹f²@µ  éÚWópø~<ß5 °j>{‘-¨]cöK'XtÀâ÷ ò»oÁÔ(€hƒáÏwÿï?ýG % €fI’q ^D$.Tʳ?Ç D *°AôÁ,ÀÁÜÁ ü`6„B$ÄÂBB -d€r`)¬‚B(†Í°*`/Ô@4ÀQh†“p.ÂU¸=púažÁ(¼ AÈa!ÚˆbŠX#Ž™…ø!ÁH‹$ ɈQ"K‘5H1RŠT UHò=r9‡\Fº‘;È 2‚ü†¼G1”²Q=Ô µC¹¨7„F¢ Ðdt1š ›Ðr´=Œ6¡çЫhڏ>CÇ0Àè3Äl0.ÆÃB±8, “c˱"¬ «Æ°V¬»‰õcϱwEÀ 6wB aAHXLXNØH¨ $4Ú 7 „QÂ'"“¨K´&ºùÄb21‡XH,#֏/{ˆCÄ7$‰C2'¹I±¤TÒÒFÒnR#é,©›4H#“ÉÚdk²9”, +È…ääÃä3ää!ò[ -b@q¤øSâ(RÊjJåå4åe˜2AU£šRݨ¡T5ZB­¡¶R¯Q‡¨4uš9̓IK¥­¢•Óhh÷i¯ètºÝ•N—ÐWÒËéGè—èôw -†ƒÇˆg(›gw¯˜L¦Ó‹ÇT071ë˜ç™™oUX*¶*|‘Ê -•J•&•*/T©ª¦ªÞª UóUËT©^S}®FU3Sã© Ô–«UªPëSSg©;¨‡ªg¨oT?¤~Yý‰YÃLÃOC¤Q ±_ã¼Æ c³x,!k -«†u5Ä&±ÍÙ|v*»˜ý»‹=ª©¡9C3J3W³Ró”f?ã˜qøœtN ç(§—ó~ŠÞï)â)¦4L¹1e\kª–—–X«H«Q«Gë½6®í§¦½E»YûAÇJ'\'GgÎçSÙSݧ -§M=:õ®.ªk¥¡»Dw¿n§î˜ž¾^€žLo§Þy½çú}/ýTýmú§õG X³ $Û Î<Å5qo</ÇÛñQC]Ã@C¥a•a—á„‘¹Ñ<£ÕFFŒiÆ\ã$ãmÆmÆ£&&!&KMêMîšRM¹¦)¦;L;LÇÍÌÍ¢ÍÖ™5›=1×2ç›ç›×›ß·`ZxZ,¶¨¶¸eI²äZ¦Yn…Z9Y¥XUZ]³F­­%Ö»­»§§¹N“N«žÖgðñ¶É¶©·°åØÛ®¶m¶}agbg·Å®Ã“}º}ý= -‡Ù«Z~s´r:V:ޚΜî?}Åô–é/gXÏÏØ3ã¶Ë)ÄiS›ÓGgg¹sƒóˆ‹‰K‚Ë.—>.›ÆÝȽäJtõq]ázÒõ›³›Âí¨Û¯î6îiî‡ÜŸÌ4Ÿ)žY3sÐÃÈCàQåÑ? Ÿ•0k߬~OCOgµç#/c/‘W­×°·¥wª÷aï>ö>rŸã>ã<7Þ2ÞY_Ì7À·È·ËOÃož_…ßC#ÿdÿzÿÑ §€%g‰A[ûøz|!¿Ž?:Ûeö²ÙíAŒ ¹AA‚­‚åÁ­!hÈ쐭!÷ç˜Î‘Îi…P~èÖÐaæa‹Ã~ '…‡…W†?ŽpˆXÑ1—5wÑÜCsßDúD–DÞ›g1O9¯-J5*>ª.j<Ú7º4º?Æ.fYÌÕXXIlK9.*®6nl¾ßüíó‡ââ ã{˜/È]py¡ÎÂô…§©.,:–@LˆN8”ðA*¨Œ%òw%Ž -yÂÂg"/Ñ6шØC\*NòH*Mz’쑼5y$Å3¥,幄'©¼L -LÝ›:žšv m2=:½1ƒ’‘qBª!M“¶gêgæfvˬe…²þÅn‹·/•Ék³¬Y- -¶B¦èTZ(×*²geWf¿Í‰Ê9–«ž+Íí̳Êې7œïŸÿíÂá’¶¥†KW-X潬j9²‰Š®Û—Ø(Üxå‡oÊ¿™Ü”´©«Ä¹dÏfÒféæÞ-ž[–ª—æ—n -ÙÚ´ -ßV´íõöEÛ/—Í(Û»ƒ¶C¹£¿<¸¼e§ÉÎÍ;?T¤TôTúT6îÒݵa×ønÑî{¼ö4ìÕÛ[¼÷ý>ɾÛUUMÕfÕeûIû³÷?®‰ªéø–ûm]­NmqíÇÒý#¶×¹ÔÕÒ=TRÖ+ëGǾþïw- -6 -UœÆâ#pDyäé÷ ß÷ -:ÚvŒ{¬áÓvg/jBšòšF›Sšû[b[ºOÌ>ÑÖêÞzüGÛœ499â?rýéü§CÏdÏ&žþ¢þË®/~øÕë×Îјѡ—ò—“¿m|¥ýêÀë¯ÛÆÂƾÉx31^ôVûíÁwÜwï£ßOä| (ÿhù±õSЧû“““ÿ˜óüc3-Û cHRM z% €ƒ ùÿ €é u0 ê` :˜ o’_ÅF ¶IDATxÚìYlÇÇÿ¼WKŠ¤HQÔAë eëHì V Çnä&FŒ¢Mêælš -ò ð["ˆ>ô2‚ -ܤyèñÒ6  hkŽ¸°‹Ú’HÑŸ²D‰”HKGty¿–û€5  î¹Û›$2êÛ¡ë܃†P×ØQUu ©¦—>âçÅÂéH§$n#¾Kÿ†ïʹâ.F®‚œÕA¥3ƒ1´A¡1@ª`JVÆèÊ -¸†ß£àdDpΠݢ$êŒ`›»¡6wƒ1X Pë!S©!‘) ‘H‘’ø5ðœ×Um£ˆ.ß(ª¬žÉÓÐ[÷¢¾}7̝͜üu^ÁˆT®@½eô;÷£¾­¿€$YDh~®‘÷ó9 -./c܆¾~SÒÖ\u-.4?ö•ÒäuZï;„ÆþG7…åbZ@šAÆhò¹O¡³>M[?ìgßApÊ÷/Á3uÍ{ŸªÍ1NL Xþìï9Z˜æ#è{éMX_Þ$-hƒý“ßCØâ4˜LÅÂúÝŸ5/é™<!­Mqœ}Ñ -3öÑ´õ£çÇa9ø -”ã¦ð|áÌ Ø†Þ€¾{”õ[#d -t> -™Š-¨ìÉè*Vg?­Mqž©3»³–}Ïa糿 kÞ¾y6ãÆ®ð:×/ÂÐ;ˆ†û >¿Jß Ó®Âç#×.ÔÞ¸^ºtga˜zt> -}÷¾ŒÇ¸FÞÇÊè?nw£­ûXt9Œ÷‚{bbZ((=à9”Ú¦Úiq«7Fî¨,•¾;žùyFi¢ÄÂÇoÝ– º®’vý:j¢ÅEnÎ@L Pé›±ýûDzJóL†ÿÊùMÛÙÆŽ’>#Ëvþ|àþÚiqaçeHå*l⵬¡|Ü¿×Åw³äajDWfK(9 >V¸ K)*V\ÜïDÇᣨ3ufÝÇyñoYg⃶±MÝg¹ÔRgì$gp^ºŒÐÂx®èµNYÄ™ȝôz&O¨È&´0ëCëCÏÃÐ{™¼D-,Î1 -ïôÇàS Öd%q Äê`è{dËOÁyÎ ûÙwàž<cß· ëÜÆ`É;ØY'ãuÏ!4ÿ8Ç4ÁåM2I\Ì{¾ÿ•ó_ý©§Lãž×§××ð{` °¦N¨ôÍPj͐³ZHeŠ -’ð?x΋xÀ…˜ÏTŒËÑ -“$.Wti8‚›Ÿ~Pðoˆi1Ÿ£¨3R!³lûÙCóÀ‘ªû0‰ U0èxìǐHed©šÄ€º¥–ƒ¯¥j MßxæŸ$SÕ& ,ƒ/—õEyWmÿí‡^…T®(k9Ò)žÄmÓßÁÎg õæ3K0i·íªˆº¨ªOûnL‚}—ÎÂ=1žóÞõó)4zÑxÿc` m$®XRñüWÿÿås%ÿ,¡œÑ@ÝÚ‹† ³@ÎÔWÔµWµ¸uD!…°ë*Bó_ â¼>ⶸ>S"S@©m‚ºe4­}дöõ¦êݦêÿïÀ­J—CÛ¾Ú2‚‚Ä‘8‚Ä$ŽÄ$Ž q‰#q‰#H‰#HAâGâG8G8‚Ä$ŽÄ$Ž q_oþ7 bÁ“*·³ IEND®B`‚ From 38e9938666990c844fb41fd72d502e195cdf6557 Mon Sep 17 00:00:00 2001 From: zobe123 Date: Sat, 5 Dec 2015 13:31:56 +0100 Subject: [PATCH 19/22] Add Microsoft Edge platform image. --- .../default/images/platforms/msedge.png | Bin 0 -> 4747 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/interfaces/default/images/platforms/msedge.png diff --git a/data/interfaces/default/images/platforms/msedge.png b/data/interfaces/default/images/platforms/msedge.png new file mode 100644 index 0000000000000000000000000000000000000000..3aa8dd0241c0852cf3e4fd7787cfc2381ac71f2e GIT binary patch literal 4747 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 CW#vu) literal 0 HcmV?d00001 From 8c4292f9ac068bdbc8937ce40acbf4c68f8d17e5 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sat, 5 Dec 2015 14:19:14 -0800 Subject: [PATCH 20/22] Fix recently added using added at time --- plexpy/activity_pinger.py | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/plexpy/activity_pinger.py b/plexpy/activity_pinger.py index daccd60e..2eb63bbe 100644 --- a/plexpy/activity_pinger.py +++ b/plexpy/activity_pinger.py @@ -22,7 +22,6 @@ import time monitor_lock = threading.Lock() ext_ping_count = 0 int_ping_count = 0 -prev_keys = [0] * 10 def check_active_sessions(ws_request=False): @@ -192,31 +191,27 @@ def check_recently_added(): recently_added_list = pms_connect.get_recently_added_details(count='10') if recently_added_list: - new_recently_added = recently_added_list['recently_added'] - - global prev_keys - new_keys = [item['rating_key'] for item in new_recently_added] - recently_added = [new_recently_added[i] for i, x in enumerate(new_keys) if x != prev_keys[i]] - prev_keys = new_keys + recently_added = recently_added_list['recently_added'] for item in recently_added: metadata = [] - if item['media_type'] == 'movie': - metadata_list = pms_connect.get_metadata_details(item['rating_key']) - if metadata_list: - metadata = [metadata_list['metadata']] - else: - logger.error(u"PlexPy Monitor :: Unable to retrieve metadata for rating_key %s" \ - % str(item['rating_key'])) + if 0 < time_threshold - int(item['added_at']) <= time_interval: + if item['media_type'] == 'movie': + metadata_list = pms_connect.get_metadata_details(item['rating_key']) + if metadata_list: + metadata = [metadata_list['metadata']] + else: + logger.error(u"PlexPy Monitor :: Unable to retrieve metadata for rating_key %s" \ + % str(item['rating_key'])) - else: - metadata_list = pms_connect.get_metadata_children_details(item['rating_key']) - if metadata_list: - metadata = metadata_list['metadata'] else: - logger.error(u"PlexPy Monitor :: Unable to retrieve children metadata for rating_key %s" \ - % str(item['rating_key'])) + metadata_list = pms_connect.get_metadata_children_details(item['rating_key']) + if metadata_list: + metadata = metadata_list['metadata'] + else: + logger.error(u"PlexPy Monitor :: Unable to retrieve children metadata for rating_key %s" \ + % str(item['rating_key'])) if metadata: if not plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_GRANDPARENT: From b47ccd06f937ac716d344bcdeca6987cae530195 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sat, 5 Dec 2015 23:26:54 -0800 Subject: [PATCH 21/22] Sanitize player name --- data/interfaces/default/home_stats.html | 6 +++--- plexpy/datafactory.py | 12 +++++++++--- plexpy/helpers.py | 6 ++++++ plexpy/users.py | 15 ++++++++++++--- plexpy/webserve.py | 10 +++++----- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/data/interfaces/default/home_stats.html b/data/interfaces/default/home_stats.html index 10832c41..e3773f3f 100644 --- a/data/interfaces/default/home_stats.html +++ b/data/interfaces/default/home_stats.html @@ -39,7 +39,7 @@ user_id Returns the user id for the associated stat. friendly_name Returns the friendly name of the user for the associated stat. == Only if 'stat_id' is 'top_platform' or 'last_watched' == -platform_type Returns the platform name for the associated stat. +player Returns the player name for the associated stat. == Only if 'stat_id' is 'last_watched' == last_watch Returns the time the media item was last watched. @@ -709,7 +709,7 @@ DOCUMENTATION :: END - - ${top_stat['rows'][0]['platform_type']} + - ${top_stat['rows'][0]['player']}

      @@ -755,7 +755,7 @@ DOCUMENTATION :: END - - ${top_stat['rows'][loop.index]['platform_type']} + - ${top_stat['rows'][loop.index]['player']}

      diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 544df9f7..ca218bf3 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -108,6 +108,9 @@ class DataFactory(object): # Rename Mystery platform names platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"]) + # Sanitize player name + player = helpers.sanitize(item["player"]) + row = {"reference_id": item["reference_id"], "id": item["id"], "date": item["date"], @@ -119,7 +122,7 @@ class DataFactory(object): "user": item["user"], "friendly_name": item["friendly_name"], "platform": platform, - "player": item["player"], + "player": player, "ip_address": item["ip_address"], "media_type": item["media_type"], "rating_key": item["rating_key"], @@ -545,7 +548,7 @@ class DataFactory(object): 'session_history_metadata.thumb, ' \ 'session_history_metadata.grandparent_thumb, ' \ 'MAX(session_history.started) as last_watch, ' \ - 'session_history.player as platform, ' \ + 'session_history.player, ' \ '((CASE WHEN session_history.view_offset IS NULL THEN 0.1 ELSE \ session_history.view_offset * 1.0 END) / \ (CASE WHEN session_history_metadata.duration IS NULL THEN 1.0 ELSE \ @@ -571,6 +574,9 @@ class DataFactory(object): thumb = item[7] else: thumb = item[8] + + # Sanitize player name + player = helpers.sanitize(item["player"]) row = {'row_id': item[0], 'user': item[1], @@ -582,7 +588,7 @@ class DataFactory(object): 'thumb': thumb, 'grandparent_thumb': item[8], 'last_watch': item[9], - 'platform_type': item[10], + 'player': player, } last_watched.append(row) diff --git a/plexpy/helpers.py b/plexpy/helpers.py index e5f5cc42..64b796db 100644 --- a/plexpy/helpers.py +++ b/plexpy/helpers.py @@ -430,3 +430,9 @@ def process_json_kwargs(json_kwargs): params = json.loads(json_kwargs) return params + +def sanitize(string): + if string: + return str(string).replace('<','<').replace('>','>') + else: + return '' \ No newline at end of file diff --git a/plexpy/users.py b/plexpy/users.py index bccda2f7..e932e6c8 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -89,13 +89,16 @@ class Users(object): # Rename Mystery platform names platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"]) + # Sanitize player name + player = helpers.sanitize(item["player"]) + row = {"id": item['id'], "plays": item['plays'], "last_seen": item['last_seen'], "friendly_name": item['friendly_name'], "ip_address": item['ip_address'], "platform": platform, - "player": item['player'], + "player": player, "last_watched": item['last_watched'], "thumb": thumb, "media_type": item['media_type'], @@ -180,12 +183,15 @@ class Users(object): # Rename Mystery platform names platform = common.PLATFORM_NAME_OVERRIDES.get(item["platform"], item["platform"]) + # Sanitize player name + player = helpers.sanitize(item["player"]) + row = {"id": item['id'], "last_seen": item['last_seen'], "ip_address": item['ip_address'], "play_count": item['play_count'], "platform": platform, - "player": item['player'], + "player": player, "last_watched": item['last_watched'], "thumb": thumb, "media_type": item['media_type'], @@ -531,7 +537,10 @@ class Users(object): # Rename Mystery platform names platform_type = common.PLATFORM_NAME_OVERRIDES.get(item[2], item[2]) - row = {'player_name': item[0], + # Sanitize player name + player = helpers.sanitize(item[0]) + + row = {'player_name': player, 'platform_type': platform_type, 'total_plays': item[1], 'result_id': result_id diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 89065bf5..a3b237e8 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -1,7 +1,4 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# This file is part of PlexPy. +# This file is part of PlexPy. # # PlexPy is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with PlexPy. If not, see . -from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, datafactory, graphs, users +from plexpy import logger, notifiers, plextv, pmsconnect, common, log_reader, datafactory, graphs, users, helpers from plexpy.helpers import checked, radio from mako.lookup import TemplateLookup @@ -738,6 +735,9 @@ class WebInterface(object): if not session['ip_address']: ip_address = data_factory.get_session_ip(session['session_key']) session['ip_address'] = ip_address + # Sanitize player name + session['player'] = helpers.sanitize(session['player']) + except: return serve_template(templatename="current_activity.html", data=None) From 24c8c4319d4bdd78daf1708fe8d38d7fbb041ca7 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sat, 5 Dec 2015 23:44:02 -0800 Subject: [PATCH 22/22] v1.2.8 --- CHANGELOG.md | 16 ++++++++++++++++ plexpy/version.py | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09ba5125..7128836a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,22 @@ # Changelog +## v1.2.8 (2015-12-06) + +* Fix sanitize player names +* Fix recently added notification delay +* Fix recently added metadata queries +* Fix multiple lines in notification body text +* Fix UTF-8 encoding in Prowl notifications subject line +* Change to only log IPv4 addresses +* Add global toggle for recently added notifcations +* Add feature to delete users +* Add channel support for Telegram notification agent +* Add icon for Apple tvOS +* Add icon for Microsoft Edge + + ## v1.2.7 (2015-11-27) + * Fix IP address option in notifications diff --git a/plexpy/version.py b/plexpy/version.py index dcea93a3..e5f27395 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.2.7" +PLEXPY_RELEASE_VERSION = "1.2.8"