Merge branch 'dev'

More dict key fixes.

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 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

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

@@ -1130,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>

plexpy/activity_pinger.py

@@ -127,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

plexpy/activity_processor.py

@@ -180,18 +180,18 @@ class ActivityProcessor(object):
 
                 result = self.db.select(query=query, args=args)
                 
-                new_session = {'id': result[0][0],
-                               'rating_key': result[0][1],
-                               'user_id': result[0][2],
-                               'reference_id': result[0][3]}
+                new_session = {'id': result[0]['id'],
+                               'rating_key': result[0]['rating_key'],
+                               'user_id': result[0]['user_id'],
+                               'reference_id': result[0]['reference_id']}
 
                 if len(result) == 1:
                     prev_session = None
                 else:
-                    prev_session = {'id': result[1][0],
-                                    'rating_key': result[1][1],
-                                    'user_id': result[1][2],
-                                    'reference_id': result[1][3]}
+                    prev_session = {'id': result[1]['id'],
+                                    'rating_key': result[1]['rating_key'],
+                                    'user_id': result[1]['user_id'],
+                                    '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

plexpy/database.py

@@ -58,7 +58,14 @@ 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 = self.dict_factory
+
+    def dict_factory(self, cursor, row):
+        d = {}
+        for idx, col in enumerate(cursor.description):
+            d[col[0]] = row[idx]
+
+        return d
 
     def action(self, query, args=None, return_last_id=False):
         if query is None:

plexpy/datafactory.py

@@ -186,19 +186,19 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
-                           'total_plays': item[2],
-                           'total_duration': item[3],
+                    row = {'title': item['grandparent_title'],
+                           'total_plays': item['total_plays'],
+                           'total_duration': item['total_duration'],
                            'users_watched': '',
-                           'rating_key': item[4],
-                           'last_play': item[5],
-                           'grandparent_thumb': item[6],
+                           'rating_key': item['grandparent_rating_key'],
+                           'last_play': item['last_watch'],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     top_tv.append(row)
 
@@ -234,18 +234,18 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
-                           'users_watched': item[2],
-                           'rating_key': item[3],
-                           'last_play': item[4],
-                           'total_plays': item[5],
-                           'grandparent_thumb': item[7],
+                    row = {'title': item['grandparent_title'],
+                           'users_watched': item['users_watched'],
+                           'rating_key': item['grandparent_rating_key'],
+                           'last_play': item['last_watch'],
+                           'total_plays': item['total_plays'],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     popular_tv.append(row)
 
@@ -278,19 +278,19 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
-                           'total_plays': item[2],
-                           'total_duration': item[3],
+                    row = {'title': item['full_title'],
+                           'total_plays': item['total_plays'],
+                           'total_duration': item['total_duration'],
                            'users_watched': '',
-                           'rating_key': item[4],
-                           'last_play': item[5],
+                           'rating_key': item['rating_key'],
+                           '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)
 
@@ -326,18 +326,18 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
-                           'users_watched': item[2],
-                           'rating_key': item[3],
-                           'last_play': item[4],
-                           'total_plays': item[5],
+                    row = {'title': item['full_title'],
+                           'users_watched': item['users_watched'],
+                           'rating_key': item['rating_key'],
+                           'last_play': item['last_watch'],
+                           '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)
 
@@ -370,19 +370,19 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
-                           'total_plays': item[2],
-                           'total_duration': item[3],
+                    row = {'title': item['grandparent_title'],
+                           'total_plays': item['total_plays'],
+                           'total_duration': item['total_duration'],
                            'users_watched': '',
-                           'rating_key': item[4],
-                           'last_play': item[5],
-                           'grandparent_thumb': item[6],
+                           'rating_key': item['grandparent_rating_key'],
+                           'last_play': item['last_watch'],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     top_music.append(row)
 
@@ -418,18 +418,18 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    row = {'title': item[1],
-                           'users_watched': item[2],
-                           'rating_key': item[3],
-                           'last_play': item[4],
-                           'total_plays': item[5],
-                           'grandparent_thumb': item[7],
+                    row = {'title': item['grandparent_title'],
+                           'users_watched': item['users_watched'],
+                           'rating_key': item['grandparent_rating_key'],
+                           'last_play': item['last_watch'],
+                           'total_plays': item['total_plays'],
+                           'grandparent_thumb': item['grandparent_thumb'],
                            'thumb': '',
                            'user': '',
                            'friendly_name': '',
                            'platform_type': '',
                            'platform': '',
-                           'row_id': item[0]
+                           'row_id': item['id']
                            }
                     popular_music.append(row)
 
@@ -463,17 +463,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],
-                           'user_id': item[6],
-                           'friendly_name': item[1],
-                           'total_plays': item[2],
-                           'total_duration': item[3],
-                           'last_play': item[4],
+                    row = {'user': item['user'],
+                           'user_id': item['user_id'],
+                           'friendly_name': item['friendly_name'],
+                           'total_plays': item['total_plays'],
+                           'total_duration': item['total_duration'],
+                           'last_play': item['last_watch'],
                            'user_thumb': user_thumb,
                            'grandparent_thumb': '',
                            'users_watched': '',
@@ -512,12 +512,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],
-                           'total_plays': item[1],
-                           'total_duration': item[2],
-                           'last_play': item[3],
+                    row = {'platform': item['platform'],
+                           'total_plays': item['total_plays'],
+                           'total_duration': item['total_duration'],
+                           'last_play': item['last_watch'],
                            'platform_type': platform_type,
                            'title': '',
                            'thumb': '',
@@ -570,24 +570,24 @@ class DataFactory(object):
                     return None
 
                 for item in result:
-                    if not item[8] or item[8] == '':
-                        thumb = item[7]
+                    if not item['grandparent_thumb'] or item['grandparent_thumb'] == '':
+                        thumb = item['thumb']
                     else:
-                        thumb = item[8]
+                        thumb = item['grandparent_thumb']
 
                     # Sanitize player name
                     player = helpers.sanitize(item["player"])
 
-                    row = {'row_id': item[0],
-                           'user': item[1],
-                           'friendly_name': item[2],
-                           'user_id': item[3],
-                           'user_thumb': item[4],
-                           'title': item[5],
-                           'rating_key': item[6],
+                    row = {'row_id': item['id'],
+                           'user': item['user'],
+                           'friendly_name': item['friendly_name'],
+                           'user_id': item['user_id'],
+                           'user_thumb': item['user_thumb'],
+                           'title': item['full_title'],
+                           'rating_key': item['rating_key'],
                            'thumb': thumb,
-                           'grandparent_thumb': item[8],
-                           'last_watch': item[9],
+                           'grandparent_thumb': item['grandparent_thumb'],
+                           'last_watch': item['last_watch'],
                            'player': player,
                            }
                     last_watched.append(row)
@@ -615,26 +615,26 @@ class DataFactory(object):
         stream_output = {}
 
         for item in result:
-            stream_output = {'container': item[0],
-                             'bitrate': item[1],
-                             'video_resolution': item[2],
-                             'width': item[3],
-                             'height': item[4],
-                             'aspect_ratio': item[5],
-                             'video_framerate': item[6],
-                             'video_codec': item[7],
-                             'audio_codec': item[8],
-                             'audio_channels': item[9],
-                             'transcode_video_dec': item[10],
-                             'transcode_video_codec': item[11],
-                             'transcode_height': item[12],
-                             'transcode_width': item[13],
-                             'transcode_audio_dec': item[14],
-                             'transcode_audio_codec': item[15],
-                             'transcode_audio_channels': item[16],
-                             'media_type': item[17],
-                             'title': item[18],
-                             'grandparent_title': item[19]
+            stream_output = {'container': item['container'],
+                             'bitrate': item['bitrate'],
+                             'video_resolution': item['video_resolution'],
+                             'width': item['width'],
+                             'height': item['height'],
+                             'aspect_ratio': item['aspect_ratio'],
+                             'video_framerate': item['video_framerate'],
+                             'video_codec': item['video_codec'],
+                             'audio_codec': item['audio_codec'],
+                             'audio_channels': item['audio_channels'],
+                             'transcode_video_dec': item['video_decision'],
+                             'transcode_video_codec': item['transcode_video_codec'],
+                             'transcode_height': item['transcode_height'],
+                             'transcode_width': item['transcode_width'],
+                             'transcode_audio_dec': item['audio_decision'],
+                             'transcode_audio_codec': item['transcode_audio_codec'],
+                             'transcode_audio_channels': item['transcode_audio_channels'],
+                             'media_type': item['media_type'],
+                             'title': item['title'],
+                             'grandparent_title': item['grandparent_title']
                              }
 
         return stream_output
@@ -684,25 +684,25 @@ class DataFactory(object):
             return None
 
         for row in result:
-                if row[1] == 'episode' and row[8]:
-                    thumb = row[8]
-                elif row[1] == 'episode':
-                    thumb = row[9]
+                if row['media_type'] == 'episode' and row['parent_thumb']:
+                    thumb = row['parent_thumb']
+                elif row['media_type'] == 'episode':
+                    thumb = row['grandparent_thumb']
                 else:
-                    thumb = row[7]
+                    thumb = row['thumb']
 
-                recent_output = {'row_id': row[0],
-                                 'type': row[1],
-                                 'rating_key': row[2],
-                                 'title': row[4],
-                                 'parent_title': row[5],
-                                 'grandparent_title': row[6],
+                recent_output = {'row_id': row['id'],
+                                 'type': row['media_type'],
+                                 'rating_key': row['rating_key'],
+                                 'title': row['title'],
+                                 'parent_title': row['parent_title'],
+                                 'grandparent_title': row['grandparent_title'],
                                  'thumb': thumb,
-                                 'index': row[10],
-                                 'parent_index': row[11],
-                                 'year': row[12],
-                                 'time': row[13],
-                                 'user': row[14]
+                                 'index': row['media_index'],
+                                 'parent_index': row['parent_media_index'],
+                                 'year': row['year'],
+                                 'time': row['started'],
+                                 'user': row['user']
                                  }
                 recently_watched.append(recent_output)
 

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]:
-                    series_1_value = item[1]
-                    series_2_value = item[2]
-                    series_3_value = item[3]
+                if date_string == item['date_played']:
+                    series_1_value = item['tv_count']
+                    series_2_value = item['movie_count']
+                    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]:
-                    series_1_value = item[2]
-                    series_2_value = item[3]
-                    series_3_value = item[4]
+                if day_item == item['dayofweek']:
+                    series_1_value = item['tv_count']
+                    series_2_value = item['movie_count']
+                    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]:
-                    series_1_value = item[1]
-                    series_2_value = item[2]
-                    series_3_value = item[3]
+                if hour_item == item['hourofday']:
+                    series_1_value = item['tv_count']
+                    series_2_value = item['movie_count']
+                    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]:
-                    series_1_value = item[1]
-                    series_2_value = item[2]
-                    series_3_value = item[3]
+                if date_string == item['datestring']:
+                    series_1_value = item['tv_count']
+                    series_2_value = item['movie_count']
+                    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]))
-            series_1.append(item[1])
-            series_2.append(item[2])
-            series_3.append(item[3])
+            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']))
+            series_1.append(item['tv_count'])
+            series_2.append(item['movie_count'])
+            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])
-            series_1.append(item[1])
-            series_2.append(item[2])
-            series_3.append(item[3])
+            categories.append(item['friendly_name'])
+            series_1.append(item['tv_count'])
+            series_2.append(item['movie_count'])
+            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]:
-                    series_1_value = item[1]
-                    series_2_value = item[2]
-                    series_3_value = item[3]
+                if date_string == item['date_played']:
+                    series_1_value = item['dp_count']
+                    series_2_value = item['ds_count']
+                    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])
-            series_1.append(item[1])
-            series_2.append(item[2])
-            series_3.append(item[3])
+            categories.append(item['resolution'])
+            series_1.append(item['dp_count'])
+            series_2.append(item['ds_count'])
+            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])
-            series_1.append(item[1])
-            series_2.append(item[2])
-            series_3.append(item[3])
+            categories.append(item['resolution'])
+            series_1.append(item['dp_count'])
+            series_2.append(item['ds_count'])
+            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]))
-            series_1.append(item[1])
-            series_2.append(item[2])
-            series_3.append(item[3])
+            categories.append(common.PLATFORM_NAME_OVERRIDES.get(item['platform'], item['platform']))
+            series_1.append(item['dp_count'])
+            series_2.append(item['ds_count'])
+            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])
-            series_1.append(item[1])
-            series_2.append(item[2])
-            series_3.append(item[3])
+            categories.append(item['username'])
+            series_1.append(item['dp_count'])
+            series_2.append(item['ds_count'])
+            series_3.append(item['tc_count'])
 
         series_1_output = {'name': 'Direct Play',
                            'data': series_1}

plexpy/helpers.py

@@ -433,6 +433,6 @@ def process_json_kwargs(json_kwargs):
 
 def sanitize(string):
     if string:
-        return str(string).replace('<','&lt;').replace('>','&gt;')
+        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],
-                        'on_stop': item[1],
-                        'on_pause': item[2],
-                        'on_resume': item[3],
-                        'on_buffer': item[4],
-                        'on_watched': item[5],
-                        'agent_id': item[6]}
+        notify_state = {'on_play': item['on_play'],
+                        'on_stop': item['on_stop'],
+                        'on_pause': item['on_pause'],
+                        'on_resume': item['on_resume'],
+                        'on_buffer': item['on_buffer'],
+                        'on_watched': item['on_watched'],
+                        '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],
-                        'agent_id': item[1]}
+        notify_state = {'on_created': item['on_created'],
+                        'agent_id': item['agent_id']}
         notify_states.append(notify_state)
 
     return notify_states

plexpy/notifiers.py

@@ -879,9 +879,9 @@ class PUSHALOT(object):
 
         pushalot_authorizationtoken = plexpy.CONFIG.PUSHALOT_APIKEY
 
-        logger.debug(u"Pushalot event: " + event)
-        logger.debug(u"Pushalot message: " + message)
-        logger.debug(u"Pushalot api: " + pushalot_authorizationtoken)
+        #logger.debug(u"Pushalot event: " + event)
+        #logger.debug(u"Pushalot message: " + message)
+        #logger.debug(u"Pushalot api: " + pushalot_authorizationtoken)
 
         http_handler = HTTPSConnection("pushalot.com")
 

plexpy/users.py

@@ -271,17 +271,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],
-                               'friendly_name': result[0][1],
-                               'thumb': result[0][4],
-                               'do_notify': helpers.checked(result[0][2]),
-                               'keep_history': helpers.checked(result[0][3])
+                               'user': result[0]['username'],
+                               'friendly_name': result[0]['friendly_name'],
+                               'thumb': result[0]['thumb'],
+                               'do_notify': helpers.checked(result[0]['do_notify']),
+                               'keep_history': helpers.checked(result[0]['keep_history'])
                                }
                 return user_detail
             else:
@@ -295,17 +295,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],
-                               'thumb': result[0][4],
-                               'do_notify': helpers.checked(result[0][2]),
-                               'keep_history': helpers.checked(result[0][3])}
+                               'friendly_name': result[0]['friendly_name'],
+                               'thumb': result[0]['thumb'],
+                               'do_notify': helpers.checked(result[0]['do_notify']),
+                               'keep_history': helpers.checked(result[0]['keep_history'])}
                 return user_detail
             else:
                 user_detail = {'user_id': None,
@@ -492,9 +492,9 @@ class Users(object):
                 result = monitor_db.select(query, args=[user])
 
             for item in result:
-                if item[0]:
-                    total_time = item[0]
-                    total_plays = item[1]
+                if item['total_time']:
+                    total_time = item['total_time']
+                    total_plays = item['total_plays']
                 else:
                     total_time = 0
                     total_plays = 0
@@ -535,14 +535,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'])
 
-            # Sanitize player name
-            player = helpers.sanitize(item[0])
-
-            row = {'player_name': player,
+            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.8"
+PLEXPY_RELEASE_VERSION = "1.2.11"

plexpy/webserve.py

@@ -41,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