chore: fix a lot of fbt issues

Ref: https://docs.astral.sh/ruff/rules/boolean-default-value-positional-argument/

Author: ashishb

adbe/adb_enhanced.py

@@ -206,20 +206,22 @@ def get_current_rotation_direction() -> int:
     print_verbose(f"Return value is {direction}")
     if not direction or direction == "null":
         return 0  # default direction is 0, vertical straight
+
     try:
         return int(direction)
     except ValueError as e:
         print_error(f'Failed to get direction, error: "{e}"')
+        return 0
 
 
-def handle_layout(value: bool) -> None:
-    cmd = "setprop debug.layout true" if value else "setprop debug.layout false"
+def handle_layout(*, turn_on: bool) -> None:
+    cmd = "setprop debug.layout true" if turn_on else "setprop debug.layout false"
     execute_adb_shell_command_and_poke_activity_service(cmd)
 
 
 # Source: https://stackoverflow.com/questions/10506591/turning-airplane-mode-on-via-adb
-def handle_airplane(turn_on: bool):
-    state = (1 if turn_on else 0)
+def handle_airplane(*, turn_on: bool):
+    state = 1 if turn_on else 0
     return_code, su_path, _ = execute_adb_shell_command2("which su")
     if not return_code and su_path and len(su_path):
         cmd = f"put global airplane_mode_on {state:d}"
@@ -252,8 +254,8 @@ def handle_airplane(turn_on: bool):
         if return_code_wifi != 0 or return_code_data != 0 or return_code_airplane != 0:
             print_error('Failed to put "Global" settings states. Proceeding anyway ...')
 
-        handle_mobile_data(False)
-        set_wifi(False)
+        handle_mobile_data(turn_on=False)
+        set_wifi(turn_on=False)
     else:
         return_code_wifi, last_wifi_state, _ = execute_adb_shell_settings_command2("get global adbe_wifi")
         return_code_data, last_data_state, _ = execute_adb_shell_settings_command2("get global adbe_data")
@@ -266,14 +268,14 @@ def handle_airplane(turn_on: bool):
             print_error("Failed to change airplane mode.")
 
         if last_data_state:
-            handle_mobile_data(last_data_state == "1")
+            handle_mobile_data(turn_on=last_data_state == "1")
         else:
-            handle_mobile_data(True)
+            handle_mobile_data(turn_on=True)
 
         if last_wifi_state:
-            set_wifi(last_wifi_state == "1")
+            set_wifi(turn_on=last_wifi_state == "1")
         else:
-            set_wifi(True)
+            set_wifi(turn_on=True)
     return None
 
 
@@ -300,7 +302,7 @@ def get_battery_saver_state() -> str:
 # Source:
 # https://stackoverflow.com/questions/28234502/programmatically-enable-disable-battery-saver-mode
 @partial(print_state_change_decorator, title="Battery saver", get_state_func=get_battery_saver_state)
-def handle_battery_saver(turn_on: bool) -> None:
+def handle_battery_saver(*, turn_on: bool) -> None:
     _error_if_min_version_less_than(19)
     cmd = "put global low_power 1" if turn_on else "put global low_power 0"
 
@@ -340,7 +342,7 @@ def handle_battery_reset() -> None:
 
 
 # https://developer.android.com/training/monitoring-device-state/doze-standby.html
-def handle_doze(turn_on: bool) -> None:
+def handle_doze(*, turn_on: bool) -> None:
     _error_if_min_version_less_than(23)
 
     enable_idle_mode_cmd = "dumpsys deviceidle enable"
@@ -583,7 +585,7 @@ def get_wifi_state() -> str:
 
 
 @partial(print_state_change_decorator, title="Wi-Fi", get_state_func=get_wifi_state)
-def set_wifi(turn_on: bool) -> None:
+def set_wifi(*, turn_on: bool) -> None:
     cmd = "svc wifi enable" if turn_on else "svc wifi disable"
     return_code, _, _ = execute_adb_shell_command2(cmd)
     if return_code != 0:
@@ -593,14 +595,14 @@ def set_wifi(turn_on: bool) -> None:
 # Source:
 # https://stackoverflow.com/questions/26539445/the-setmobiledataenabled-method-is-no-longer-callable-as-of-android-l-and-later
 @partial(print_state_change_decorator, title="Mobile data", get_state_func=get_mobile_data_state)
-def handle_mobile_data(turn_on: bool) -> None:
+def handle_mobile_data(*, turn_on: bool) -> None:
     cmd = "svc data enable" if turn_on else "svc data disable"
     return_code, _, _ = execute_adb_shell_command2(cmd)
     if return_code != 0:
         print_error_and_exit("Failed to change mobile data setting")
 
 
-def force_rtl(turn_on: bool) -> None:
+def force_rtl(*, turn_on: bool) -> None:
     _error_if_min_version_less_than(19)
     cmd = "put global debug.force_rtl 1" if turn_on else "put global debug.force_rtl 0"
     execute_adb_shell_settings_command_and_poke_activity_service(cmd)
@@ -689,7 +691,7 @@ def get_mobile_data_saver_state():
 
 # https://developer.android.com/training/basics/network-ops/data-saver.html
 @partial(print_state_change_decorator, title="Mobile data saver", get_state_func=get_mobile_data_saver_state)
-def handle_mobile_data_saver(turn_on: bool) -> None:
+def handle_mobile_data_saver(*, turn_on: bool) -> None:
     cmd = "cmd netpolicy set restrict-background true" if turn_on else "cmd netpolicy set restrict-background false"
     return_code, _, _ = execute_adb_shell_command2(cmd)
     if return_code != 0:
@@ -719,7 +721,7 @@ def get_dont_keep_activities_in_background_state():
 @partial(print_state_change_decorator,
          title="Don't keep activities",
          get_state_func=get_dont_keep_activities_in_background_state)
-def handle_dont_keep_activities_in_background(turn_on: bool) -> None:
+def handle_dont_keep_activities_in_background(*, turn_on: bool) -> None:
     # Till Api 25, the value was True/False, above API 25, 1/0 work. Source: manual testing
     use_true_false_as_value = get_device_android_api_version() <= 25
 
@@ -735,7 +737,7 @@ def handle_dont_keep_activities_in_background(turn_on: bool) -> None:
     execute_adb_shell_command_and_poke_activity_service(cmd2)
 
 
-def toggle_animations(turn_on: bool) -> None:
+def toggle_animations(*, turn_on: bool) -> None:
     value = 1 if turn_on else 0
 
     # Source: https://github.com/jaredsburrows/android-gif-example/blob/824c493285a2a2cf22f085662431cf0a7aa204b8/.travis.yml#L34
@@ -764,7 +766,7 @@ def get_show_taps_state():
 
 
 @partial(print_state_change_decorator, title="Show user taps", get_state_func=get_show_taps_state)
-def toggle_show_taps(turn_on: bool) -> None:
+def toggle_show_taps(*, turn_on: bool) -> None:
     value = 1 if turn_on else 0
 
     # Source: https://stackoverflow.com/a/32621809/434196
@@ -790,7 +792,7 @@ def get_stay_awake_while_charging_state():
 @partial(print_state_change_decorator,
          title="Stay awake while charging",
          get_state_func=get_stay_awake_while_charging_state)
-def stay_awake_while_charging(turn_on: bool) -> None:
+def stay_awake_while_charging(*, turn_on: bool) -> None:
     # 1 for USB charging, 2 for AC charging, 4 for wireless charging. Add them together to get 7.
     value = 7 if turn_on else 0
     cmd1 = f"put global stay_on_while_plugged_in {value:d}"
@@ -833,7 +835,7 @@ def list_permission_groups() -> None:
         print_message(stdout)
 
 
-def list_permissions(dangerous_only_permissions: bool) -> None:
+def list_permissions(*, dangerous_only_permissions: bool) -> None:
     # -g is to group permissions by permission groups.
     cmd = "pm list permissions -g -d" if dangerous_only_permissions else "pm list permissions -g"
     return_code, stdout, stderr = execute_adb_shell_command2(cmd)
@@ -1249,14 +1251,13 @@ def calculate_standby_mode(args) -> str:
 
 # Source: https://developer.android.com/preview/features/power
 @ensure_package_exists
-def apply_or_remove_background_restriction(package_name, set_restriction) -> None:
+def apply_or_remove_background_restriction(package_name: str, *, set_restriction: bool) -> None:
     _error_if_min_version_less_than(28)
-    appops_cmd = "cmd appops set {} RUN_ANY_IN_BACKGROUND {}".format(
-        package_name, "ignore" if set_restriction else "allow")
+    appops_cmd = f"cmd appops set {package_name} RUN_ANY_IN_BACKGROUND {'ignore' if set_restriction else 'allow'}"
     execute_adb_shell_command(appops_cmd)
 
 
-def list_directory(file_path, long_format, recursive, include_hidden_files) -> None:
+def list_directory(file_path: str, *, long_format: bool, recursive: bool, include_hidden_files: bool) -> None:
     cmd_prefix = "ls"
     if long_format:
         cmd_prefix += " -l"
@@ -1303,7 +1304,7 @@ def move_file(src_path, dest_path, force) -> None:
 
 # Copies from remote_file_path on Android to local_file_path on the disk
 # local_file_path can be None
-def pull_file(remote_file_path, local_file_path, copy_ancillary=False) -> None:
+def pull_file(remote_file_path: str, local_file_path: str, *, copy_ancillary=False) -> None:
     if not _file_exists(remote_file_path):
         print_error_and_exit(f"File {remote_file_path} does not exist")
 
@@ -1838,7 +1839,7 @@ def get_dark_mode() -> str:
 # This code worked for emulator on API 29.
 # It didn't work for unrooted device on API 30.
 # I am not sure if the problem is rooting or API version
-def set_dark_mode(force: bool) -> None:
+def set_dark_mode(*, force: bool) -> None:
     """
     :param force: if true, force dark mode, if false don't
     """

adbe/adb_helper.py

@@ -23,13 +23,13 @@ def get_adb_prefix() -> str:
     return _adb_prefix
 
 
-def set_adb_prefix(adb_prefix) -> None:
+def set_adb_prefix(adb_prefix: str) -> None:
     # pylint: disable=global-statement
     global _adb_prefix
     _adb_prefix = adb_prefix
 
 
-def get_adb_shell_property(property_name, device_serial=None) -> str | None:
+def get_adb_shell_property(property_name: str, device_serial=None) -> str | None:
     _, stdout, _ = execute_adb_shell_command2(f"getprop {property_name}", device_serial=device_serial)
     return stdout
 

adbe/main.py

@@ -121,7 +121,7 @@ def main() -> None:
         _fail_with_python2_warning()
 
     args: dict[str, typing.Any] = docopt.docopt(USAGE_STRING, version=_get_version())
-    set_verbose(args["--verbose"])
+    set_verbose(enabled=args["--verbose"])
 
     _validate_options(args)
     options = _get_generic_options_from_args(args)
@@ -148,8 +148,8 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
     app_name = args["<app_name>"]
     return {
         # Airplane mode
-        ("airplane", "on"): lambda: adb_enhanced.handle_airplane(True),
-        ("airplane", "off"): lambda: adb_enhanced.handle_airplane(False),
+        ("airplane", "on"): lambda: adb_enhanced.handle_airplane(turn_on=True),
+        ("airplane", "off"): lambda: adb_enhanced.handle_airplane(turn_on=False),
 
         # Alarm
         ("alarm", "all"): lambda: adb_enhanced.alarm_manager(adb_enhanced.AlarmEnum.ALL),
@@ -158,8 +158,8 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
         ("alarm", "top"): lambda: adb_enhanced.alarm_manager(adb_enhanced.AlarmEnum.TOP),
 
         # Animations
-        ("animations", "on"): lambda: adb_enhanced.toggle_animations(True),
-        ("animations", "off"): lambda: adb_enhanced.toggle_animations(False),
+        ("animations", "on"): lambda: adb_enhanced.toggle_animations(turn_on=True),
+        ("animations", "off"): lambda: adb_enhanced.toggle_animations(turn_on=False),
 
         # App-related misc
         ("app", "backup"): lambda: _perform_backup(app_name, args["<backup_tar_file_path>"]),
@@ -182,13 +182,13 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
         # Battery-related
         ("battery", "level"): lambda: adb_enhanced.handle_battery_level(int(args["<percentage>"])),
         ("battery", "reset"): adb_enhanced.handle_battery_reset,
-        ("battery", "saver", "on"): lambda: adb_enhanced.handle_battery_saver(True),
-        ("battery", "saver", "off"): lambda: adb_enhanced.handle_battery_saver(False),
+        ("battery", "saver", "on"): lambda: adb_enhanced.handle_battery_saver(turn_on=True),
+        ("battery", "saver", "off"): lambda: adb_enhanced.handle_battery_saver(turn_on=False),
         ("cat",): lambda: adb_enhanced.cat_file(args["<file_path>"]),
 
         # Dark mode
-        ("dark", "mode", "on"): lambda: adb_enhanced.set_dark_mode(True),
-        ("dark", "mode", "off"): lambda: adb_enhanced.set_dark_mode(False),
+        ("dark", "mode", "on"): lambda: adb_enhanced.set_dark_mode(force=True),
+        ("dark", "mode", "off"): lambda: adb_enhanced.set_dark_mode(force=False),
 
         # List devices
         ("devices",): adb_enhanced.handle_list_devices,
@@ -206,18 +206,18 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
         ("clear-data",): lambda: adb_enhanced.clear_disk_data(app_name),
 
         # Mobile Data
-        ("mobile-data", "saver", "on"): lambda: adb_enhanced.handle_mobile_data_saver(True),
-        ("mobile-data", "saver", "off"): lambda: adb_enhanced.handle_mobile_data_saver(False),
-        ("mobile-data", "on"): lambda: adb_enhanced.handle_mobile_data(True),
-        ("mobile-data", "off"): lambda: adb_enhanced.handle_mobile_data(False),
+        ("mobile-data", "saver", "on"): lambda: adb_enhanced.handle_mobile_data_saver(turn_on=True),
+        ("mobile-data", "saver", "off"): lambda: adb_enhanced.handle_mobile_data_saver(turn_on=False),
+        ("mobile-data", "on"): lambda: adb_enhanced.handle_mobile_data(turn_on=True),
+        ("mobile-data", "off"): lambda: adb_enhanced.handle_mobile_data(turn_on=False),
 
         # Layout
-        ("layout", "on"): lambda: adb_enhanced.handle_layout(True),
-        ("layout", "off"): lambda: adb_enhanced.handle_layout(False),
+        ("layout", "on"): lambda: adb_enhanced.handle_layout(turn_on=True),
+        ("layout", "off"): lambda: adb_enhanced.handle_layout(turn_on=False),
 
         # Location
-        ("location", "on"): lambda: adb_enhanced.toggle_location(True),
-        ("location", "off"): lambda: adb_enhanced.toggle_location(False),
+        ("location", "on"): lambda: adb_enhanced.toggle_location(turn_on=True),
+        ("location", "off"): lambda: adb_enhanced.toggle_location(turn_on=False),
         ("notifications", "list"): adb_enhanced.print_notifications,
 
         # Overdraw
@@ -229,16 +229,16 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
         ("permissions", "grant"): lambda: _grant_revoke_permissions(app_name, args),
         ("permissions", "revoke"): lambda: _grant_revoke_permissions(app_name, args),
         ("permission-groups", "list", "all"): adb_enhanced.list_permission_groups,
-        ("permissions", "list", "all"): lambda: adb_enhanced.list_permissions(False),
-        ("permissions", "list", "dangerous"): lambda: adb_enhanced.list_permissions(True),
+        ("permissions", "list", "all"): lambda: adb_enhanced.list_permissions(dangerous_only_permissions=False),
+        ("permissions", "list", "dangerous"): lambda: adb_enhanced.list_permissions(dangerous_only_permissions=True),
 
         # Pull files
         ("pull",): lambda: adb_enhanced.pull_file(
-            args["<file_path_on_android>"], args["<file_path_on_machine>"], args["-a"]),
+            args["<file_path_on_android>"], args["<file_path_on_machine>"], copy_ancillary=args["-a"]),
         ("push",): lambda: adb_enhanced.push_file(
             args["<file_path_on_machine>"], args["<file_path_on_android>"]),
-        ("restrict-background", "true"): lambda: adb_enhanced.apply_or_remove_background_restriction(app_name, True),
-        ("restrict-background", "false"): lambda: adb_enhanced.apply_or_remove_background_restriction(app_name, False),
+        ("restrict-background", "true"): lambda: adb_enhanced.apply_or_remove_background_restriction(app_name, set_restriction=True),
+        ("restrict-background", "false"): lambda: adb_enhanced.apply_or_remove_background_restriction(app_name, set_restriction=False),
 
         # Rotate
         ("rotate", "portrait"): lambda: adb_enhanced.handle_rotate("portrait"),
@@ -247,38 +247,39 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
         ("rotate", "right"): lambda: adb_enhanced.handle_rotate("right"),
 
         # RTL settings are not working as expected
-        ("rtl", "on"): lambda: adb_enhanced.force_rtl(True),
-        ("rtl", "off"): lambda: adb_enhanced.force_rtl(False),
+        ("rtl", "on"): lambda: adb_enhanced.force_rtl(turn_on=True),
+        ("rtl", "off"): lambda: adb_enhanced.force_rtl(turn_on=False),
 
         # Files related
         ("mv",): lambda: adb_enhanced.move_file(args["<src_path>"], args["<dest_path>"], args["-f"]),
         ("rm",): lambda: adb_enhanced.delete_file(args["<file_path>"], args["-f"], args["-R"] or args["-r"]),
         # Always include hidden files, -a is left for backward-compatibility but is a no-op now.
-        ("ls",): lambda: adb_enhanced.list_directory(args["<file_path>"], args["-l"], args["-R"] or args["-r"], True),
-
+        ("ls",): lambda: adb_enhanced.list_directory(
+            args["<file_path>"], long_format=args["-l"], recursive=args["-R"] or args["-r"],
+            include_hidden_files=True),
         # Screen
         ("screen", "on"): lambda: adb_enhanced.switch_screen(adb_enhanced.SCREEN_ON),
         ("screen", "off"): lambda: adb_enhanced.switch_screen(adb_enhanced.SCREEN_OFF),
         ("screen", "toggle"): lambda: adb_enhanced.switch_screen(adb_enhanced.SCREEN_TOGGLE),
-        ("stay-awake-while-charging", "on"): lambda: adb_enhanced.stay_awake_while_charging(True),
-        ("stay-awake-while-charging", "off"): lambda: adb_enhanced.stay_awake_while_charging(False),
+        ("stay-awake-while-charging", "on"): lambda: adb_enhanced.stay_awake_while_charging(turn_on=True),
+        ("stay-awake-while-charging", "off"): lambda: adb_enhanced.stay_awake_while_charging(turn_on=False),
 
         # Standby bucket
         ("standby-bucket", "get"): lambda: adb_enhanced.get_standby_bucket(app_name),
         ("standby-bucket", "set"): lambda: adb_enhanced.set_standby_bucket(
             app_name, adb_enhanced.calculate_standby_mode(args)),
         # Doze
-        ("doze", "on"): lambda: adb_enhanced.handle_doze(True),
-        ("doze", "off"): lambda: adb_enhanced.handle_doze(False),
+        ("doze", "on"): lambda: adb_enhanced.handle_doze(turn_on=True),
+        ("doze", "off"): lambda: adb_enhanced.handle_doze(turn_on=False),
 
         # App start
         ("start",): lambda: adb_enhanced.launch_app(app_name),
         ("stop",): lambda: adb_enhanced.stop_app(app_name),
         ("restart",): lambda: (adb_enhanced.force_stop(app_name), adb_enhanced.launch_app(app_name)),
 
         # Wi-Fi
-        ("wifi", "on"): lambda: adb_enhanced.set_wifi(True),
-        ("wifi", "off"): lambda: adb_enhanced.set_wifi(False),
+        ("wifi", "on"): lambda: adb_enhanced.set_wifi(turn_on=True),
+        ("wifi", "off"): lambda: adb_enhanced.set_wifi(turn_on=False),
 
         # Wireless debugging
         ("wireless", "debugging", "enable"): adb_enhanced.enable_wireless_debug,
@@ -287,10 +288,10 @@ def _get_actions(args: dict[str, typing.Any]) -> dict[tuple[str, str], typing.Ca
         ("force-stop",): lambda: adb_enhanced.force_stop(app_name),
 
         # Configure UI
-        ("dont-keep-activities", "on"): lambda: adb_enhanced.handle_dont_keep_activities_in_background(True),
-        ("dont-keep-activities", "off"): lambda: adb_enhanced.handle_dont_keep_activities_in_background(False),
-        ("show-taps", "on"): lambda: adb_enhanced.toggle_show_taps(True),
-        ("show-taps", "off"): lambda: adb_enhanced.toggle_show_taps(False),
+        ("dont-keep-activities", "on"): lambda: adb_enhanced.handle_dont_keep_activities_in_background(turn_on=True),
+        ("dont-keep-activities", "off"): lambda: adb_enhanced.handle_dont_keep_activities_in_background(turn_on=False),
+        ("show-taps", "on"): lambda: adb_enhanced.toggle_show_taps(turn_on=True),
+        ("show-taps", "off"): lambda: adb_enhanced.toggle_show_taps(turn_on=False),
 
         # Fetching info from UI
         ("dump-ui",): lambda: adb_enhanced.dump_ui(args["<xml_file>"]),

adbe/output_helper.py

@@ -3,7 +3,7 @@
 __VERBOSE_MODE: bool = False
 
 
-def set_verbose(enabled: bool) -> None:
+def set_verbose(*, enabled: bool) -> None:
     global __VERBOSE_MODE
     __VERBOSE_MODE = enabled