diff --git a/API.md b/API.md index 8cb7ed60..ae147c46 100644 --- a/API.md +++ b/API.md @@ -1066,7 +1066,7 @@ Required parameters: Optional parameters: 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: json: @@ -2379,7 +2379,7 @@ Required parameters: Optional parameters: 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: json: diff --git a/plexpy/libraries.py b/plexpy/libraries.py index e2e85595..9f5136d9 100644 --- a/plexpy/libraries.py +++ b/plexpy/libraries.py @@ -812,17 +812,17 @@ class Libraries(object): # If there is no library data we must return something 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): return [] if grouping is None: grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES - if time_queries is not None: - time_queries = map(int, time_queries.split(",")) + if query_days is not None: + query_days = map(int, query_days.split(",")) else: - time_queries = [1, 7, 30, 0] + query_days = [1, 7, 30, 0] monitor_db = database.MonitorDatabase() @@ -830,7 +830,7 @@ class Libraries(object): group_by = 'session_history.reference_id' if grouping else 'session_history.id' - for days in time_queries: + for days in query_days: try: if days > 0: if str(section_id).isdigit(): diff --git a/plexpy/users.py b/plexpy/users.py index e8a63392..0a5f7621 100644 --- a/plexpy/users.py +++ b/plexpy/users.py @@ -434,17 +434,17 @@ class Users(object): # Use "Local" user to retain compatibility with PlexWatch database value 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): return [] if grouping is None: grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES - if time_queries is not None: - time_queries = map(int, time_queries.split(",")) + if query_days is not None: + query_days = map(int, query_days.split(",")) else: - time_queries = [1, 7, 30, 0] + query_days = [1, 7, 30, 0] monitor_db = database.MonitorDatabase() @@ -452,7 +452,7 @@ class Users(object): group_by = 'reference_id' if grouping else 'id' - for days in time_queries: + for days in query_days: try: if days > 0: if str(user_id).isdigit(): diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 6145dfe9..a8e87aa4 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -812,7 +812,7 @@ class WebInterface(object): @cherrypy.tools.json_out() @requireAuth(member_of("admin")) @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. ``` @@ -821,7 +821,7 @@ class WebInterface(object): Optional parameters: 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: json: @@ -849,7 +849,7 @@ class WebInterface(object): if section_id: library_data = libraries.Libraries() result = library_data.get_watch_time_stats(section_id=section_id, grouping=grouping, - time_queries=time_queries) + query_days=query_days) if result: return result else: @@ -1433,7 +1433,7 @@ class WebInterface(object): @cherrypy.tools.json_out() @requireAuth(member_of("admin")) @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. ``` @@ -1442,7 +1442,7 @@ class WebInterface(object): Optional parameters: 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: json: @@ -1469,7 +1469,7 @@ class WebInterface(object): if user_id: 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: return result else: