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

Rewrite get_history query for grouping

Browse Source
This commit is contained in:
Jonathan Wong
2015-09-15 23:34:42 -07:00
parent 8791babf8e
commit 179eaf1bbe
2 changed files with 123 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plexpy/webserve.py
View File

@@ -569,7 +569,12 @@ class WebInterface(object):
message=message, timer=timer, quote=quote)
@cherrypy.expose
def get_history(self, user=None, user_id=None, **kwargs):
def get_history(self, user=None, user_id=None, grouping=0, **kwargs):
if grouping == 'false':
grouping = 0
else:
grouping = plexpy.CONFIG.GROUP_HISTORY_TABLES
custom_where=[]
if user_id:
@@ -588,9 +593,12 @@ class WebInterface(object):
if 'start_date' in kwargs:
start_date = kwargs.get('start_date', "")
custom_where = [['strftime("%Y-%m-%d", datetime(date, "unixepoch", "localtime"))', start_date]]
if 'group_start_id' in kwargs:
group_start_id = kwargs.get('group_start_id', "")
custom_where = [['group_start_id', int(group_start_id)]]
data_factory = datafactory.DataFactory()
history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where)
history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping)
cherrypy.response.headers['Content-type'] = 'application/json'
return json.dumps(history)