Merge branch 'dev'

Fix recently added

CHANGELOG.md

@@ -1,5 +1,38 @@
 # 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
+
+
+## v1.2.6 (2015-11-27)
+
+* Fixes for IP logging in PMS < 0.9.14.x.
+* Fix issue in plexWatch importer when trying to import item with no ratingKey.
+
+
+## v1.2.5 (2015-11-25)
+
+* Add video_decision and audio_decision to notification options
+* Fix IP address logging
+* Fix log spam if notifications disabled 
+
+
 ## v1.2.4 (2015-11-24)
 
 * Add filtering by media type in the history table

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 {

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
                             <script>
                                 $('#last-watch-stat').text(moment(${top_stat['rows'][0]['last_watch']},"X").format(date_format));
                             </script>
-                        </span> - ${top_stat['rows'][0]['platform_type']}
+                        </span> - ${top_stat['rows'][0]['player']}
                     </p>
                 </div>
             </div>
@@ -755,7 +755,7 @@ DOCUMENTATION :: END
                                             <script>
                                                 $('#home-platforms-instance-list-last-watch-${loop.index + 1}').text(moment(${top_stat['rows'][loop.index]['last_watch']},"X").format(date_format));
                                             </script>
-                                        </span> - ${top_stat['rows'][loop.index]['platform_type']}
+                                        </span> - ${top_stat['rows'][loop.index]['player']}
                                     </p>
                                 </div>
                             </div>

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) {
@@ -201,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) {

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('<div class="edit-user-toggles"><button class="btn btn-xs btn-warning" data-id="' + rowData['user_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
+                $(td).html('<div class="edit-user-toggles"><button class="btn btn-xs btn-warning delete-user" data-id="' + rowData['user_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
+                    '<button class="btn btn-xs btn-warning purge-user" data-id="' + rowData['user_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
                     '<input type="checkbox" id="do_notify-' + rowData['user_id'] + '" name="do_notify" value="1" ' + rowData['do_notify'] + '><label class="edit-tooltip" for="do_notify-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle Notifications"><i class="fa fa-bell fa-lg fa-fw"></i></label>&nbsp' +
                     '<input type="checkbox" id="keep_history-' + rowData['user_id'] + '" name="keep_history" value="1" ' + rowData['keep_history'] + '><label class="edit-tooltip" for="keep_history-' + rowData['user_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp');
                     // 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');
 });

data/interfaces/default/settings.html

@@ -313,7 +313,8 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                                     <input type="text" class="form-control" id="pms_logs_folder" name="pms_logs_folder" value="${config['pms_logs_folder']}" size="30" data-parsley-trigger="change">
                                 </div>
                             </div>
-                            <p class="help-block">Set the complete folder path where your Plex Server logs are, shortcuts are not recognized.<br /><a href="https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files" target="_blank">Click here</a> for help. This is required if you enable IP logging. </p>
+                            <p class="help-block">Set the complete folder path where your Plex Server logs are, shortcuts are not recognized.<br />
+                            <a href="https://support.plex.tv/hc/en-us/articles/200250417-Plex-Media-Server-Log-Files" target="_blank">Click here</a> for help. This is required if you enable IP logging (for PMS 0.9.12 and below). </p>
                         </div>
 
                         <input type="hidden" id="pms_identifier" name="pms_identifier" value="${config['pms_identifier']}">
@@ -414,23 +415,21 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                         <div class="padded-header">
                             <h3>History Logging</h3>
                         </div>
+                        <p class="help-block">Keep records of all movie, TV show, or music items played from your Plex Media Server.</p>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="movie_logging_enable" name="movie_logging_enable" value="1" ${config['movie_logging_enable']}> Log Movies
+                                <input type="checkbox" id="movie_logging_enable" name="movie_logging_enable" value="1" ${config['movie_logging_enable']}> Enable Movie Logging
                             </label>
-                            <p class="help-block">Keep records of all movie items played from your Plex Media Server.</p>
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="tv_logging_enable" name="tv_logging_enable" value="1" ${config['tv_logging_enable']}> Log TV Shows
+                                <input type="checkbox" id="tv_logging_enable" name="tv_logging_enable" value="1" ${config['tv_logging_enable']}> Enable TV Show Logging
                             </label>
-                            <p class="help-block">Keep records of all TV show items played from your Plex Media Server.</p>
                         </div>
                         <div class="checkbox">
                             <label>
-                                <input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1" ${config['music_logging_enable']}> Log Music
+                                <input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1" ${config['music_logging_enable']}> Enable Music Logging
                             </label>
-                            <p class="help-block">Keep records of all music items played from your Plex Media Server.</p>
                         </div>
                         <div class="form-group">
                             <label for="logging_ignore_interval">Ignore Interval</label>
@@ -499,6 +498,11 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                                 <input type="checkbox" name="music_notify_enable" id="music_notify_enable" value="1" ${config['music_notify_enable']}> Enable Music Notifications
                             </label>
                         </div>
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" name="notify_recently_added" id="notify_recently_added" value="1" ${config['notify_recently_added']}> Enable Recently Added Notifications
+                            </label>
+                        </div>
 
                         <div class="padded-header">
                             <h3>Current Activity Notifications</h3>
@@ -529,7 +533,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                             <label>
                                 <input type="checkbox" name="notify_recently_added_grandparent" id="notify_recently_added_grandparent" value="1" ${config['notify_recently_added_grandparent']}> Group notifications for recently added TV Shows or Music
                             </label>
-                            <p class="help-block">Enable to only get one notification for recently added Episodes or Tracks. Movies are unaffected.</p>
+                            <p class="help-block">Enable to only get one TV Show or Artist notification for recently added Episodes or Tracks. Movies are unaffected.</p>
                         </div>
                         <div class="form-group">
                             <label for="notify_recently_added_delay">Notification Delay</label>
@@ -1001,9 +1005,17 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                                     <td width="150"><strong>{episode_num00}</strong></td>
                                     <td>The two digit episode number.</td>
                                 </tr>
+                                <tr>
+                                    <td width="150"><strong>{video_decision}</strong></td>
+                                    <td>The video transcode decisions for the media item.</td>
+                                </tr>
+                                <tr>
+                                    <td width="150"><strong>{audio_decision}</strong></td>
+                                    <td>The audio transcode decisions for the media item.</td>
+                                </tr>
                                 <tr>
                                     <td width="150"><strong>{transcode_decision}</strong></td>
-                                    <td>The transcode decisions for the media item.</td>
+                                    <td>The stream transcode decisions for the media item.</td>
                                 </tr>
                                 <tr>
                                     <td width="150"><strong>{year}</strong></td>

data/interfaces/default/users.html

@@ -16,7 +16,7 @@
             <button class="btn btn-danger btn-edit" data-toggle="button" aria-pressed="false" autocomplete="off" id="row-edit-mode">
                 <i class="fa fa-pencil"></i> Edit mode
             </button>&nbsp
-            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect users to purge. Data is purged upon exiting edit mode.</div>
+            <div class="alert alert-danger alert-edit" role="alert" id="row-edit-mode-alert"><i class="fa fa-exclamation-triangle"></i>&nbspSelect users to delete/purge. Data is deleted/purged upon exiting edit mode.</div>
         </div>
     </div>
     <div class='table-card-back'>
@@ -46,16 +46,16 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
-                        <h4 class="modal-title" id="myModalLabel">Confirm Purge</h4>
+                        <h4 class="modal-title" id="myModalLabel">Confirm Delete/Purge</h4>
                     </div>
                     <div class="modal-body" style="text-align: center;">
-                        <p>Are you REALLY sure you want to purge all history for the following users:</p>
                         <ul id="users-to-delete" class="list-unstyled"></ul>
+                        <ul id="users-to-purge" class="list-unstyled"></ul>
                         <p>This is permanent and cannot be undone!</p>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-dark" data-dismiss="modal">Cancel</button>
-                        <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-purge">Purge</button>
+                        <button type="button" class="btn btn-danger btn-ok" data-dismiss="modal" id="confirm-delete">Confirm</button>
                     </div>
                 </div>
             </div>
@@ -74,8 +74,8 @@
 <script>
     $(document).ready(function () {
         users_list_table_options.ajax = {
-            "url": "get_user_list",
-            type: "post",
+            url: 'get_user_list',
+            type: 'POST',
             data: function ( d ) {
                 return { 'json_data': JSON.stringify( d ) };
             }
@@ -88,18 +88,46 @@
         $('#row-edit-mode').on('click', function () {
             $('#row-edit-mode-alert').fadeIn(200);
             $('#users-to-delete').html('');
+            $('#users-to-purge').html('');
 
             if ($(this).hasClass('active')) {
-                if (users_to_purge.length > 0) {
+                if (users_to_delete.length > 0 || users_to_purge.length > 0) {
                     $('.edit-control').each(function () {
                         $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
                     });
 
-                    for (var i = 0; i < users_to_purge.length; i++) {
-                        $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
+                    users_to_purge = $.grep(users_to_purge, function (value) {
+                        return $.inArray(value, users_to_delete) < 0;
+                    });
+
+                    if (users_to_delete.length > 0) {
+                        $('#users-to-delete').prepend('<p>Are you REALLY sure you want to delete the following users:</p>')
+                        for (var i = 0; i < users_to_delete.length; i++) {
+                            $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_delete[i] + '] > input').val() + '</li>');
+                        }
                     }
+
+                    if (users_to_purge.length > 0) {
+                        $('#users-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following users:</p>')
+                        for (var i = 0; i < users_to_purge.length; i++) {
+                            $('#users-to-purge').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
+                        }
+                    }
+
                     $('#confirm-modal').modal();
-                    $('#confirm-modal').one('click', '#confirm-purge', function () {
+                    $('#confirm-modal').one('click', '#confirm-delete', function () {
+                        for (var i = 0; i < users_to_delete.length; i++) {
+                            $.ajax({
+                                url: 'delete_user',
+                                data: { user_id: users_to_delete[i] },
+                                cache: false,
+                                async: true,
+                                success: function (data) {
+                                    var msg = "User deleted";
+                                    showMsg(msg, false, true, 2000);
+                                }
+                            });
+                        }
                         for (var i = 0; i < users_to_purge.length; i++) {
                             $.ajax({
                                 url: 'delete_all_user_history',
@@ -129,6 +157,7 @@
                 });
 
             } else {
+                users_to_delete = [];
                 users_to_purge = [];
                 $('.edit-control').each(function () {
                     $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
@@ -147,12 +176,12 @@
             url: 'refresh_users_list',
             cache: false,
             async: true,
-            success : function(data) {
+            success: function(data) {
                 showMsg('<i class="fa fa-check"></i>&nbspUser list refresh started...',false,true,2000,false)
             },
             error: function(jqXHR, textStatus, errorThrown) {
                 showMsg('<i class="fa fa-exclamation-circle"></i>&nbspUnable to refresh user list.',false,true,2000,true)
-            },
+            }
         });
     });
 </script>

data/interfaces/default/welcome.html

@@ -106,13 +106,13 @@ from plexpy import common
                 <h3>Monitoring</h3>
                 <p class="help-block">Keep records of all movie, TV show, or music items played from your Plex Media Server.</p>
                 <div class="wizard-input-section">
-                    <input type="checkbox" id="movie_logging_enable" name="movie_logging_enable" value="1" ${config['movie_logging_enable']}> Log Movies
+                    <input type="checkbox" id="movie_logging_enable" name="movie_logging_enable" value="1" ${config['movie_logging_enable']}> Enable Movie Logging
                 </div>
                 <div class="wizard-input-section">
-                    <input type="checkbox" id="tv_logging_enable" name="tv_logging_enable" value="1" ${config['tv_logging_enable']}> Log TV Shows
+                    <input type="checkbox" id="tv_logging_enable" name="tv_logging_enable" value="1" ${config['tv_logging_enable']}> Enable TV Show Logging
                 </div>
                 <div class="wizard-input-section">
-                    <input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1" ${config['music_logging_enable']}> Log Music
+                    <input type="checkbox" id="music_logging_enable" name="music_logging_enable" value="1" ${config['music_logging_enable']}> Enable Music Logging
                 </div>
                 <div class="wizard-input-section">
                     <label for="logging_ignore_interval">Ignore Interval</label>

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:
@@ -406,9 +416,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 +674,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()
 

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:
@@ -180,26 +194,29 @@ def check_recently_added():
             recently_added = recently_added_list['recently_added']
 
             for item in recently_added:
-                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']))
+                metadata = []
+                
+                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:
                         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,
@@ -208,7 +225,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'])
 
@@ -229,20 +246,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']
@@ -261,11 +268,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,

plexpy/activity_processor.py

@@ -39,7 +39,7 @@ class ActivityProcessor(object):
                       'parent_title': session['parent_title'],
                       'grandparent_title': session['grandparent_title'],
                       'friendly_name': session['friendly_name'],
-                      'ip_address': session['ip_address'],
+                      #'ip_address': session['ip_address'],
                       'player': session['player'],
                       'platform': session['platform'],
                       'parent_rating_key': session['parent_rating_key'],
@@ -67,6 +67,10 @@ class ActivityProcessor(object):
                       'transcode_height': session['transcode_height']
                       }
 
+            # Add ip_address back into values
+            if session['ip_address']:
+                values.update({'ip_address': session['ip_address']})
+
             keys = {'session_key': session['session_key'],
                     'rating_key': session['rating_key']}
 
@@ -75,23 +79,22 @@ class ActivityProcessor(object):
             if result == 'insert':
                 # Push any notifications - Push it on it's own thread so we don't hold up our db actions
                 if notify:
+                    values.update({'ip_address': session['ip_address']})
                     threading.Thread(target=notification_handler.notify,
                                      kwargs=dict(stream_data=values, notify_action='play')).start()
 
+                # If it's our first write then time stamp it.
                 started = int(time.time())
                 timestamp = {'started': started}
+                self.db.upsert('sessions', timestamp, keys)
 
                 # Try and grab IP address from logs (fallback if not on PMS 0.9.14 and above)
                 if not session['ip_address']:
                     if plexpy.CONFIG.IP_LOGGING_ENABLE and plexpy.CONFIG.PMS_LOGS_FOLDER:
                         ip_address = self.find_session_ip(rating_key=session['rating_key'],
                                                           machine_id=session['machine_id'])
-                        timestamp.update({'ip_address': ip_address})
-                    else:
-                        timestamp.update({'ip_address': None})
-
-                # If it's our first write then time stamp it.
-                self.db.upsert('sessions', timestamp, keys)
+                        ip_address = {'ip_address': ip_address}
+                        self.db.upsert('sessions', ip_address, keys)
 
     def write_session_history(self, session=None, import_metadata=None, is_import=False, import_ignore_interval=0):
         from plexpy import users
@@ -283,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...")
@@ -312,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.")
 

plexpy/config.py

@@ -151,27 +151,28 @@ _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),
-    '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),
@@ -250,7 +251,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),

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)
 
@@ -800,6 +806,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()
 

plexpy/helpers.py

@@ -92,13 +92,15 @@ def latinToAscii(unicrap):
     }
 
     r = ''
-    for i in unicrap:
-        if ord(i) in xlate:
-            r += xlate[ord(i)]
-        elif ord(i) >= 0x80:
-            pass
-        else:
-            r += str(i)
+    if unicrap:
+        for i in unicrap:
+            if ord(i) in xlate:
+                r += xlate[ord(i)]
+            elif ord(i) >= 0x80:
+                pass
+            else:
+                r += str(i)
+
     return r
 
 
@@ -428,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('<','&lt;').replace('>','&gt;')
+    else:
+        return ''

plexpy/notification_handler.py

@@ -161,7 +161,7 @@ def notify(stream_data=None, notify_action=None):
         elif stream_data['media_type'] == 'clip':
             pass
         else:
-            logger.debug(u"PlexPy Notifier :: Notify called with unsupported media type.")
+            #logger.debug(u"PlexPy Notifier :: Notify called with unsupported media type.")
             pass
     else:
         logger.debug(u"PlexPy Notifier :: Notify called but incomplete data received.")
@@ -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('<tv>[^>]+.</tv>|<music>[^>]+.</music>', re.IGNORECASE)
+        pattern = re.compile('<tv>[^>]+.</tv>|<music>[^>]+.</music>', 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('<movie>[^>]+.</movie>|<music>[^>]+.</music>', re.IGNORECASE)
+        pattern = re.compile('<movie>[^>]+.</movie>|<music>[^>]+.</music>', 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('<tv>[^>]+.</tv>|<movie>[^>]+.</movie>', re.IGNORECASE)
+        pattern = re.compile('<tv>[^>]+.</tv>|<movie>[^>]+.</movie>', re.IGNORECASE|re.DOTALL)
     else:
         pattern = None
 
@@ -370,6 +370,8 @@ def build_notify_text(session=None, timeline=None, state=None):
     duration = helpers.convert_milliseconds_to_minutes(metadata['duration'])
 
     # Default values
+    video_decision = ''
+    audio_decision = ''
     transcode_decision = ''
     stream_duration = 0
     view_offset = 0
@@ -381,18 +383,15 @@ def build_notify_text(session=None, timeline=None, state=None):
     # Session values
     if session:
         # Generate a combined transcode decision value
-        if session['video_decision']:
-            if session['video_decision'] == 'transcode':
-                transcode_decision = 'Transcode'
-            elif session['video_decision'] == 'copy' or session['audio_decision'] == 'copy':
-                transcode_decision = 'Direct Stream'
-            else:
-                transcode_decision = 'Direct Play'
-        elif session['audio_decision']:
-            if session['audio_decision'] == 'transcode':
-                transcode_decision = 'Transcode'
-            else:
-                transcode_decision = 'Direct Play'
+        video_decision = session['video_decision'].title()
+        audio_decision = session['audio_decision'].title()
+
+        if session['video_decision'] == 'transcode' or session['audio_decision'] == 'transcode':
+            transcode_decision = 'Transcode'
+        elif session['video_decision'] == 'copy' or session['audio_decision'] == 'copy':
+            transcode_decision = 'Direct Stream'
+        else:
+            transcode_decision = 'Direct Play'
 
         if state != 'play':
             if session['paused_counter']:
@@ -405,7 +404,7 @@ def build_notify_text(session=None, timeline=None, state=None):
         user = session['friendly_name']
         platform = session['platform']
         player = session['player']
-        ip_address = session['ip_address'] if session['ip_address'] != '' else 'N/A'
+        ip_address = session['ip_address'] if session['ip_address'] else 'N/A'
 
     progress_percent = helpers.get_percent(view_offset, duration)
 
@@ -422,10 +421,12 @@ def build_notify_text(session=None, timeline=None, state=None):
                         'artist_name': metadata['grandparent_title'],
                         'album_name': metadata['parent_title'],
                         'track_name': metadata['title'],
-                        'season_num': metadata['parent_index'],
+                        'season_num': metadata['parent_index'].zfill(1),
                         'season_num00': metadata['parent_index'].zfill(2),
-                        'episode_num': metadata['index'],
+                        'episode_num': metadata['index'].zfill(1),
                         'episode_num00': metadata['index'].zfill(2),
+                        'video_decision': video_decision,
+                        'audio_decision': audio_decision,
                         'transcode_decision': transcode_decision,
                         'year': metadata['year'],
                         'studio': metadata['studio'],

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}
 
@@ -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.")
@@ -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 <a href="http://telegram.me/myidbot" target="_blank">@myidbot</a> on Telegram to get an ID.',
+                          'description': 'Your Telegram Chat ID, Group ID, or channel username. Contact <a href="http://telegram.me/myidbot" target="_blank">@myidbot</a> on Telegram to get an ID.',
                           'input_type': 'text'
                           }
                          ]

plexpy/plexwatch_import.py

@@ -292,10 +292,15 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval
 
         # If we get back None from our xml extractor skip over the record and log error.
         if not extracted_xml:
-            logger.error(u"PlexPy Importer :: Skipping line with ratingKey %s due to malformed xml."
+            logger.error(u"PlexPy Importer :: Skipping record with ratingKey %s due to malformed xml."
                          % str(row['rating_key']))
             continue
 
+        # Skip line if we don't have a ratingKey to work with
+        if not row['rating_key']:
+            logger.error(u"PlexPy Importer :: Skipping record due to null ratingRey.")
+            continue
+
         # If the user_id no longer exists in the friends list, pull it from the xml.
         if user_data.get_user_id(user=row['user']):
             user_id = user_data.get_user_id(user=row['user'])

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,

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',
@@ -87,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'],
@@ -178,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'],
@@ -529,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

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.2.4"
+PLEXPY_RELEASE_VERSION = "1.2.8"

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 <http://www.gnu.org/licenses/>.
 
-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
@@ -448,6 +445,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 +492,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 +517,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:
@@ -729,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)
 
@@ -1397,6 +1406,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=''):