From c501923f2bd3cb2e164aa8a6abf05408695d7c01 Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Fri, 27 Nov 2015 18:13:20 -0800 Subject: [PATCH 1/8] 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 2/8] 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 3/8] 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 4/8] 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 5/8] 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 6/8] 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 7/8] 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 8/8] 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'])