From c4af6feb92abf53078f32ddd7fc56d23fba3c451 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 15 Mar 2016 19:13:13 -0700 Subject: [PATCH 1/2] Fix typo preventing history logging for websockets --- plexpy/activity_processor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plexpy/activity_processor.py b/plexpy/activity_processor.py index b6fdad22..f280de9e 100644 --- a/plexpy/activity_processor.py +++ b/plexpy/activity_processor.py @@ -130,7 +130,6 @@ class ActivityProcessor(object): stopped = int(time.time()) self.set_session_state(session_key=session['session_key'], state='stopped', - view_offset=session['viewOffset'], stopped=stopped) if plexpy.CONFIG.MOVIE_LOGGING_ENABLE and str(session['rating_key']).isdigit() and \ @@ -382,9 +381,10 @@ class ActivityProcessor(object): return None - def set_session_state(self, session_key=None, state=None, view_offset=0, **kwargs): - if str(session_key).isdigit() and str(view_offset).isdigit(): - values = {'view_offset': int(view_offset)} + def set_session_state(self, session_key=None, state=None, **kwargs): + if str(session_key).isdigit(): + values = {} + if state: values['state'] = state From c72314fb711d0ddf0b70c2e81494caa735141649 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Tue, 15 Mar 2016 19:14:56 -0700 Subject: [PATCH 2/2] v1.3.11 --- CHANGELOG.md | 5 +++++ plexpy/version.py | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b530bda3..9b9dd08b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v1.3.11 (2016-03-15) + +* Fix: Typo preventing history logging for websockets. + + ## v1.3.10 (2016-03-12) * Fix: Actually allow HTML tags for Pushover. diff --git a/plexpy/version.py b/plexpy/version.py index f09e45cf..683d9b58 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1,2 +1,2 @@ PLEXPY_VERSION = "master" -PLEXPY_RELEASE_VERSION = "1.3.10" +PLEXPY_RELEASE_VERSION = "1.3.11"