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

Fix user filtering on graphs with grouping

Browse source
This commit is contained in:
JonnyWong16 2018-02-18 12:58:40 -08:00
parent 87c6ad66fb
commit 681627a656
1 changed files with 43 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

76
plexpy/graphs.py
View file

@ -50,7 +50,7 @@ class Graphs(object):
'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, ' \
'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \ 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
'GROUP BY date_played ' \ 'GROUP BY date_played ' \
'ORDER BY started ASC' % (group_by, time_range, user_cond) 'ORDER BY started ASC' % (group_by, time_range, user_cond)
@ -147,7 +147,7 @@ class Graphs(object):
'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, ' \
'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \ 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
'GROUP BY dayofweek ' \ 'GROUP BY dayofweek ' \
'ORDER BY daynumber' % (group_by, time_range, user_cond) 'ORDER BY daynumber' % (group_by, time_range, user_cond)
@ -245,7 +245,7 @@ class Graphs(object):
'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, ' \
'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \ 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime") %s' \
'GROUP BY hourofday ' \ 'GROUP BY hourofday ' \
'ORDER BY hourofday' % (group_by, time_range, user_cond) 'ORDER BY hourofday' % (group_by, time_range, user_cond)
@ -335,7 +335,7 @@ class Graphs(object):
'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, ' \
'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \ 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s months", "localtime") %s' \ 'WHERE datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s months", "localtime") %s' \
'GROUP BY strftime("%%Y-%%m", datetime(started, "unixepoch", "localtime")) ' \ 'GROUP BY strftime("%%Y-%%m", datetime(started, "unixepoch", "localtime")) ' \
'ORDER BY datestring DESC LIMIT %s' % (group_by, time_range, user_cond, time_range) 'ORDER BY datestring DESC LIMIT %s' % (group_by, time_range, user_cond, time_range)
@ -428,7 +428,7 @@ class Graphs(object):
'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, ' \
'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \ 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \
'COUNT(id) AS total_count ' \ 'COUNT(id) AS total_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \ 'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
'GROUP BY platform ' \ 'GROUP BY platform ' \
'ORDER BY total_count DESC ' \ 'ORDER BY total_count DESC ' \
@ -504,11 +504,11 @@ class Graphs(object):
'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, ' \
'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \ 'SUM(CASE WHEN media_type = "track" THEN 1 ELSE 0 END) AS music_count, ' \
'COUNT(t.id) AS total_count ' \ 'COUNT(session_history.id) AS total_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) AS t ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'JOIN users ON t.user_id = users.user_id ' \ 'JOIN users ON session_history.user_id = users.user_id ' \
'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \ 'WHERE (datetime(started, "unixepoch", "localtime") >= datetime("now", "-%s days", "localtime")) %s' \
'GROUP BY t.user_id ' \ 'GROUP BY session_history.user_id ' \
'ORDER BY total_count DESC ' \ 'ORDER BY total_count DESC ' \
'LIMIT 10' % (group_by, time_range, user_cond) 'LIMIT 10' % (group_by, time_range, user_cond)
@ -584,18 +584,20 @@ class Graphs(object):
try: try:
if y_axis == 'plays': if y_axis == 'plays':
query = 'SELECT date(t.started, "unixepoch", "localtime") AS date_played, ' \ query = 'SELECT date(session_history.started, "unixepoch", "localtime") AS date_played, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "direct play" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "direct play" ' \
'THEN 1 ELSE 0 END) AS dp_count, ' \ 'THEN 1 ELSE 0 END) AS dp_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "copy" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "copy" ' \
'THEN 1 ELSE 0 END) AS ds_count, ' \ 'THEN 1 ELSE 0 END) AS ds_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
'THEN 1 ELSE 0 END) AS tc_count ' \ 'THEN 1 ELSE 0 END) AS tc_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) AS t ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'JOIN session_history_media_info ON t.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE (datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime")) AND ' \ 'datetime("now", "-%s days", "localtime")) AND ' \
'(t.media_type = "episode" OR t.media_type = "movie" OR t.media_type = "track") %s' \ '(session_history.media_type = "episode" OR ' \
'session_history.media_type = "movie" OR ' \
'session_history.media_type = "track") %s' \
'GROUP BY date_played ' \ 'GROUP BY date_played ' \
'ORDER BY started ASC' % (group_by, time_range, user_cond) 'ORDER BY started ASC' % (group_by, time_range, user_cond)
@ -693,12 +695,12 @@ class Graphs(object):
'THEN 1 ELSE 0 END) AS ds_count, ' \ 'THEN 1 ELSE 0 END) AS ds_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
'THEN 1 ELSE 0 END) AS tc_count, ' \ 'THEN 1 ELSE 0 END) AS tc_count, ' \
'COUNT(t.id) AS total_count ' \ 'COUNT(session_history.id) AS total_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) AS t ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'JOIN session_history_media_info ON t.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE (datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime")) AND ' \ 'datetime("now", "-%s days", "localtime")) AND ' \
'(t.media_type = "episode" OR t.media_type = "movie") %s' \ '(session_history.media_type = "episode" OR session_history.media_type = "movie") %s' \
'GROUP BY resolution ' \ 'GROUP BY resolution ' \
'ORDER BY total_count DESC ' \ 'ORDER BY total_count DESC ' \
'LIMIT 10' % (group_by, time_range, user_cond) 'LIMIT 10' % (group_by, time_range, user_cond)
@ -795,12 +797,12 @@ class Graphs(object):
'THEN 1 ELSE 0 END) AS ds_count, ' \ 'THEN 1 ELSE 0 END) AS ds_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" '\ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" '\
'THEN 1 ELSE 0 END) AS tc_count, ' \ 'THEN 1 ELSE 0 END) AS tc_count, ' \
'COUNT(t.id) AS total_count ' \ 'COUNT(session_history.id) AS total_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) AS t ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'JOIN session_history_media_info ON t.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE (datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE (datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime")) AND ' \ 'datetime("now", "-%s days", "localtime")) AND ' \
'(t.media_type = "episode" OR t.media_type = "movie") %s' \ '(session_history.media_type = "episode" OR session_history.media_type = "movie") %s' \
'GROUP BY resolution ' \ 'GROUP BY resolution ' \
'ORDER BY total_count DESC ' \ 'ORDER BY total_count DESC ' \
'LIMIT 10' % (group_by, time_range, user_cond) 'LIMIT 10' % (group_by, time_range, user_cond)
@ -890,19 +892,21 @@ class Graphs(object):
try: try:
if y_axis == 'plays': if y_axis == 'plays':
query = 'SELECT t.platform AS platform, ' \ query = 'SELECT session_history.platform AS platform, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "direct play" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "direct play" ' \
'THEN 1 ELSE 0 END) AS dp_count, ' \ 'THEN 1 ELSE 0 END) AS dp_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "copy" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "copy" ' \
'THEN 1 ELSE 0 END) AS ds_count, ' \ 'THEN 1 ELSE 0 END) AS ds_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
'THEN 1 ELSE 0 END) AS tc_count, ' \ 'THEN 1 ELSE 0 END) AS tc_count, ' \
'COUNT(t.id) AS total_count ' \ 'COUNT(session_history.id) AS total_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) AS t ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'JOIN session_history_media_info ON t.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime") AND ' \ 'datetime("now", "-%s days", "localtime") AND ' \
'(t.media_type = "episode" OR t.media_type = "movie" OR t.media_type = "track") %s' \ '(session_history.media_type = "episode" OR ' \
'session_history.media_type = "movie" OR ' \
'session_history.media_type = "track") %s' \
'GROUP BY platform ' \ 'GROUP BY platform ' \
'ORDER BY total_count DESC LIMIT 10' % (group_by, time_range, user_cond) 'ORDER BY total_count DESC LIMIT 10' % (group_by, time_range, user_cond)
@ -925,7 +929,9 @@ class Graphs(object):
'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime") AND ' \ 'datetime("now", "-%s days", "localtime") AND ' \
'(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") %s' \ '(session_history.media_type = "episode" OR ' \
'session_history.media_type = "movie" OR ' \
'session_history.media_type = "track") %s' \
'GROUP BY platform ' \ 'GROUP BY platform ' \
'ORDER BY total_duration DESC LIMIT 10' % (time_range, user_cond) 'ORDER BY total_duration DESC LIMIT 10' % (time_range, user_cond)
@ -986,13 +992,15 @@ class Graphs(object):
'THEN 1 ELSE 0 END) AS ds_count, ' \ 'THEN 1 ELSE 0 END) AS ds_count, ' \
'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \ 'SUM(CASE WHEN session_history_media_info.transcode_decision = "transcode" ' \
'THEN 1 ELSE 0 END) AS tc_count, ' \ 'THEN 1 ELSE 0 END) AS tc_count, ' \
'COUNT(t.id) AS total_count ' \ 'COUNT(session_history.id) AS total_count ' \
'FROM (SELECT * FROM session_history GROUP BY %s) AS t ' \ 'FROM (SELECT * FROM session_history GROUP BY %s) AS session_history ' \
'JOIN users ON t.user_id = users.user_id ' \ 'JOIN users ON session_history.user_id = users.user_id ' \
'JOIN session_history_media_info ON t.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime") AND ' \ 'datetime("now", "-%s days", "localtime") AND ' \
'(t.media_type = "episode" OR t.media_type = "movie" OR t.media_type = "track") %s' \ '(session_history.media_type = "episode" OR ' \
'session_history.media_type = "movie" OR ' \
'session_history.media_type = "track") %s' \
'GROUP BY username ' \ 'GROUP BY username ' \
'ORDER BY total_count DESC LIMIT 10' % (group_by, time_range, user_cond) 'ORDER BY total_count DESC LIMIT 10' % (group_by, time_range, user_cond)
@ -1019,7 +1027,9 @@ class Graphs(object):
'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \ 'JOIN session_history_media_info ON session_history.id = session_history_media_info.id ' \
'WHERE datetime(started, "unixepoch", "localtime") >= ' \ 'WHERE datetime(started, "unixepoch", "localtime") >= ' \
'datetime("now", "-%s days", "localtime") AND ' \ 'datetime("now", "-%s days", "localtime") AND ' \
'(session_history.media_type = "episode" OR session_history.media_type = "movie" OR session_history.media_type = "track") %s' \ '(session_history.media_type = "episode" OR ' \
'session_history.media_type = "movie" OR ' \
'session_history.media_type = "track") %s' \
'GROUP BY username ' \ 'GROUP BY username ' \
'ORDER BY total_duration DESC LIMIT 10' % (time_range, user_cond) 'ORDER BY total_duration DESC LIMIT 10' % (time_range, user_cond)