anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Show masked top 10 users on graphs

Browse Source
This commit is contained in:
JonnyWong16
2016-04-27 22:16:30 -07:00
parent 4b8d4488d7
commit 54776e2712
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/graphs.html
View File

@@ -271,7 +271,7 @@
var y = dateValue.getFullYear(); var y = dateValue.getFullYear();
var dateString = '' + y + '-' + (m<=9 ? '0' + m : m) + '-' + (d <= 9 ? '0' + d : d); var dateString = '' + y + '-' + (m<=9 ? '0' + m : m) + '-' + (d <= 9 ? '0' + d : d);
var media_type = 'all'; var media_type = null;
var transcode_decision = null; var transcode_decision = null;
switch(selectedSeries) { switch(selectedSeries) {
case "TV": media_type = 'episode'; break; case "TV": media_type = 'episode'; break;

18
plexpy/graphs.py
View File

@@ -451,9 +451,7 @@ class Graphs(object):
time_range = '30' time_range = '30'
user_cond = '' user_cond = ''
if session.get_session_user_id(): if user_id and user_id.isdigit() and not session.get_session_user_id():
user_cond = 'AND session_history.user_id = %s ' % session.get_session_user_id()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id user_cond = 'AND session_history.user_id = %s ' % user_id
try: try:
@@ -505,7 +503,10 @@ class Graphs(object):
session_user_id = session.get_session_user_id() session_user_id = session.get_session_user_id()
for item in result: for item in result:
categories.append(item['username'] if str(item['user_id']) == session_user_id else item['friendly_name']) if session_user_id:
categories.append(item['username'] if str(item['user_id']) == session_user_id else 'Plex User')
else:
categories.append(item['friendly_name'])
series_1.append(item['tv_count']) series_1.append(item['tv_count'])
series_2.append(item['movie_count']) series_2.append(item['movie_count'])
series_3.append(item['music_count']) series_3.append(item['music_count'])
@@ -889,9 +890,7 @@ class Graphs(object):
time_range = '30' time_range = '30'
user_cond = '' user_cond = ''
if session.get_session_user_id(): if user_id and user_id.isdigit() and not session.get_session_user_id():
user_cond = 'AND session_history.user_id = %s ' % session.get_session_user_id()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id user_cond = 'AND session_history.user_id = %s ' % user_id
try: try:
@@ -954,7 +953,10 @@ class Graphs(object):
session_user_id = session.get_session_user_id() session_user_id = session.get_session_user_id()
for item in result: for item in result:
categories.append(item['username'] if str(item['user_id']) == session_user_id else item['friendly_name']) if session_user_id:
categories.append(item['username'] if str(item['user_id']) == session_user_id else 'Plex User')
else:
categories.append(item['friendly_name'])
series_1.append(item['dp_count']) series_1.append(item['dp_count'])
series_2.append(item['ds_count']) series_2.append(item['ds_count'])
series_3.append(item['tc_count']) series_3.append(item['tc_count'])