Merge branch 'dev'

Fix regression on select_single queries Resolves #350

CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## v1.2.14 (2015-12-07)
+
+* Fix regression with PlexWatch db importer and buffer warnings.
+
+
+## v1.2.13 (2015-12-06)
+
+* Fix match newlines between tags in notification text.
+* Fix current activity not showing on PMS 0.9.12.
+
+
+## v1.2.12 (2015-12-06)
+
+* Fix for "too many open files" error.
+
+
+## v1.2.11 (2015-12-06)
+
+* Fix more regressions (sorry).
+
+
+## v1.2.10 (2015-12-06)
+
+* Fix broken count graphs regression.
+
+
+## v1.2.9 (2015-12-06)
+
+* Fix and improve text sanitization.
+
+
+## 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.

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/edit_user.html

@@ -115,7 +115,7 @@ DOCUMENTATION :: END
                 success: function(data) {
                     $("#edit-user-status-message").html(data);
                     if ($.trim(friendly_name) !== '') {
-                        $(".set-username").html(friendly_name);
+                        $('.set-username').html(document.createTextNode(friendly_name));
                     }
                     $("#user-profile-thumb").attr('src', thumb);
                 }

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);
+    var index_delete = $.inArray(rowData['user_id'], users_to_delete);
-    if (index === -1) {
+    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/notification_config.html

@@ -25,7 +25,7 @@ from plexpy import helpers
                                     % endif
                                 </div>
                             </div>
-                            <p class="help-block">${item['description']}</p>
+                            <p class="help-block">${item['description'] | n}</p>
                         </div>
                         % elif item['input_type'] == 'button':
                         <div class="form-group">
@@ -34,14 +34,14 @@ from plexpy import helpers
                                     <input type="${item['input_type']}" class="btn btn-bright" id="${item['name']}" name="${item['name']}" value="${item['value']}">
                                 </div>
                             </div>
-                            <p class="help-block">${item['description']}</p>
+                            <p class="help-block">${item['description'] | n}</p>
                         </div>
                         % elif item['input_type'] == 'checkbox':
                         <div class="checkbox">
                             <label>
                                 <input type="checkbox" data-id="${item['name']}" class="checkboxes" value="1" ${helpers.checked(item['value'])}> ${item['label']}
                             </label>
-                            <p class="help-block">${item['description']}</p>
+                            <p class="help-block">${item['description'] | n}</p>
                             <input type="hidden" id="${item['name']}" name="${item['name']}" value="${item['value']}">
                         </div>
                         % elif item['input_type'] == 'select':
@@ -60,7 +60,7 @@ from plexpy import helpers
                                     </select>
                                 </div>
                             </div>
-                            <p class="help-block">${item['description']}</p>
+                            <p class="help-block">${item['description'] | n}</p>
                         </div>
                         % endif
                     % endfor

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>
@@ -1126,7 +1130,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
                     <h4 class="modal-title">Changelog</h4>
                 </div>
                 <div class="modal-body">
-                    ${versioncheck.read_changelog()}
+                    ${versioncheck.read_changelog() | n}
                 </div>
                 <div class="modal-footer">
                 </div>

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",
+            url: 'get_user_list',
-            type: "post",
+            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_purge = $.grep(users_to_purge, function (value) {
-                        $('#users-to-delete').append('<li>' + $('div[data-id=' + users_to_purge[i] + '] > input').val() + '</li>');
+                        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)
+            if CONFIG.NOTIFY_RECENTLY_ADDED:
-            schedule_job(activity_pinger.check_server_response, 'Check for server response',
+                schedule_job(activity_pinger.check_recently_added, 'Check for recently added items',
-                         hours=0, minutes=0, seconds=seconds)
+                             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
@@ -123,7 +127,8 @@ def check_active_sessions(ws_request=False):
                                                              kwargs=dict(stream_data=stream, notify_action='buffer')).start()
 
                                 logger.debug(u"PlexPy Monitor :: Stream buffering. Count is now %s. Last triggered %s."
-                                             % (buffer_values[0][0], buffer_values[0][1]))
+                                             % (buffer_values[0]['buffer_count'],
+                                                buffer_values[0]['buffer_last_triggered']))
 
                             # Check if the user has reached the offset in the media we defined as the "watched" percent
                             # Don't trigger if state is buffer as some clients push the progress to the end when
@@ -165,6 +170,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 +195,29 @@ def check_recently_added():
             recently_added = recently_added_list['recently_added']
 
             for item in recently_added:
-                if item['media_type'] == 'movie':
+                metadata = []
-                    metadata_list = pms_connect.get_metadata_details(item['rating_key'])
+                
-                    if metadata_list:
+                if 0 < time_threshold - int(item['added_at']) <= time_interval:
-                        metadata = [metadata_list['metadata']]
+                    if item['media_type'] == 'movie':
-                    else:
+                        metadata_list = pms_connect.get_metadata_details(item['rating_key'])
-                        logger.error(u"PlexPy Monitor :: Unable to retrieve metadata for rating_key %s" \
+                        if metadata_list:
-                                     % str(item['rating_key']))
+                            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" \
+                        metadata_list = pms_connect.get_metadata_children_details(item['rating_key'])
-                                     % str(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 +226,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 +247,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 +269,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

@@ -79,6 +79,7 @@ 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()
 
@@ -179,18 +180,18 @@ class ActivityProcessor(object):
 
                 result = self.db.select(query=query, args=args)
                 
-                new_session = {'id': result[0][0],
+                new_session = {'id': result[0]['id'],
-                               'rating_key': result[0][1],
+                               'rating_key': result[0]['rating_key'],
-                               'user_id': result[0][2],
+                               'user_id': result[0]['user_id'],
-                               'reference_id': result[0][3]}
+                               'reference_id': result[0]['reference_id']}
 
                 if len(result) == 1:
                     prev_session = None
                 else:
-                    prev_session = {'id': result[1][0],
+                    prev_session = {'id': result[1]['id'],
-                                    'rating_key': result[1][1],
+                                    'rating_key': result[1]['rating_key'],
-                                    'user_id': result[1][2],
+                                    'user_id': result[1]['user_id'],
-                                    'reference_id': result[1][3]}
+                                    'reference_id': result[1]['reference_id']}
 
                 query = 'UPDATE session_history SET reference_id = ? WHERE id = ? '
                 # If rating_key is the same in the previous session, then set the reference_id to the previous row, else set the reference_id to the new id
@@ -285,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:
+                        #if '::ffff:' + ipv4[0] in line:
-                            logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
+                        #    logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
-                                         u"and machineIdentifier %s."
+                        #                 u"and machineIdentifier %s."
-                                         % ('::ffff:' + ipv4[0], rating_key, machine_id))
+                        #                 % ('::ffff:' + ipv4[0], rating_key, machine_id))
-                            return '::ffff:' + ipv4[0]
+                        #    return '::ffff:' + ipv4[0]
-                        else:
+                        #else:
-                            logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
+                        logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s "
-                                         u"and machineIdentifier %s."
+                                        u"and machineIdentifier %s."
-                                         % (ipv4[0], rating_key, machine_id))
+                                        % (ipv4[0], rating_key, machine_id))
-                            return ipv4[0]
+                        return ipv4[0]
 
         logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on first pass. "
                      u"Attempting fallback check in 5 seconds...")
@@ -314,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:
+                        #if '::ffff:' + ipv4[0] in line:
-                            logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
+                        #    logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
-                                         ('::ffff:' + ipv4[0], rating_key))
+                        #                 ('::ffff:' + ipv4[0], rating_key))
-                            return '::ffff:' + ipv4[0]
+                        #    return '::ffff:' + ipv4[0]
-                        else:
+                        #else:
-                            logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
+                        logger.debug(u"PlexPy ActivityProcessor :: Matched IP address (%s) for stream ratingKey %s." %
-                                         (ipv4[0], rating_key))
+                                        (ipv4[0], rating_key))
-                            return ipv4[0]
+                        return ipv4[0]
 
         logger.debug(u"PlexPy ActivityProcessor :: Unable to find IP address on fallback search. Not logging IP address.")
 
@@ -399,7 +400,7 @@ class ActivityProcessor(object):
                                                  'WHERE session_key = ?',
                                                  [session_key])
             if buffer_count:
-                return buffer_count
+                return buffer_count['buffer_count']
 
             return 0
 
@@ -416,6 +417,6 @@ class ActivityProcessor(object):
                                               'WHERE session_key = ?',
                                               [session_key])
             if last_time:
-                return last_time
+                return last_time['buffer_last_triggered']
 
             return None

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_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_START_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) started playing {title}.'),
+    'NOTIFY_ON_START_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) started playing {title}.'),
-    'NOTIFY_ON_STOP_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_STOP_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_STOP_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has stopped {title}.'),
+    'NOTIFY_ON_STOP_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has stopped {title}.'),
-    'NOTIFY_ON_PAUSE_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_PAUSE_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_PAUSE_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has paused {title}.'),
+    'NOTIFY_ON_PAUSE_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has paused {title}.'),
-    'NOTIFY_ON_RESUME_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_RESUME_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_RESUME_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has resumed {title}.'),
+    'NOTIFY_ON_RESUME_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has resumed {title}.'),
-    'NOTIFY_ON_BUFFER_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_BUFFER_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_BUFFER_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) is buffering {title}.'),
+    'NOTIFY_ON_BUFFER_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) is buffering {title}.'),
-    'NOTIFY_ON_WATCHED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_WATCHED_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_WATCHED_BODY_TEXT': (str, 'Monitoring', '{user} ({player}) has watched {title}.'),
+    'NOTIFY_ON_WATCHED_BODY_TEXT': (unicode, 'Monitoring', '{user} ({player}) has watched {title}.'),
-    'NOTIFY_ON_CREATED_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_CREATED_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_CREATED_BODY_TEXT': (str, 'Monitoring', '{title} was recently added to Plex.'),
+    'NOTIFY_ON_CREATED_BODY_TEXT': (unicode, 'Monitoring', '{title} was recently added to Plex.'),
-    'NOTIFY_ON_EXTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_EXTDOWN_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_EXTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex Media Server remote access is down.'),
+    'NOTIFY_ON_EXTDOWN_BODY_TEXT': (unicode, 'Monitoring', 'The Plex Media Server remote access is down.'),
-    'NOTIFY_ON_INTDOWN_SUBJECT_TEXT': (str, 'Monitoring', 'PlexPy ({server_name})'),
+    'NOTIFY_ON_INTDOWN_SUBJECT_TEXT': (unicode, 'Monitoring', 'PlexPy ({server_name})'),
-    'NOTIFY_ON_INTDOWN_BODY_TEXT': (str, 'Monitoring', 'The Plex Media Server is down.'),
+    '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/database.py

@@ -46,6 +46,13 @@ def get_cache_size():
         return 0
     return int(plexpy.CONFIG.CACHE_SIZEMB)
 
+def dict_factory(cursor, row):
+    d = {}
+    for idx, col in enumerate(cursor.description):
+        d[col[0]] = row[idx]
+
+    return d
+
 
 class MonitorDatabase(object):
 
@@ -58,7 +65,7 @@ class MonitorDatabase(object):
         self.connection.execute("PRAGMA journal_mode = %s" % plexpy.CONFIG.JOURNAL_MODE)
         # 64mb of cache memory, probably need to make it user configurable
         self.connection.execute("PRAGMA cache_size=-%s" % (get_cache_size() * 1024))
-        self.connection.row_factory = sqlite3.Row
+        self.connection.row_factory = dict_factory
 
     def action(self, query, args=None, return_last_id=False):
         if query is None:
@@ -104,7 +111,7 @@ class MonitorDatabase(object):
 
     def select_single(self, query, args=None):
 
-        sql_results = self.action(query, args).fetchone()[0]
+        sql_results = self.action(query, args).fetchone()
 
         if sql_results is None or sql_results == "":
             return ""

plexpy/datafactory.py

@@ -119,7 +119,7 @@ class DataFactory(object):
                    "user": item["user"],
                    "friendly_name": item["friendly_name"],
                    "platform": platform,
-                   "player": item["player"],
+                   "player": item['player'],
                    "ip_address": item["ip_address"],
                    "media_type": item["media_type"],
                    "rating_key": item["rating_key"],
@@ -183,19 +183,19 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
+                    row = {'title': item['grandparent_title'],
-                           'total_plays': item[2],
+                           'total_plays': item['total_plays'],
-                           'total_duration': item[3],
+                           'total_duration': item['total_duration'],
                            'users_watched': '',
-                           'rating_key': item[4],
+                           'rating_key': item['grandparent_rating_key'],
-                           'last_play': item[5],
+                           'last_play': item['last_watch'],
-                           'grandparent_thumb': item[6],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     top_tv.append(row)
 
@@ -231,18 +231,18 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
+                    row = {'title': item['grandparent_title'],
-                           'users_watched': item[2],
+                           'users_watched': item['users_watched'],
-                           'rating_key': item[3],
+                           'rating_key': item['grandparent_rating_key'],
-                           'last_play': item[4],
+                           'last_play': item['last_watch'],
-                           'total_plays': item[5],
+                           'total_plays': item['total_plays'],
-                           'grandparent_thumb': item[7],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     popular_tv.append(row)
 
@@ -275,19 +275,19 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
+                    row = {'title': item['full_title'],
-                           'total_plays': item[2],
+                           'total_plays': item['total_plays'],
-                           'total_duration': item[3],
+                           'total_duration': item['total_duration'],
                            'users_watched': '',
-                           'rating_key': item[4],
+                           'rating_key': item['rating_key'],
-                           'last_play': item[5],
+                           'last_play': item['last_watch'],
                            'grandparent_thumb': '',
-                           'thumb': item[6],
+                           'thumb': item['thumb'],
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     top_movies.append(row)
 
@@ -323,18 +323,18 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
+                    row = {'title': item['full_title'],
-                           'users_watched': item[2],
+                           'users_watched': item['users_watched'],
-                           'rating_key': item[3],
+                           'rating_key': item['rating_key'],
-                           'last_play': item[4],
+                           'last_play': item['last_watch'],
-                           'total_plays': item[5],
+                           'total_plays': item['total_plays'],
                            'grandparent_thumb': '',
-                           'thumb': item[7],
+                           'thumb': item['thumb'],
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     popular_movies.append(row)
 
@@ -367,19 +367,19 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
+                    row = {'title': item['grandparent_title'],
-                           'total_plays': item[2],
+                           'total_plays': item['total_plays'],
-                           'total_duration': item[3],
+                           'total_duration': item['total_duration'],
                            'users_watched': '',
-                           'rating_key': item[4],
+                           'rating_key': item['grandparent_rating_key'],
-                           'last_play': item[5],
+                           'last_play': item['last_watch'],
-                           'grandparent_thumb': item[6],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     top_music.append(row)
 
@@ -415,18 +415,18 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
+                    row = {'title': item['grandparent_title'],
-                           'users_watched': item[2],
+                           'users_watched': item['users_watched'],
-                           'rating_key': item[3],
+                           'rating_key': item['grandparent_rating_key'],
-                           'last_play': item[4],
+                           'last_play': item['last_watch'],
-                           'total_plays': item[5],
+                           'total_plays': item['total_plays'],
-                           'grandparent_thumb': item[7],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     popular_music.append(row)
 
@@ -460,17 +460,17 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    if not item[5] or item[5] == '':
+                    if not item['thumb'] or item['thumb'] == '':
                         user_thumb = common.DEFAULT_USER_THUMB
                     else:
-                        user_thumb = item[5]
+                        user_thumb = item['thumb']
 
-                    row = {'user': item[0],
+                    row = {'user': item['user'],
-                           'user_id': item[6],
+                           'user_id': item['user_id'],
-                           'friendly_name': item[1],
+                           'friendly_name': item['friendly_name'],
-                           'total_plays': item[2],
+                           'total_plays': item['total_plays'],
-                           'total_duration': item[3],
+                           'total_duration': item['total_duration'],
-                           'last_play': item[4],
+                           'last_play': item['last_watch'],
                            'user_thumb': user_thumb,
                            'grandparent_thumb': '',
                            'users_watched': '',
@@ -509,12 +509,12 @@ class DataFactory(object):
 
                 for item in result:
                     # Rename Mystery platform names
-                    platform_type = common.PLATFORM_NAME_OVERRIDES.get(item[0], item[0])
+                    platform_type = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
 
-                    row = {'platform': item[0],
+                    row = {'platform': item['platform'],
-                           'total_plays': item[1],
+                           'total_plays': item['total_plays'],
-                           'total_duration': item[2],
+                           'total_duration': item['total_duration'],
-                           'last_play': item[3],
+                           'last_play': item['last_watch'],
                            'platform_type': platform_type,
                            'title': '',
                            'thumb': '',
@@ -545,7 +545,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 \
@@ -567,22 +567,22 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    if not item[8] or item[8] == '':
+                    if not item['grandparent_thumb'] or item['grandparent_thumb'] == '':
-                        thumb = item[7]
+                        thumb = item['thumb']
                     else:
-                        thumb = item[8]
+                        thumb = item['grandparent_thumb']
 
-                    row = {'row_id': item[0],
+                    row = {'row_id': item['id'],
-                           'user': item[1],
+                           'user': item['user'],
-                           'friendly_name': item[2],
+                           'friendly_name': item['friendly_name'],
-                           'user_id': item[3],
+                           'user_id': item['user_id'],
-                           'user_thumb': item[4],
+                           'user_thumb': item['user_thumb'],
-                           'title': item[5],
+                           'title': item['full_title'],
-                           'rating_key': item[6],
+                           'rating_key': item['rating_key'],
                            'thumb': thumb,
-                           'grandparent_thumb': item[8],
+                           'grandparent_thumb': item['grandparent_thumb'],
-                           'last_watch': item[9],
+                           'last_watch': item['last_watch'],
-                           'platform_type': item[10],
+                           'player': item['player']
                            }
                     last_watched.append(row)
 
@@ -609,26 +609,26 @@ class DataFactory(object):
         stream_output = {}
 
         for item in result:
-            stream_output = {'container': item[0],
+            stream_output = {'container': item['container'],
-                             'bitrate': item[1],
+                             'bitrate': item['bitrate'],
-                             'video_resolution': item[2],
+                             'video_resolution': item['video_resolution'],
-                             'width': item[3],
+                             'width': item['width'],
-                             'height': item[4],
+                             'height': item['height'],
-                             'aspect_ratio': item[5],
+                             'aspect_ratio': item['aspect_ratio'],
-                             'video_framerate': item[6],
+                             'video_framerate': item['video_framerate'],
-                             'video_codec': item[7],
+                             'video_codec': item['video_codec'],
-                             'audio_codec': item[8],
+                             'audio_codec': item['audio_codec'],
-                             'audio_channels': item[9],
+                             'audio_channels': item['audio_channels'],
-                             'transcode_video_dec': item[10],
+                             'transcode_video_dec': item['video_decision'],
-                             'transcode_video_codec': item[11],
+                             'transcode_video_codec': item['transcode_video_codec'],
-                             'transcode_height': item[12],
+                             'transcode_height': item['transcode_height'],
-                             'transcode_width': item[13],
+                             'transcode_width': item['transcode_width'],
-                             'transcode_audio_dec': item[14],
+                             'transcode_audio_dec': item['audio_decision'],
-                             'transcode_audio_codec': item[15],
+                             'transcode_audio_codec': item['transcode_audio_codec'],
-                             'transcode_audio_channels': item[16],
+                             'transcode_audio_channels': item['transcode_audio_channels'],
-                             'media_type': item[17],
+                             'media_type': item['media_type'],
-                             'title': item[18],
+                             'title': item['title'],
-                             'grandparent_title': item[19]
+                             'grandparent_title': item['grandparent_title']
                              }
 
         return stream_output
@@ -678,25 +678,25 @@ class DataFactory(object):
             return None
 
         for row in result:
-                if row[1] == 'episode' and row[8]:
+                if row['media_type'] == 'episode' and row['parent_thumb']:
-                    thumb = row[8]
+                    thumb = row['parent_thumb']
-                elif row[1] == 'episode':
+                elif row['media_type'] == 'episode':
-                    thumb = row[9]
+                    thumb = row['grandparent_thumb']
                 else:
-                    thumb = row[7]
+                    thumb = row['thumb']
 
-                recent_output = {'row_id': row[0],
+                recent_output = {'row_id': row['id'],
-                                 'type': row[1],
+                                 'type': row['media_type'],
-                                 'rating_key': row[2],
+                                 'rating_key': row['rating_key'],
-                                 'title': row[4],
+                                 'title': row['title'],
-                                 'parent_title': row[5],
+                                 'parent_title': row['parent_title'],
-                                 'grandparent_title': row[6],
+                                 'grandparent_title': row['grandparent_title'],
                                  'thumb': thumb,
-                                 'index': row[10],
+                                 'index': row['media_index'],
-                                 'parent_index': row[11],
+                                 'parent_index': row['parent_media_index'],
-                                 'year': row[12],
+                                 'year': row['year'],
-                                 'time': row[13],
+                                 'time': row['started'],
-                                 'user': row[14]
+                                 'user': row['user']
                                  }
                 recently_watched.append(recent_output)
 
@@ -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()
 
@@ -1012,6 +1046,6 @@ class DataFactory(object):
         ip_address = 'N/A'
 
         for item in result:
-            ip_address = item[0]
+            ip_address = item['ip_address']
 
         return ip_address

plexpy/datatables.py

@@ -178,12 +178,18 @@ class DataTables(object):
         filtered = self.ssp_db.select(query, args=args)
 
         # Build grand totals
-        totalcount = self.ssp_db.select('SELECT COUNT(id) from %s' % table_name)[0][0]
+        totalcount = self.ssp_db.select('SELECT COUNT(id) as total_count from %s' % table_name)[0]['total_count']
 
         # Get draw counter
         draw_counter = int(parameters['draw'])
 
+        # Paginate results
         result = filtered[parameters['start']:(parameters['start'] + parameters['length'])]
+
+        # Sanitize on the way out
+        result = [{k: helpers.sanitize(v) if isinstance(v, basestring) else v for k, v in row.iteritems()}
+                  for row in result]
+
         output = {'result': result,
                   'draw': draw_counter,
                   'filteredCount': len(filtered),

plexpy/graphs.py

@@ -44,11 +44,11 @@ class Graphs(object):
             else:
                 query = 'SELECT date(started, "unixepoch", "localtime") as date_played, ' \
                         'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
-                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \
                         'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
-                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \
                         'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
-                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \
                         'FROM session_history ' \
                         'WHERE datetime(stopped, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") ' \
                         'GROUP BY date_played ' \
@@ -76,10 +76,10 @@ class Graphs(object):
             series_2_value = 0
             series_3_value = 0
             for item in result:
-                if date_string == item[0]:
+                if date_string == item['date_played']:
-                    series_1_value = item[1]
+                    series_1_value = item['tv_count']
-                    series_2_value = item[2]
+                    series_2_value = item['movie_count']
-                    series_3_value = item[3]
+                    series_3_value = item['music_count']
                     break
                 else:
                     series_1_value = 0
@@ -138,11 +138,11 @@ class Graphs(object):
                     'when 5 then "Friday" ' \
                     'else "Saturday" end as dayofweek, ' \
                     'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \
                     'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \
                     'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \
                     'FROM session_history ' \
                     'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \
                     'datetime("now", "-' + time_range + ' days", "localtime") ' \
@@ -165,10 +165,10 @@ class Graphs(object):
             series_2_value = 0
             series_3_value = 0
             for item in result:
-                if day_item == item[1]:
+                if day_item == item['dayofweek']:
-                    series_1_value = item[2]
+                    series_1_value = item['tv_count']
-                    series_2_value = item[3]
+                    series_2_value = item['movie_count']
-                    series_3_value = item[4]
+                    series_3_value = item['music_count']
                     break
                 else:
                     series_1_value = 0
@@ -211,11 +211,11 @@ class Graphs(object):
         else:
             query = 'select strftime("%H", datetime(started, "unixepoch", "localtime")) as hourofday, ' \
                     'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \
                     'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \
                     'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \
                     'FROM session_history ' \
                     'WHERE datetime(stopped, "unixepoch", "localtime") >= ' \
                     'datetime("now", "-' + time_range + ' days", "localtime") ' \
@@ -240,10 +240,10 @@ class Graphs(object):
             series_2_value = 0
             series_3_value = 0
             for item in result:
-                if hour_item == item[0]:
+                if hour_item == item['hourofday']:
-                    series_1_value = item[1]
+                    series_1_value = item['tv_count']
-                    series_2_value = item[2]
+                    series_2_value = item['movie_count']
-                    series_3_value = item[3]
+                    series_3_value = item['music_count']
                     break
                 else:
                     series_1_value = 0
@@ -283,11 +283,11 @@ class Graphs(object):
         else:
             query = 'SELECT strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) as datestring, ' \
                     'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \
                     'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \
                     'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count ' \
                     'FROM session_history ' \
                     'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-12 months", "localtime") ' \
                     'GROUP BY strftime("%Y-%m", datetime(started, "unixepoch", "localtime")) ' \
@@ -316,10 +316,10 @@ class Graphs(object):
             series_2_value = 0
             series_3_value = 0
             for item in result:
-                if date_string == item[0]:
+                if date_string == item['datestring']:
-                    series_1_value = item[1]
+                    series_1_value = item['tv_count']
-                    series_2_value = item[2]
+                    series_2_value = item['movie_count']
-                    series_3_value = item[3]
+                    series_3_value = item['music_count']
                     break
                 else:
                     series_1_value = 0
@@ -364,11 +364,11 @@ class Graphs(object):
         else:
             query = 'SELECT platform, ' \
                     'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \
                     'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \
                     'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count, ' \
                     'SUM(case when stopped > 0 then (stopped - started) ' \
                     ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
                     'FROM session_history ' \
@@ -386,10 +386,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item[0], item[0]))
+            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']))
-            series_1.append(item[1])
+            series_1.append(item['tv_count'])
-            series_2.append(item[2])
+            series_2.append(item['movie_count'])
-            series_3.append(item[3])
+            series_3.append(item['music_count'])
 
         series_1_output = {'name': 'TV',
                            'data': series_1}
@@ -430,11 +430,11 @@ class Graphs(object):
                     '(case when users.friendly_name is null then users.username else ' \
                     'users.friendly_name end) as friendly_name,' \
                     'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tv_count, ' \
                     'SUM(case when media_type = "movie" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as movie_count, ' \
                     'SUM(case when media_type = "track" and stopped > 0 then (stopped - started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as music_count, ' \
                     'SUM(case when stopped > 0 then (stopped - started) ' \
                     ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
                     'FROM session_history ' \
@@ -453,10 +453,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(item[0])
+            categories.append(item['friendly_name'])
-            series_1.append(item[1])
+            series_1.append(item['tv_count'])
-            series_2.append(item[2])
+            series_2.append(item['movie_count'])
-            series_3.append(item[3])
+            series_3.append(item['music_count'])
 
         series_1_output = {'name': 'TV',
                            'data': series_1}
@@ -501,15 +501,15 @@ class Graphs(object):
                         'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
                         'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
                         'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \
                         'SUM(case when (session_history_media_info.video_decision = "copy" ' \
                         'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
                         'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \
                         'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
                         'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
                         'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration ' \
+                        ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count ' \
                         'FROM session_history ' \
                         'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
                         'WHERE datetime(session_history.stopped, "unixepoch", "localtime") >= ' \
@@ -540,10 +540,10 @@ class Graphs(object):
             series_2_value = 0
             series_3_value = 0
             for item in result:
-                if date_string == item[0]:
+                if date_string == item['date_played']:
-                    series_1_value = item[1]
+                    series_1_value = item['dp_count']
-                    series_2_value = item[2]
+                    series_2_value = item['ds_count']
-                    series_3_value = item[3]
+                    series_3_value = item['tc_count']
                     break
                 else:
                     series_1_value = 0
@@ -598,15 +598,15 @@ class Graphs(object):
                     'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "copy" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \
                     'SUM(case when stopped > 0 then (stopped - started) ' \
                     ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
                     'FROM session_history ' \
@@ -626,10 +626,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(item[0])
+            categories.append(item['resolution'])
-            series_1.append(item[1])
+            series_1.append(item['dp_count'])
-            series_2.append(item[2])
+            series_2.append(item['ds_count'])
-            series_3.append(item[3])
+            series_3.append(item['tc_count'])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -695,15 +695,15 @@ class Graphs(object):
                     'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "copy" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \
                     'SUM(case when stopped > 0 then (stopped - started) ' \
                     ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
                     'FROM session_history ' \
@@ -723,10 +723,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(item[0])
+            categories.append(item['resolution'])
-            series_1.append(item[1])
+            series_1.append(item['dp_count'])
-            series_2.append(item[2])
+            series_2.append(item['ds_count'])
-            series_3.append(item[3])
+            series_3.append(item['tc_count'])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -773,15 +773,15 @@ class Graphs(object):
                     'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "copy" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \
                     'SUM(case when session_history.stopped > 0 ' \
                     'then (session_history.stopped - session_history.started) ' \
                     ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
@@ -801,10 +801,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item[0], item[0]))
+            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']))
-            series_1.append(item[1])
+            series_1.append(item['dp_count'])
-            series_2.append(item[2])
+            series_2.append(item['ds_count'])
-            series_3.append(item[3])
+            series_3.append(item['tc_count'])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}
@@ -853,15 +853,15 @@ class Graphs(object):
                     'SUM(case when (session_history_media_info.video_decision = "direct play" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "direct play")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as dp_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "copy" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "copy")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as ds_count, ' \
                     'SUM(case when (session_history_media_info.video_decision = "transcode" ' \
                     'or (session_history_media_info.video_decision = "" and session_history_media_info.audio_decision = "transcode")) ' \
                     'and session_history.stopped > 0 then (session_history.stopped - session_history.started) ' \
-                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_duration, ' \
+                    ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as tc_count, ' \
                     'SUM(case when session_history.stopped > 0 ' \
                     'then (session_history.stopped - session_history.started) ' \
                     ' - (case when paused_counter is NULL then 0 else paused_counter end) else 0 end) as total_duration ' \
@@ -882,10 +882,10 @@ class Graphs(object):
         series_3 = []
 
         for item in result:
-            categories.append(item[0])
+            categories.append(item['username'])
-            series_1.append(item[1])
+            series_1.append(item['dp_count'])
-            series_2.append(item[2])
+            series_2.append(item['ds_count'])
-            series_3.append(item[3])
+            series_3.append(item['tc_count'])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}

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 unicode(string).replace('<','&lt;').replace('>','&gt;')
+    else:
+        return ''

plexpy/notification_handler.py

@@ -214,13 +214,13 @@ def get_notify_state(session):
                                args=[session['session_key'], session['rating_key'], session['user']])
     notify_states = []
     for item in result:
-        notify_state = {'on_play': item[0],
+        notify_state = {'on_play': item['on_play'],
-                        'on_stop': item[1],
+                        'on_stop': item['on_stop'],
-                        'on_pause': item[2],
+                        'on_pause': item['on_pause'],
-                        'on_resume': item[3],
+                        'on_resume': item['on_resume'],
-                        'on_buffer': item[4],
+                        'on_buffer': item['on_buffer'],
-                        'on_watched': item[5],
+                        'on_watched': item['on_watched'],
-                        'agent_id': item[6]}
+                        'agent_id': item['agent_id']}
         notify_states.append(notify_state)
 
     return notify_states
@@ -234,8 +234,8 @@ def get_notify_state_timeline(timeline):
                                args=[timeline['rating_key']])
     notify_states = []
     for item in result:
-        notify_state = {'on_created': item[0],
+        notify_state = {'on_created': item['on_created'],
-                        'agent_id': item[1]}
+                        'agent_id': item['agent_id']}
         notify_states.append(notify_state)
 
     return notify_states
@@ -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('\n*<tv>[^>]+.</tv>\n*|\n*<music>[^>]+.</music>\n*', 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('\n*<movie>[^>]+.</movie>\n*|\n*?<music>[^>]+.</music>\n*', 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('\n*<tv>[^>]+.</tv>\n*|\n*<movie>[^>]+.</movie>\n*', re.IGNORECASE|re.DOTALL)
     else:
         pattern = None
 
@@ -404,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)
 

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}
 
@@ -879,9 +879,9 @@ class PUSHALOT(object):
 
         pushalot_authorizationtoken = plexpy.CONFIG.PUSHALOT_APIKEY
 
-        logger.debug(u"Pushalot event: " + event)
+        #logger.debug(u"Pushalot event: " + event)
-        logger.debug(u"Pushalot message: " + message)
+        #logger.debug(u"Pushalot message: " + message)
-        logger.debug(u"Pushalot api: " + pushalot_authorizationtoken)
+        #logger.debug(u"Pushalot api: " + pushalot_authorizationtoken)
 
         http_handler = HTTPSConnection("pushalot.com")
 
@@ -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 status: %r" % request_status)
-        logger.debug(u"Pushalot response headers: %r" % response.getheaders())
+        #logger.debug(u"Pushalot response headers: %r" % response.getheaders())
-        logger.debug(u"Pushalot response body: %r" % response.read())
+        #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/plextv.py

@@ -342,13 +342,13 @@ class PlexTV(object):
 
                         rating_key = clean_uri.rpartition('%2F')[-1]
 
-                        sync_details = {"device_name": device_name,
+                        sync_details = {"device_name": helpers.sanitize(device_name),
-                                        "platform": device_platform,
+                                        "platform": helpers.sanitize(device_platform),
-                                        "username": device_username,
+                                        "username": helpers.sanitize(device_username),
-                                        "friendly_name": device_friendly_name,
+                                        "friendly_name": helpers.sanitize(device_friendly_name),
                                         "user_id": device_user_id,
-                                        "root_title": sync_root_title,
+                                        "root_title": helpers.sanitize(sync_root_title),
-                                        "title": sync_title,
+                                        "title": helpers.sanitize(sync_title),
                                         "metadata_type": sync_metadata_type,
                                         "content_type": sync_content_type,
                                         "rating_key": rating_key,

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',
@@ -93,7 +95,7 @@ class Users(object):
                    "friendly_name": item['friendly_name'],
                    "ip_address": item['ip_address'],
                    "platform": platform,
-                   "player": item['player'],
+                   "player": item["player"],
                    "last_watched": item['last_watched'],
                    "thumb": thumb,
                    "media_type": item['media_type'],
@@ -263,17 +265,17 @@ class Users(object):
         if user_id:
             monitor_db = database.MonitorDatabase()
             query = 'select username, ' \
-                    '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END),' \
+                    '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END) as friendly_name,' \
                     'do_notify, keep_history, custom_avatar_url as thumb ' \
                     'FROM users WHERE user_id = ?'
             result = monitor_db.select(query, args=[user_id])
             if result:
                 user_detail = {'user_id': user_id,
-                               'user': result[0][0],
+                               'user': result[0]['username'],
-                               'friendly_name': result[0][1],
+                               'friendly_name': result[0]['friendly_name'],
-                               'thumb': result[0][4],
+                               'thumb': result[0]['thumb'],
-                               'do_notify': helpers.checked(result[0][2]),
+                               'do_notify': helpers.checked(result[0]['do_notify']),
-                               'keep_history': helpers.checked(result[0][3])
+                               'keep_history': helpers.checked(result[0]['keep_history'])
                                }
                 return user_detail
             else:
@@ -287,17 +289,17 @@ class Users(object):
         elif user:
             monitor_db = database.MonitorDatabase()
             query = 'select user_id, ' \
-                    '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END),' \
+                    '(CASE WHEN friendly_name IS NULL THEN username ELSE friendly_name END) as friendly_name,' \
                     'do_notify, keep_history, custom_avatar_url as thumb  ' \
                     'FROM users WHERE username = ?'
             result = monitor_db.select(query, args=[user])
             if result:
-                user_detail = {'user_id': result[0][0],
+                user_detail = {'user_id': result[0]['user_id'],
                                'user': user,
-                               'friendly_name': result[0][1],
+                               'friendly_name': result[0]['friendly_name'],
-                               'thumb': result[0][4],
+                               'thumb': result[0]['thumb'],
-                               'do_notify': helpers.checked(result[0][2]),
+                               'do_notify': helpers.checked(result[0]['do_notify']),
-                               'keep_history': helpers.checked(result[0][3])}
+                               'keep_history': helpers.checked(result[0]['keep_history'])}
                 return user_detail
             else:
                 user_detail = {'user_id': None,
@@ -317,7 +319,7 @@ class Users(object):
                 query = 'select user_id FROM users WHERE username = ?'
                 result = monitor_db.select_single(query, args=[user])
                 if result:
-                    return result
+                    return result['user_id']
                 else:
                     return None
             except:
@@ -484,9 +486,9 @@ class Users(object):
                 result = monitor_db.select(query, args=[user])
 
             for item in result:
-                if item[0]:
+                if item['total_time']:
-                    total_time = item[0]
+                    total_time = item['total_time']
-                    total_plays = item[1]
+                    total_plays = item['total_plays']
                 else:
                     total_time = 0
                     total_plays = 0
@@ -527,11 +529,11 @@ class Users(object):
 
         for item in result:
             # Rename Mystery platform names
-            platform_type = common.PLATFORM_NAME_OVERRIDES.get(item[2], item[2])
+            platform_type = common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform'])
 
-            row = {'player_name': item[0],
+            row = {'player_name': item['player'],
                    'platform_type': platform_type,
-                   'total_plays': item[1],
+                   'total_plays': item['player_count'],
                    'result_id': result_id
                    }
             player_stats.append(row)

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_VERSION = "master"
-PLEXPY_RELEASE_VERSION = "1.2.6"
+PLEXPY_RELEASE_VERSION = "1.2.14"

plexpy/webserve.py

@@ -1,7 +1,4 @@
-#!/usr/bin/env python
+# This file is part of PlexPy.
-# -*- coding: utf-8 -*-
-
-# 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
@@ -44,7 +41,7 @@ def serve_template(templatename, **kwargs):
     interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/')
     template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.INTERFACE)
 
-    _hplookup = TemplateLookup(directories=[template_dir])
+    _hplookup = TemplateLookup(directories=[template_dir], default_filters=['unicode', 'h'])
 
     server_name = plexpy.CONFIG.PMS_NAME
 
@@ -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:
@@ -520,6 +518,14 @@ class WebInterface(object):
                     (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:
                 refresh_users = True
@@ -729,6 +735,7 @@ class WebInterface(object):
                 if not session['ip_address']:
                     ip_address = data_factory.get_session_ip(session['session_key'])
                     session['ip_address'] = ip_address
+
         except:
             return serve_template(templatename="current_activity.html", data=None)
 
@@ -1397,6 +1404,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=''):