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

Make sure we get a result when trying to group the session

Browse source
This commit is contained in:
JonnyWong16 2016-05-17 20:58:28 -07:00
parent 9ecabc3faf
commit e5530182cd
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plexpy/activity_processor.py
View file

@ -220,25 +220,29 @@ class ActivityProcessor(object):
result = self.db.select(query=query, args=args) result = self.db.select(query=query, args=args)
new_session = prev_session = last_id = None
if len(result) > 1:
new_session = {'id': result[0]['id'], new_session = {'id': result[0]['id'],
'rating_key': result[0]['rating_key'], 'rating_key': result[0]['rating_key'],
'view_offset': result[0]['view_offset'], 'view_offset': result[0]['view_offset'],
'user_id': result[0]['user_id'], 'user_id': result[0]['user_id'],
'reference_id': result[0]['reference_id']} 'reference_id': result[0]['reference_id']}
if len(result) == 1:
prev_session = None
else:
prev_session = {'id': result[1]['id'], prev_session = {'id': result[1]['id'],
'rating_key': result[1]['rating_key'], 'rating_key': result[1]['rating_key'],
'view_offset': result[1]['view_offset'], 'view_offset': result[1]['view_offset'],
'user_id': result[1]['user_id'], 'user_id': result[1]['user_id'],
'reference_id': result[1]['reference_id']} 'reference_id': result[1]['reference_id']}
else:
# Get the last insert row id
result = self.db.select(query='SELECT last_insert_rowid() AS last_id')
last_id = result[0]['last_id'] if result else None
query = 'UPDATE session_history SET reference_id = ? WHERE id = ? ' query = 'UPDATE session_history SET reference_id = ? WHERE id = ? '
# If rating_key is the same in the previous session, then set the reference_id to the previous row, else set the reference_id to the new id # If rating_key is the same in the previous session, then set the reference_id to the previous row, else set the reference_id to the new id
if (prev_session is not None) and (prev_session['rating_key'] == new_session['rating_key'] \ if prev_session == new_session == None:
and prev_session['view_offset'] <= new_session['view_offset']): args = [last_id, last_id]
elif prev_session['rating_key'] == new_session['rating_key'] and prev_session['view_offset'] <= new_session['view_offset']:
args = [prev_session['reference_id'], new_session['id']] args = [prev_session['reference_id'], new_session['id']]
else: else:
args = [new_session['id'], new_session['id']] args = [new_session['id'], new_session['id']]