From e9bc767c3b396d9b83c0a223a6f8ab605f43ebca Mon Sep 17 00:00:00 2001 From: Jonathan Wong Date: Sun, 15 Nov 2015 20:59:04 -0800 Subject: [PATCH] Fix username for database queries * Get the updated username from the users table instead of the one stored in the session_history table. --- plexpy/datafactory.py | 6 +++--- plexpy/graphs.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py index 38c4e5ce..948b8fa4 100644 --- a/plexpy/datafactory.py +++ b/plexpy/datafactory.py @@ -41,7 +41,7 @@ class DataFactory(object): 'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter', 'session_history.user_id', 'session_history.user', - '(CASE WHEN users.friendly_name IS NULL THEN user ELSE users.friendly_name END) as friendly_name', + '(CASE WHEN users.friendly_name IS NULL THEN users.username ELSE users.friendly_name END) as friendly_name', 'platform', 'player', 'ip_address', @@ -437,7 +437,7 @@ class DataFactory(object): top_users = [] try: query = 'SELECT session_history.user, ' \ - '(case when users.friendly_name is null then session_history.user else ' \ + '(case when users.friendly_name is null then users.username else ' \ 'users.friendly_name end) as friendly_name,' \ 'COUNT(session_history.id) as total_plays, ' \ 'SUM(case when session_history.stopped > 0 ' \ @@ -536,7 +536,7 @@ class DataFactory(object): try: query = 'SELECT session_history_metadata.id, ' \ 'session_history.user, ' \ - '(case when users.friendly_name is null then session_history.user else ' \ + '(case when users.friendly_name is null then users.username else ' \ 'users.friendly_name end) as friendly_name,' \ 'users.user_id, ' \ 'users.custom_avatar_url as user_thumb, ' \ diff --git a/plexpy/graphs.py b/plexpy/graphs.py index e0a337cc..1240fad5 100644 --- a/plexpy/graphs.py +++ b/plexpy/graphs.py @@ -410,7 +410,7 @@ class Graphs(object): if y_axis == 'plays': query = 'SELECT ' \ - '(case when users.friendly_name is null then session_history.user else ' \ + '(case when users.friendly_name is null then users.username else ' \ 'users.friendly_name end) as friendly_name,' \ 'SUM(case when media_type = "episode" then 1 else 0 end) as tv_count, ' \ 'SUM(case when media_type = "movie" then 1 else 0 end) as movie_count, ' \ @@ -427,7 +427,7 @@ class Graphs(object): result = monitor_db.select(query) else: query = 'SELECT ' \ - '(case when users.friendly_name is null then session_history.user else ' \ + '(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, ' \