Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@JeffLIrion
JeffLIrion committed Jan 16, 2022
1 parent 954566a commit bd05368
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 224 deletions.
176 changes: 0 additions & 176 deletions androidtv/constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,182 +98,6 @@
CMD_SCREEN_ON + CMD_SUCCESS1_FAILURE0 + " && " + CMD_AWAKE + CMD_SUCCESS1_FAILURE0 + " && " + CMD_WAKE_LOCK_SIZE
)

#: Get the properties for an Android TV device (``lazy=True, get_running_apps=True``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_ANDROIDTV_PROPERTIES_LAZY_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
+ " && "
+ CMD_RUNNING_APPS_ANDROIDTV
)

#: Get the properties for an Android TV device (``lazy=True, get_running_apps=False``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_ANDROIDTV_PROPERTIES_LAZY_NO_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
)

#: Get the properties for an Android TV device (``lazy=False, get_running_apps=True``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_ANDROIDTV_PROPERTIES_NOT_LAZY_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1_FAILURE0
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1_FAILURE0
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
+ " && "
+ CMD_RUNNING_APPS_ANDROIDTV
)

#: Get the properties for an Android TV device (``lazy=False, get_running_apps=False``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_ANDROIDTV_PROPERTIES_NOT_LAZY_NO_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1_FAILURE0
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1_FAILURE0
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
)

#: Get the properties for a Google TV device (``lazy=True, get_running_apps=True``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_GOOGLE_TV_PROPERTIES_LAZY_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP_GOOGLE_TV
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
+ " && "
+ CMD_RUNNING_APPS_ANDROIDTV
)

#: Get the properties for a Google TV device (``lazy=True, get_running_apps=False``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_GOOGLE_TV_PROPERTIES_LAZY_NO_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP_GOOGLE_TV
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
)

#: Get the properties for a Google TV device (``lazy=False, get_running_apps=True``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_GOOGLE_TV_PROPERTIES_NOT_LAZY_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1_FAILURE0
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1_FAILURE0
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP_GOOGLE_TV
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
+ " && "
+ CMD_RUNNING_APPS_ANDROIDTV
)

#: Get the properties for a Google TV device (``lazy=False, get_running_apps=False``); see :py:meth:`androidtv.androidtv.androidtv_sync.AndroidTVSync.get_properties` and :py:meth:`androidtv.androidtv.androidtv_async.AndroidTVAsync.get_properties`
CMD_GOOGLE_TV_PROPERTIES_NOT_LAZY_NO_RUNNING_APPS = (
CMD_SCREEN_ON
+ CMD_SUCCESS1_FAILURE0
+ " && "
+ CMD_AWAKE
+ CMD_SUCCESS1_FAILURE0
+ " && ("
+ CMD_AUDIO_STATE
+ ") && "
+ CMD_WAKE_LOCK_SIZE
+ " && "
+ CMD_CURRENT_APP_GOOGLE_TV
+ " && ("
+ CMD_MEDIA_SESSION_STATE
+ " || echo) && ("
+ CMD_HDMI_INPUT
+ " || echo) && "
+ CMD_STREAM_MUSIC
)

# `getprop` commands
CMD_MANUFACTURER = "getprop ro.product.manufacturer"
CMD_MODEL = "getprop ro.product.model"
Expand Down
48 changes: 0 additions & 48 deletions tests/test_constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,54 +71,6 @@ def test_constants(self):
r"CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {'",
)

# CMD_ANDROIDTV_PROPERTIES_LAZY_RUNNING_APPS
self.assertEqual(
constants.CMD_ANDROIDTV_PROPERTIES_LAZY_RUNNING_APPS,
r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && echo -e '1\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' && (dumpsys audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11 && ps -A | grep u0_a",
)

# CMD_ANDROIDTV_PROPERTIES_LAZY_NO_RUNNING_APPS
self.assertEqual(
constants.CMD_ANDROIDTV_PROPERTIES_LAZY_NO_RUNNING_APPS,
r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && echo -e '1\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' && (dumpsys audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11",
)

# CMD_ANDROIDTV_PROPERTIES_NOT_LAZY_RUNNING_APPS
self.assertEqual(
constants.CMD_ANDROIDTV_PROPERTIES_NOT_LAZY_RUNNING_APPS,
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 audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11 && ps -A | grep u0_a",
)

# CMD_ANDROIDTV_PROPERTIES_NOT_LAZY_NO_RUNNING_APPS
self.assertEqual(
constants.CMD_ANDROIDTV_PROPERTIES_NOT_LAZY_NO_RUNNING_APPS,
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 audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys window windows | grep -E 'mCurrentFocus|mFocusedApp') && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11",
)

# CMD_GOOGLE_TV_PROPERTIES_LAZY_RUNNING_APPS
self.assertEqual(
constants.CMD_GOOGLE_TV_PROPERTIES_LAZY_RUNNING_APPS,
r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && echo -e '1\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' && (dumpsys audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys activity a . | grep mResumedActivity) && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11 && ps -A | grep u0_a",
)

# CMD_GOOGLE_TV_PROPERTIES_LAZY_NO_RUNNING_APPS
self.assertEqual(
constants.CMD_GOOGLE_TV_PROPERTIES_LAZY_NO_RUNNING_APPS,
r"(dumpsys power | grep 'Display Power' | grep -q 'state=ON' || dumpsys power | grep -q 'mScreenOn=true') && echo -e '1\c' && dumpsys power | grep mWakefulness | grep -q Awake && echo -e '1\c' && (dumpsys audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys activity a . | grep mResumedActivity) && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11",
)

# CMD_GOOGLE_TV_PROPERTIES_NOT_LAZY_RUNNING_APPS
self.assertEqual(
constants.CMD_GOOGLE_TV_PROPERTIES_NOT_LAZY_RUNNING_APPS,
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 audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys activity a . | grep mResumedActivity) && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11 && ps -A | grep u0_a",
)

# CMD_GOOGLE_TV_PROPERTIES_NOT_LAZY_NO_RUNNING_APPS
self.assertEqual(
constants.CMD_GOOGLE_TV_PROPERTIES_NOT_LAZY_NO_RUNNING_APPS,
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 audio | grep paused | grep -qv 'Buffer Queue' && echo -e '1\c' || (dumpsys audio | grep started | grep -qv 'Buffer Queue' && echo '2\c' || echo '0\c')) && dumpsys power | grep Locks | grep 'size=' && CURRENT_APP=$(dumpsys activity a . | grep mResumedActivity) && CURRENT_APP=${CURRENT_APP#*ActivityRecord{* * } && CURRENT_APP=${CURRENT_APP#*{* * } && CURRENT_APP=${CURRENT_APP%%/*} && CURRENT_APP=${CURRENT_APP%\}*} && echo $CURRENT_APP && (dumpsys media_session | grep -A 100 'Sessions Stack' | grep -A 100 $CURRENT_APP | grep -m 1 'state=PlaybackState {' || echo) && (dumpsys activity starter | grep -E -o '(ExternalTv|HDMI)InputService/HW[0-9]' -m 1 | grep -o 'HW[0-9]' || echo) && dumpsys audio | grep '\- STREAM_MUSIC:' -A 11",
)

def test_current_app_extraction_atv_launcher(self):
dumpsys_output = """
mCurrentFocus=Window{e74bb23 u0 com.google.android.tvlauncher/com.google.android.tvlauncher.MainActivity}
Expand Down

0 comments on commit bd05368

Please sign in to comment.