github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-11 15:56:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix username for database queries

Browse source 
* Get the updated username from the users table instead of the one
stored in the session_history table.
This commit is contained in:
Jonathan Wong 2015-11-15 20:59:04 -08:00
parent 1644bbd4b7
commit e9bc767c3b
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plexpy/datafactory.py
View file

@ -41,7 +41,7 @@ class DataFactory(object):
'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter', 'SUM(CASE WHEN paused_counter IS NULL THEN 0 ELSE paused_counter END) AS paused_counter',
'session_history.user_id', 'session_history.user_id',
'session_history.user', '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', 'platform',
'player', 'player',
'ip_address', 'ip_address',
@ -437,7 +437,7 @@ class DataFactory(object):
top_users = [] top_users = []
try: try:
query = 'SELECT session_history.user, ' \ 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,' \ 'users.friendly_name end) as friendly_name,' \
'COUNT(session_history.id) as total_plays, ' \ 'COUNT(session_history.id) as total_plays, ' \
'SUM(case when session_history.stopped > 0 ' \ 'SUM(case when session_history.stopped > 0 ' \
@ -536,7 +536,7 @@ class DataFactory(object):
try: try:
query = 'SELECT session_history_metadata.id, ' \ query = 'SELECT session_history_metadata.id, ' \
'session_history.user, ' \ '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.friendly_name end) as friendly_name,' \
'users.user_id, ' \ 'users.user_id, ' \
'users.custom_avatar_url as user_thumb, ' \ 'users.custom_avatar_url as user_thumb, ' \

4
plexpy/graphs.py
View file

@ -410,7 +410,7 @@ class Graphs(object):
if y_axis == 'plays': if y_axis == 'plays':
query = 'SELECT ' \ 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,' \ '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 = "episode" then 1 else 0 end) as tv_count, ' \
'SUM(case when media_type = "movie" then 1 else 0 end) as movie_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) result = monitor_db.select(query)
else: else:
query = 'SELECT ' \ 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,' \ 'users.friendly_name end) as friendly_name,' \
'SUM(case when media_type = "episode" and stopped > 0 then (stopped - started) ' \ '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_duration, ' \