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

Merge pull request #1318 from Sheigutn/view-offset-fix

Browse Source 
Don't overwrite view offset when processing session history
This commit is contained in:
JonnyWong16
2018-10-06 18:59:35 -07:00
committed by GitHub
parent a976d65e9c 40559471cf
commit 3b0f31c112
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plexpy/activity_processor.py
View File

@@ -156,10 +156,11 @@ class ActivityProcessor(object):
# Reload json from raw stream info # Reload json from raw stream info
if session.get('raw_stream_info'): if session.get('raw_stream_info'):
raw_stream_info = json.loads(session['raw_stream_info']) raw_stream_info = json.loads(session['raw_stream_info'])
# Don't overwrite id, session_key, stopped # Don't overwrite id, session_key, stopped, view_offset
raw_stream_info.pop('id', None) raw_stream_info.pop('id', None)
raw_stream_info.pop('session_key', None) raw_stream_info.pop('session_key', None)
raw_stream_info.pop('stopped', None) raw_stream_info.pop('stopped', None)
raw_stream_info.pop('view_offset', None)
session.update(raw_stream_info) session.update(raw_stream_info)
session = defaultdict(str, session) session = defaultdict(str, session)