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

Merge branch 'dev'

Browse source
This commit is contained in:
JonnyWong16 2016-03-15 19:15:46 -07:00
commit cbf3488de9
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -1,5 +1,10 @@
# Changelog # Changelog
## v1.3.11 (2016-03-15)
* Fix: Typo preventing history logging for websockets.
## v1.3.10 (2016-03-12) ## v1.3.10 (2016-03-12)
* Fix: Actually allow HTML tags for Pushover. * Fix: Actually allow HTML tags for Pushover.

8
plexpy/activity_processor.py
View file

@ -130,7 +130,6 @@ class ActivityProcessor(object):
stopped = int(time.time()) stopped = int(time.time())
self.set_session_state(session_key=session['session_key'], self.set_session_state(session_key=session['session_key'],
state='stopped', state='stopped',
view_offset=session['viewOffset'],
stopped=stopped) stopped=stopped)
if plexpy.CONFIG.MOVIE_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \ if plexpy.CONFIG.MOVIE_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \
@ -382,9 +381,10 @@ class ActivityProcessor(object):
return None return None
def set_session_state(self, session_key=None, state=None, view_offset=0, **kwargs): def set_session_state(self, session_key=None, state=None, **kwargs):
if str(session_key).isdigit() and str(view_offset).isdigit(): if str(session_key).isdigit():
values = {'view_offset': int(view_offset)} values = {}
if state: if state:
values['state'] = state values['state'] = state

2
plexpy/version.py
View file

@ -1,2 +1,2 @@
PLEXPY_VERSION = "master" PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.3.10" PLEXPY_RELEASE_VERSION = "1.3.11"