From 862a992cbb08c9aa338e7d1540a2b374be5dce85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20R=C3=B8er?= Date: Wed, 23 Nov 2022 15:40:21 +0100 Subject: [PATCH 1/3] Fix CMD_SCREEN_ON constant in accordance with #323 --- androidtv/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/androidtv/constants.py b/androidtv/constants.py index 325270e..a7d04d3 100644 --- a/androidtv/constants.py +++ b/androidtv/constants.py @@ -178,7 +178,7 @@ class DeviceEnum(IntEnum): #: Determine if the device is on CMD_SCREEN_ON = ( - "(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true')" + "(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON')" ) #: Get the "STREAM_MUSIC" block from ``dumpsys audio`` From 78d4e3b9d696f3b09b2e598aae676d1daab41a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20R=C3=B8er?= Date: Wed, 23 Nov 2022 15:54:27 +0100 Subject: [PATCH 2/3] Format constants.py with black --- androidtv/constants.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/androidtv/constants.py b/androidtv/constants.py index a7d04d3..175e4d8 100644 --- a/androidtv/constants.py +++ b/androidtv/constants.py @@ -177,9 +177,7 @@ class DeviceEnum(IntEnum): CMD_INSTALLED_APPS = "pm list packages" #: Determine if the device is on -CMD_SCREEN_ON = ( - "(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON')" -) +CMD_SCREEN_ON = "(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON')" #: Get the "STREAM_MUSIC" block from ``dumpsys audio`` CMD_STREAM_MUSIC = r"dumpsys audio | grep '\- STREAM_MUSIC:' -A 11" From 4ccfc5e97edb3e3ae30c5c68eaee05edf32a6149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20R=C3=B8er?= Date: Wed, 23 Nov 2022 15:56:35 +0100 Subject: [PATCH 3/3] Update constant in unittest --- tests/test_constants.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_constants.py b/tests/test_constants.py index 57034c6..5f3fb45 100644 --- a/tests/test_constants.py +++ b/tests/test_constants.py @@ -185,13 +185,13 @@ def test_constants(self): # CMD_SCREEN_ON self.assertCommand( constants.CMD_SCREEN_ON, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true')", + r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON')", ) # CMD_SCREEN_ON_AWAKE_WAKE_LOCK_SIZE self.assertCommand( constants.CMD_SCREEN_ON_AWAKE_WAKE_LOCK_SIZE, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep Locks | grep 'size='", + r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' || echo -e '0\c' && dumpsys power | grep Locks | grep 'size='", ) # CMD_SERIALNO @@ -203,25 +203,25 @@ def test_constants(self): # CMD_TURN_OFF_ANDROIDTV self.assertCommand( constants.CMD_TURN_OFF_ANDROIDTV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && input keyevent 26", + r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') && input keyevent 26", ) # CMD_TURN_OFF_FIRETV self.assertCommand( constants.CMD_TURN_OFF_FIRETV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && input keyevent 223", + r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') && input keyevent 223", ) # CMD_TURN_ON_ANDROIDTV self.assertCommand( constants.CMD_TURN_ON_ANDROIDTV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') || input keyevent 26", + r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') || input keyevent 26", ) # CMD_TURN_ON_FIRETV self.assertCommand( constants.CMD_TURN_ON_FIRETV, - r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') || (input keyevent 26 && input keyevent 3)", + r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true' || dumpsys display | grep -q 'mScreenState=ON') || (input keyevent 26 && input keyevent 3)", ) # CMD_VERSION