Fixed an issue with session media changes when "buffering" events are…

… received
trakt · Mar 14, 2016 · 98ed454 · 98ed454
1 parent 0298f68
commit 98ed454
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/core/constants.py b/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/core/constants.py
@@ -0,0 +1,5 @@
+IGNORED_EVENTS = [
+    'buffering',
+    'error',
+    'play'
+]
diff --git a/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/core/engine.py b/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/core/engine.py
@@ -1,13 +1,9 @@
+from plugin.scrobbler.core.constants import IGNORED_EVENTS
+
 import logging
 
 log = logging.getLogger(__name__)
 
-IGNORED_EVENTS = [
-    'buffering',
-    'error',
-    'play'
-]
-
 
 class Engine(object):
     handlers = {}

diff --git a/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/methods/s_logging.py b/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/methods/s_logging.py
@@ -2,6 +2,7 @@
 from plugin.managers.action import ActionManager
 from plugin.managers.session.s_logging import LSessionManager
 from plugin.scrobbler.core import SessionEngine
+from plugin.scrobbler.core.constants import IGNORED_EVENTS
 from plugin.scrobbler.methods.core.base import Base
 
 from datetime import datetime, timedelta
@@ -73,6 +74,10 @@ def to_events(cls, session, info):
             log.warn('Event has an invalid state %r', state)
             return []
 
+        if state in IGNORED_EVENTS:
+            log.debug('Ignored "%s" event: %r', state, info)
+            return []
+
         # Validate `view_offset`
         view_offset = to_integer(info.get('viewOffset'))
 

diff --git a/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/methods/s_websocket.py b/Trakttv.bundle/Contents/Libraries/Shared/plugin/scrobbler/methods/s_websocket.py
@@ -1,6 +1,7 @@
 from plugin.core.helpers.variable import to_integer
 from plugin.managers.action import ActionManager
 from plugin.managers.session.s_websocket import WSessionManager
+from plugin.scrobbler.core.constants import IGNORED_EVENTS
 from plugin.scrobbler.core.engine import SessionEngine
 from plugin.scrobbler.methods.core.base import Base
 
@@ -76,6 +77,10 @@ def to_events(cls, session, info):
             log.warn('Event has an invalid state %r', state)
             return []
 
+        if state in IGNORED_EVENTS:
+            log.debug('Ignored "%s" event: %r', state, info)
+            return []
+
         # Check for session `view_offset` jump
         if cls.session_jumped(session, info.get('viewOffset')):
             return []