run black

Author: tsterbak

openandroidinstaller/installer_config.py

@@ -73,14 +73,19 @@ def from_file(cls, path):
 
         if raw_steps.get("unlock_bootloader") is not None:
             unlock_bootloader = [
-                Step(**raw_step, title="Unlock the bootloader") for raw_step in raw_steps.get("unlock_bootloader")
+                Step(**raw_step, title="Unlock the bootloader")
+                for raw_step in raw_steps.get("unlock_bootloader")
             ]
         else:
             unlock_bootloader = []
         flash_recovery = [
-            Step(**raw_step, title="Flash custom recovery") for raw_step in raw_steps.get("flash_recovery", [])
+            Step(**raw_step, title="Flash custom recovery")
+            for raw_step in raw_steps.get("flash_recovery", [])
+        ]
+        install_os = [
+            Step(**raw_step, title="Install OS")
+            for raw_step in raw_steps.get("install_os", [])
         ]
-        install_os = [Step(**raw_step, title="Install OS") for raw_step in raw_steps.get("install_os", [])]
         return cls(unlock_bootloader, flash_recovery, install_os, metadata)
 
 
@@ -119,7 +124,9 @@ def validate_config(config: str) -> bool:
             r"text|confirm_button|call_button|call_button_with_input|link_button_with_confirm"
         ),
         "content": str,
-        schema.Optional("command"): Regex(r"adb_reboot|adb_reboot_bootloader|adb_reboot_download|adb_sideload|adb_twrp_wipe_and_install|fastboot_flash_recovery|fastboot_unlock_with_code|fastboot_unlock|fastboot_oem_unlock|fastboot_reboot|heimdall_flash_recovery"),
+        schema.Optional("command"): Regex(
+            r"adb_reboot|adb_reboot_bootloader|adb_reboot_download|adb_sideload|adb_twrp_wipe_and_install|fastboot_flash_recovery|fastboot_unlock_with_code|fastboot_unlock|fastboot_oem_unlock|fastboot_reboot|heimdall_flash_recovery"
+        ),
         schema.Optional("allow_skip"): bool,
         schema.Optional("img"): str,
         schema.Optional("link"): str,

openandroidinstaller/openandroidinstaller.py

@@ -64,7 +64,7 @@
     fastboot_unlock,
     fastboot_oem_unlock,
     fastboot_unlock_with_code,
-    heimdall_flash_recovery
+    heimdall_flash_recovery,
 )
 from utils import AppState, get_download_link, image_recovery_works_with_device
 from widgets import call_button, confirm_button, get_title, link_button
@@ -131,7 +131,7 @@ def build(self):
             modal=True,
             title=Text("How to enable developer options and OEM unlocking"),
             content=Markdown(
-"""
+                """
 To do this, tap seven times on the build number in the 'System'- or 'About the phone'-Menu in Settings. You can also use the phones own search to look for `build number`. 
 Then go back to the main menu and look for 'developer options'. You can also search for it in your phone.
 When you are in developer options, toggle OEM unlocking and USB-Debugging. If your phone is already connected to your PC, a pop-up might appear. Allow USB debugging in the pop-up on your phone.
@@ -656,19 +656,27 @@ def call_to_phone(self, e, command: str):
         elif command == "adb_sideload":
             success = adb_sideload(bin_path=BIN_PATH, target=self.image_path)
         elif command == "adb_twrp_wipe_and_install":
-            success = adb_twrp_wipe_and_install(bin_path=BIN_PATH, target=self.image_path)
+            success = adb_twrp_wipe_and_install(
+                bin_path=BIN_PATH, target=self.image_path
+            )
         elif command == "fastboot_flash_recovery":
-            success = fastboot_flash_recovery(bin_path=BIN_PATH, recovery=self.recovery_path)
+            success = fastboot_flash_recovery(
+                bin_path=BIN_PATH, recovery=self.recovery_path
+            )
         elif command == "fastboot_unlock_with_code":
-            success = fastboot_unlock_with_code(bin_path=BIN_PATH, unlock_code=self.inputtext.value)
+            success = fastboot_unlock_with_code(
+                bin_path=BIN_PATH, unlock_code=self.inputtext.value
+            )
         elif command == "fastboot_unlock":
             success = fastboot_unlock(bin_path=BIN_PATH)
         elif command == "fastboot_oem_unlock":
             success = fastboot_oem_unlock(bin_path=BIN_PATH)
         elif command == "fastboot_reboot":
             success = fastboot_reboot(bin_path=BIN_PATH)
         elif command == "heimdall_flash_recovery":
-            success = heimdall_flash_recovery(bin_path=BIN_PATH, recovery=self.recovery_path)
+            success = heimdall_flash_recovery(
+                bin_path=BIN_PATH, recovery=self.recovery_path
+            )
         else:
             raise Exception(f"Unknown command type: {command}. Stopping.")
 

openandroidinstaller/tool_utils.py

@@ -16,7 +16,15 @@
 import sys
 from pathlib import Path
 from time import sleep
-from subprocess import STDOUT, CalledProcessError, call, check_output, PIPE, run, CompletedProcess
+from subprocess import (
+    STDOUT,
+    CalledProcessError,
+    call,
+    check_output,
+    PIPE,
+    run,
+    CompletedProcess,
+)
 from typing import Optional, List
 
 import regex as re
@@ -38,7 +46,7 @@ def run_command(tool: str, command: List[str], bin_path: Path) -> CompletedProce
     logger.info(f"Run command: {full_command}")
     result = run(full_command, stdout=PIPE, stderr=PIPE, universal_newlines=True)
     # result contains result.returncode, result.stdout, result.stderr
-    return result 
+    return result
 
 
 def adb_reboot(bin_path: Path) -> bool:
@@ -92,7 +100,7 @@ def adb_sideload(bin_path: Path, target: str) -> bool:
 
 def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
     """Wipe and format data with twrp, then flash os image with adb.
-    
+
     Only works for twrp recovery.
     """
     logger.info("Wipe and format data with twrp, then install os image.")
@@ -137,7 +145,7 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
         logger.info("Rebooting with twrp failed.")
         return False
 
-    return True 
+    return True
 
 
 def fastboot_unlock_with_code(bin_path: Path, unlock_code: str) -> bool:
@@ -148,22 +156,22 @@ def fastboot_unlock_with_code(bin_path: Path, unlock_code: str) -> bool:
         logger.info(f"Unlocking with code {unlock_code} failed.")
         return False
     return True
-    
+
 
 def fastboot_unlock(bin_path: Path) -> bool:
     """Unlock the device with fastboot and without code."""
     logger.info(f"Unlock the device with fastboot.")
-    result = run_command("fastboot", ["flashing", "unlock"] , bin_path)
+    result = run_command("fastboot", ["flashing", "unlock"], bin_path)
     if result.returncode != 0:
         logger.info(f"Unlocking failed.")
         return False
     return True
-    
+
 
 def fastboot_oem_unlock(bin_path: Path) -> bool:
     """OEM unlock the device with fastboot and without code."""
     logger.info(f"OEM unlocking the device with fastboot.")
-    result = run_command("fastboot", ["oem", "unlock"] , bin_path)
+    result = run_command("fastboot", ["oem", "unlock"], bin_path)
     if result.returncode != 0:
         logger.info(f"OEM unlocking failed.")
         return False
@@ -173,27 +181,29 @@ def fastboot_oem_unlock(bin_path: Path) -> bool:
 def fastboot_reboot(bin_path: Path) -> bool:
     """Reboot with fastboot"""
     logger.info(f"Rebooting device with fastboot.")
-    result = run_command("fastboot", ["reboot"] , bin_path)
+    result = run_command("fastboot", ["reboot"], bin_path)
     if result.returncode != 0:
         logger.info(f"Rebooting with fastboot failed.")
         return False
     return True
-    
+
 
 def fastboot_flash_recovery(bin_path: Path, recovery: str) -> bool:
     """Temporarily, flash custom recovery with fastboot."""
     logger.info(f"Flash custom recovery with fastboot.")
-    result = run_command("fastboot", ["boot", f"{recovery}"] , bin_path)
+    result = run_command("fastboot", ["boot", f"{recovery}"], bin_path)
     if result.returncode != 0:
         logger.info(f"Flashing recovery failed.")
         return False
     return True
-    
+
 
 def heimdall_flash_recovery(bin_path: Path, recovery: str) -> bool:
     """Temporarily, flash custom recovery with heimdall."""
     logger.info(f"Flash custom recovery with heimdall.")
-    result = run_command("heimdall", ["flash", "--no-reboot", "--RECOVERY", f"{recovery}"] , bin_path)
+    result = run_command(
+        "heimdall", ["flash", "--no-reboot", "--RECOVERY", f"{recovery}"], bin_path
+    )
     if result.returncode != 0:
         logger.info(f"Flashing recovery failed.")
         return False