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

Rename time_queries to query_days

Browse source
This commit is contained in:
JonnyWong16 2020-04-09 18:30:46 -07:00
parent bcbfaae630
commit 1d08069162
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
4 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
API.md
View file

@ -1066,7 +1066,7 @@ Required parameters:
Optional parameters: Optional parameters:
grouping (int): 0 or 1 grouping (int): 0 or 1
time_queries (str): "1, 7, 30, 0" query_days (str): Comma separated days, e.g. "1, 7, 30, 0"
Returns: Returns:
json: json:
@ -2379,7 +2379,7 @@ Required parameters:
Optional parameters: Optional parameters:
grouping (int): 0 or 1 grouping (int): 0 or 1
time_queries (str): "1, 7, 30, 0" query_days (str): Comma separated days, e.g. "1, 7, 30, 0"
Returns: Returns:
json: json:

10
plexpy/libraries.py
View file

@ -812,17 +812,17 @@ class Libraries(object):
# If there is no library data we must return something # If there is no library data we must return something
return default_return return default_return
def get_watch_time_stats(self, section_id=None, grouping=None, time_queries=None): def get_watch_time_stats(self, section_id=None, grouping=None, query_days=None):
if not session.allow_session_library(section_id): if not session.allow_session_library(section_id):
return [] return []
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
if time_queries is not None: if query_days is not None:
time_queries = map(int, time_queries.split(",")) query_days = map(int, query_days.split(","))
else: else:
time_queries = [1, 7, 30, 0] query_days = [1, 7, 30, 0]
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
@ -830,7 +830,7 @@ class Libraries(object):
group_by = 'session_history.reference_id' if grouping else 'session_history.id' group_by = 'session_history.reference_id' if grouping else 'session_history.id'
for days in time_queries: for days in query_days:
try: try:
if days > 0: if days > 0:
if str(section_id).isdigit(): if str(section_id).isdigit():

10
plexpy/users.py
View file

@ -434,17 +434,17 @@ class Users(object):
# Use "Local" user to retain compatibility with PlexWatch database value # Use "Local" user to retain compatibility with PlexWatch database value
return default_return return default_return
def get_watch_time_stats(self, user_id=None, grouping=None, time_queries=None): def get_watch_time_stats(self, user_id=None, grouping=None, query_days=None):
if not session.allow_session_user(user_id): if not session.allow_session_user(user_id):
return [] return []
if grouping is None: if grouping is None:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
if time_queries is not None: if query_days is not None:
time_queries = map(int, time_queries.split(",")) query_days = map(int, query_days.split(","))
else: else:
time_queries = [1, 7, 30, 0] query_days = [1, 7, 30, 0]
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
@ -452,7 +452,7 @@ class Users(object):
group_by = 'reference_id' if grouping else 'id' group_by = 'reference_id' if grouping else 'id'
for days in time_queries: for days in query_days:
try: try:
if days > 0: if days > 0:
if str(user_id).isdigit(): if str(user_id).isdigit():

12
plexpy/webserve.py
View file

@ -812,7 +812,7 @@ class WebInterface(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def get_library_watch_time_stats(self, section_id=None, grouping=None, time_queries=None, **kwargs): def get_library_watch_time_stats(self, section_id=None, grouping=None, query_days=None, **kwargs):
""" Get a library's watch time statistics. """ Get a library's watch time statistics.
``` ```
@ -821,7 +821,7 @@ class WebInterface(object):
Optional parameters: Optional parameters:
grouping (int): 0 or 1 grouping (int): 0 or 1
time_queries (str): "1, 7, 30, 0" query_days (str): Comma separated days, e.g. "1, 7, 30, 0"
Returns: Returns:
json: json:
@ -849,7 +849,7 @@ class WebInterface(object):
if section_id: if section_id:
library_data = libraries.Libraries() library_data = libraries.Libraries()
result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping, result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping,
time_queries=time_queries) query_days=query_days)
if result: if result:
return result return result
else: else:
@ -1433,7 +1433,7 @@ class WebInterface(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def get_user_watch_time_stats(self, user_id=None, grouping=None, time_queries=None, **kwargs): def get_user_watch_time_stats(self, user_id=None, grouping=None, query_days=None, **kwargs):
""" Get a user's watch time statistics. """ Get a user's watch time statistics.
``` ```
@ -1442,7 +1442,7 @@ class WebInterface(object):
Optional parameters: Optional parameters:
grouping (int): 0 or 1 grouping (int): 0 or 1
time_queries (str): "1, 7, 30, 0" query_days (str): Comma separated days, e.g. "1, 7, 30, 0"
Returns: Returns:
json: json:
@ -1469,7 +1469,7 @@ class WebInterface(object):
if user_id: if user_id:
user_data = users.Users() user_data = users.Users()
result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping, time_queries=time_queries) result = user_data.get_watch_time_stats(user_id=user_id, grouping=grouping, query_days=query_days)
if result: if result:
return result return result
else: else: