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

Merge pull request #202 from drzoidberg33/websocket-testing

Browse source 
Some activity event fixes.
This commit is contained in:
drzoidberg33 2015-09-23 19:25:03 +02:00
commit b9e900f540
2 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plexpy/activity_handler.py
View file

@ -170,11 +170,12 @@ class ActivityHandler(object):
ap = activity_processor.ActivityProcessor() ap = activity_processor.ActivityProcessor()
db_session = ap.get_session_by_key(session_key=self.get_session_key()) db_session = ap.get_session_by_key(session_key=self.get_session_key())
this_state = self.timeline['state']
this_key = str(self.timeline['ratingKey'])
# If we already have this session in the temp table, check for state changes # If we already have this session in the temp table, check for state changes
if db_session: if db_session:
this_state = self.timeline['state']
last_state = db_session['state'] last_state = db_session['state']
this_key = str(self.timeline['ratingKey'])
last_key = str(db_session['rating_key']) last_key = str(db_session['rating_key'])
# Make sure the same item is being played # Make sure the same item is being played
@ -210,4 +211,5 @@ class ActivityHandler(object):
else: else:
# We don't have this session in our table yet, start a new one. # We don't have this session in our table yet, start a new one.
if this_state != 'buffering':
self.on_start() self.on_start()

2
plexpy/activity_processor.py
View file

@ -27,7 +27,7 @@ class ActivityProcessor(object):
self.db = database.MonitorDatabase() self.db = database.MonitorDatabase()
def write_session(self, session=None): def write_session(self, session=None):
if session:
values = {'session_key': session['session_key'], values = {'session_key': session['session_key'],
'rating_key': session['rating_key'], 'rating_key': session['rating_key'],
'media_type': session['media_type'], 'media_type': session['media_type'],