Amazon Video Status Fix for Fire 4K (JeffLIrion#162)

lolouk44 · JeffLIrion · web-flow · commit feec94947a58 · 2020-04-30T21:04:53.000-07:00
* Fix Amazon Video State Fire 4K

* Fix Amazon Video State Fire 4K

* Fix test (?)

Co-authored-by: Jeff Irion &lt;JeffLIrion@users.noreply.github.com&gt;
diff --git a/androidtv/firetv.py b/androidtv/firetv.py
@@ -99,11 +99,12 @@ def update(self, get_running_apps=True):
 
             # Amazon Video
             elif current_app == constants.APP_AMAZON_VIDEO:
-                if wake_lock_size == 5:
+                if media_session_state == 2:
+                    state = constants.STATE_PAUSED
+                elif media_session_state == 3:
                     state = constants.STATE_PLAYING
                 else:
-                    # wake_lock_size == 2
-                    state = constants.STATE_PAUSED
+                    state = constants.STATE_STANDBY
 
             # Firefox
             elif current_app == constants.APP_FIREFOX:
diff --git a/tests/test_firetv.py b/tests/test_firetv.py
@@ -321,12 +321,15 @@ def test_state_detection(self):
                           (constants.STATE_STANDBY, "com.amazon.tv.launcher", ["com.amazon.tv.launcher"]))
 
         # Amazon Video
-        self.assertUpdate([True, True, 5, constants.APP_AMAZON_VIDEO, 3, [constants.APP_AMAZON_VIDEO]],
+        self.assertUpdate([True, True, 1, constants.APP_AMAZON_VIDEO, 3, [constants.APP_AMAZON_VIDEO]],
                           (constants.STATE_PLAYING, constants.APP_AMAZON_VIDEO, [constants.APP_AMAZON_VIDEO]))
 
-        self.assertUpdate([True, True, 2, constants.APP_AMAZON_VIDEO, 3, [constants.APP_AMAZON_VIDEO]],
+        self.assertUpdate([True, True, 1, constants.APP_AMAZON_VIDEO, 2, [constants.APP_AMAZON_VIDEO]],
                           (constants.STATE_PAUSED, constants.APP_AMAZON_VIDEO, [constants.APP_AMAZON_VIDEO]))
 
+        self.assertUpdate([True, True, 1, constants.APP_AMAZON_VIDEO, 1, [constants.APP_AMAZON_VIDEO]],
+                          (constants.STATE_STANDBY, constants.APP_AMAZON_VIDEO, [constants.APP_AMAZON_VIDEO]))
+
         # Amazon Video with custom state detection rules
         self.ftv._state_detection_rules = {constants.APP_AMAZON_VIDEO: ['media_session_state']}
 
@@ -341,7 +344,7 @@ def test_state_detection(self):
 
         self.ftv._state_detection_rules = {constants.APP_AMAZON_VIDEO: [{'standby': {'media_session_state': 2}}]}
         self.assertUpdate([True, True, 2, constants.APP_AMAZON_VIDEO, None, [constants.APP_AMAZON_VIDEO]],
-                          (constants.STATE_PAUSED, constants.APP_AMAZON_VIDEO, [constants.APP_AMAZON_VIDEO]))
+                          (constants.STATE_STANDBY, constants.APP_AMAZON_VIDEO, [constants.APP_AMAZON_VIDEO]))
 
         # Firefox
         self.assertUpdate([True, True, 3, constants.APP_FIREFOX, 3, [constants.APP_FIREFOX]],
