github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-22 14:13:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Extract user filter generation code into method

Browse source
This commit is contained in:
Tom Niget 2023-06-21 17:10:43 +02:00
commit 9462cfd99b
1 changed files with 19 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

74
plexpy/graphs.py
View file

@ -51,11 +51,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -165,17 +161,21 @@ class Graphs(object):
'series': series_output} 'series': series_output}
return output return output
def make_user_cond(self, user_id):
user_cond = ''
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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
return user_cond
def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays', user_id=None, grouping=None): def get_total_plays_per_dayofweek(self, time_range='30', y_axis='plays', user_id=None, grouping=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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = "AND session_history.user_id = %s " % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -308,11 +308,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -427,11 +423,7 @@ class Graphs(object):
time_range = helpers.cast_to_int(time_range) or 12 time_range = helpers.cast_to_int(time_range) or 12
timestamp = arrow.get(helpers.timestamp()).shift(months=-time_range).floor('month').timestamp() timestamp = arrow.get(helpers.timestamp()).shift(months=-time_range).floor('month').timestamp()
user_cond = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -554,11 +546,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -653,11 +641,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -763,11 +747,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -860,11 +840,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -941,11 +917,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -1048,11 +1020,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
@ -1128,11 +1096,7 @@ class Graphs(object):
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 = '' user_cond = self.make_user_cond(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()
elif user_id and user_id.isdigit():
user_cond = 'AND session_history.user_id = %s ' % user_id
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES