github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-24 06:55:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update branch from nightly and user filter

Browse source
This commit is contained in:
herby2212 2023-07-11 01:58:07 +02:00
commit 4f8d0434eb
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/interfaces/default/graphs.html
View file

@ -558,7 +558,7 @@
$.ajax({ $.ajax({
url: "get_concurrent_streams_by_stream_type", url: "get_concurrent_streams_by_stream_type",
type: 'get', type: 'get',
data: { time_range: time_range }, data: { time_range: time_range, user_id: selected_user_id },
dataType: "json", dataType: "json",
success: function(data) { success: function(data) {
var dateArray = []; var dateArray = [];
@ -804,7 +804,6 @@
hc_plays_by_platform_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_platform_options.yAxis.labels.formatter = yaxis_format;
hc_plays_by_user_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_user_options.yAxis.labels.formatter = yaxis_format;
hc_plays_by_stream_type_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_stream_type_options.yAxis.labels.formatter = yaxis_format;
hc_concurrent_streams_by_stream_type_options.yAxis.labels.formatter = yaxis_format;
hc_plays_by_source_resolution_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_source_resolution_options.yAxis.labels.formatter = yaxis_format;
hc_plays_by_stream_resolution_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_stream_resolution_options.yAxis.labels.formatter = yaxis_format;
hc_plays_by_platform_by_stream_type_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_platform_by_stream_type_options.yAxis.labels.formatter = yaxis_format;

16
plexpy/graphs.py
View file

@ -826,11 +826,13 @@ class Graphs(object):
'series': [series_1_output, series_2_output, series_3_output]} 'series': [series_1_output, series_2_output, series_3_output]}
return output return output
def get_total_concurrent_streams_per_stream_type(self, time_range='30'): def get_total_concurrent_streams_per_stream_type(self, time_range='30', user_id=None):
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
time_range = helpers.cast_to_int(time_range) or 30 time_range = helpers.cast_to_int(time_range) or 30
timestamp = helpers.timestamp() - time_range * 24 * 60 * 60 timestamp = helpers.timestamp() - time_range * 24 * 60 * 60
user_cond = self._make_user_cond(user_id, 'WHERE')
def calc_most_concurrent(result): def calc_most_concurrent(result):
times = [] times = []
@ -858,10 +860,10 @@ class Graphs(object):
query = 'SELECT sh.date_played, sh.started, sh.stopped, shmi.transcode_decision ' \ query = 'SELECT sh.date_played, sh.started, sh.stopped, shmi.transcode_decision ' \
'FROM (SELECT *, ' \ 'FROM (SELECT *, ' \
'date(started, "unixepoch", "localtime") AS date_played ' \ 'date(started, "unixepoch", "localtime") AS date_played ' \
'FROM session_history) AS sh ' \ 'FROM session_history %s) AS sh ' \
'JOIN session_history_media_info AS shmi ON sh.id = shmi.id ' \ 'JOIN session_history_media_info AS shmi ON sh.id = shmi.id ' \
'WHERE sh.stopped >= %s ' \ 'WHERE sh.stopped >= %s ' \
'ORDER BY sh.date_played' % timestamp 'ORDER BY sh.date_played' % (user_cond, timestamp)
result = monitor_db.select(query) result = monitor_db.select(query)
except Exception as e: except Exception as e:
@ -1253,15 +1255,17 @@ class Graphs(object):
return output return output
def _make_user_cond(self, user_id): def _make_user_cond(self, user_id, cond_prefix=None):
""" """
Expects user_id to be a comma-separated list of ints. Expects user_id to be a comma-separated list of ints.
""" """
user_cond = '' user_cond = ''
cond_prefix = 'AND' if cond_prefix is None else cond_prefix
if session.get_session_user_id() and user_id and user_id != str(session.get_session_user_id()): if session.get_session_user_id() and user_id and user_id != str(session.get_session_user_id()):
user_cond = 'AND session_history.user_id = %s ' % session.get_session_user_id() user_cond = cond_prefix + ' session_history.user_id = %s ' % session.get_session_user_id()
elif user_id: elif user_id:
user_ids = helpers.split_strip(user_id) user_ids = helpers.split_strip(user_id)
if all(id.isdigit() for id in user_ids): if all(id.isdigit() for id in user_ids):
user_cond = 'AND session_history.user_id IN (%s) ' % ','.join(user_ids) user_cond =cond_prefix + ' session_history.user_id IN (%s) ' % ','.join(user_ids)
return user_cond return user_cond

7
plexpy/webserve.py
View file

@ -2553,7 +2553,7 @@ class WebInterface(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth() @requireAuth()
@addtoapi() @addtoapi()
def get_concurrent_streams_by_stream_type(self, time_range='30', **kwargs): def get_concurrent_streams_by_stream_type(self, time_range='30', user_id=None, **kwargs):
""" Get graph data for concurrent streams by stream type by date. """ Get graph data for concurrent streams by stream type by date.
``` ```
@ -2562,6 +2562,7 @@ class WebInterface(object):
Optional parameters: Optional parameters:
time_range (str): The number of days of data to return time_range (str): The number of days of data to return
user_id (str): Comma separated list of user id to filter the data
Returns: Returns:
json: json:
@ -2577,8 +2578,8 @@ class WebInterface(object):
""" """
graph = graphs.Graphs() graph = graphs.Graphs()
result = graph.get_total_concurrent_streams_per_stream_type(time_range=time_range) result = graph.get_total_concurrent_streams_per_stream_type(time_range=time_range, user_id=user_id)
logger.debug(result)
if result: if result:
return result return result
else: else: