Add fastboot_flash_recovery and fastboot_reboot_recovery from anon1892

Author: tsterbak

openandroidinstaller/tooling.py

@@ -440,9 +440,40 @@ def fastboot_flash_boot(bin_path: Path, recovery: str) -> TerminalResponse:
         yield True
 
 
+@add_logging("Flash custom recovery with fastboot.")
+def fastboot_flash_recovery(
+    bin_path: Path, recovery: str, is_ab: bool = True
+) -> TerminalResponse:
+    """Flash custom recovery with fastboot."""
+    for line in run_command(
+        "fastboot flash recovery ", target=f"{recovery}", bin_path=bin_path
+    ):
+        yield line
+    if not is_ab:
+        if (type(line) == bool) and not line:
+            logger.error("Flashing recovery failed.")
+            yield False
+        else:
+            yield True
+
+
+@add_logging("Rebooting device to recovery.")
+def fastboot_reboot_recovery(bin_path: Path) -> TerminalResponse:
+    """Reboot to recovery with fastboot.
+
+    WARNING: On some devices, users need to press a specific key combo to make it work.
+    """
+    for line in run_command("fastboot reboot recovery", bin_path):
+        yield line
+
+
 @add_logging("Flash additional partitions with fastboot")
 def fastboot_flash_additional_partitions(
-    bin_path: Path, dtbo: Optional[str], vbmeta: Optional[str], super_empty: Optional[str], is_ab: bool = True
+    bin_path: Path,
+    dtbo: Optional[str],
+    vbmeta: Optional[str],
+    super_empty: Optional[str],
+    is_ab: bool = True,
 ) -> TerminalResponse:
     """Flash additional partitions (dtbo, vbmeta, super_empty) with fastboot."""
     logger.info("Flash additional partitions with fastboot.")
@@ -544,4 +575,4 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
         return device_code
     except CalledProcessError:
         logger.error("Failed to detect a device.")
-        return None
+        return None

openandroidinstaller/utils.py

@@ -63,7 +63,7 @@ def image_works_with_device(supported_device_codes: List[str], image_path: str)
 def image_sdk_level(image_path: str) -> int:
     """Determine Android version of the selected image.
 
-    Example: 
+    Example:
         Android 13: 33
     """
     with zipfile.ZipFile(image_path) as image_zip:

openandroidinstaller/views/select_view.py

@@ -41,7 +41,12 @@
 from views import BaseView
 from app_state import AppState
 from widgets import get_title, confirm_button
-from utils import get_download_link, image_works_with_device, recovery_works_with_device, image_sdk_level
+from utils import (
+    get_download_link,
+    image_works_with_device,
+    recovery_works_with_device,
+    image_sdk_level,
+)
 
 
 class SelectFilesView(BaseView):
@@ -104,9 +109,15 @@ def init_visuals(
 
         self.selected_image = Text("Selected image: ")
         self.selected_recovery = Text("Selected recovery: ")
-        self.selected_dtbo = Checkbox(fill_color=colors.RED, value=None, disabled=True, tristate=True)
-        self.selected_vbmeta = Checkbox(fill_color=colors.RED, value=None, disabled=True, tristate=True)
-        self.selected_super_empty = Checkbox(fill_color=colors.RED, value=None, disabled=True, tristate=True)
+        self.selected_dtbo = Checkbox(
+            fill_color=colors.RED, value=None, disabled=True, tristate=True
+        )
+        self.selected_vbmeta = Checkbox(
+            fill_color=colors.RED, value=None, disabled=True, tristate=True
+        )
+        self.selected_super_empty = Checkbox(
+            fill_color=colors.RED, value=None, disabled=True, tristate=True
+        )
 
         # initialize and manage button state.
         self.confirm_button = confirm_button(self.on_confirm)
@@ -133,13 +144,15 @@ def build(self):
         )
 
         # attach hidden dialogues
-        self.right_view.controls.extend([
-            self.pick_image_dialog,
-            self.pick_recovery_dialog,
-            self.pick_dtbo_dialog,
-            self.pick_vbmeta_dialog,
-            self.pick_super_empty_dialog
-        ])
+        self.right_view.controls.extend(
+            [
+                self.pick_image_dialog,
+                self.pick_recovery_dialog,
+                self.pick_dtbo_dialog,
+                self.pick_vbmeta_dialog,
+                self.pick_super_empty_dialog,
+            ]
+        )
 
         # create help/info button to show the help dialog
         info_button = OutlinedButton(
@@ -264,14 +277,17 @@ def toggle_additional_image_selection(self):
         # attach the controls for uploading others partitions, like dtbo, vbmeta & super_empty
         additional_image_selection = []
         if self.state.config.metadata["additional_steps"]:
-            additional_image_selection.extend([
+            additional_image_selection.extend(
+                [
                     Text("Select required additional images:", style="titleSmall"),
-                    Markdown("""
+                    Markdown(
+                        """
 Your selected device and ROM requires flashing of additional partitions. Please select the required images below.
 
 Make sure the file is for **your exact phone model!**""",
-                    )
-            ])
+                    ),
+                ]
+            )
         if "dtbo" in self.state.config.metadata["additional_steps"]:
             self.selected_dtbo.value = False
             additional_image_selection.extend(
@@ -372,7 +388,10 @@ def pick_image_result(self, e: FilePickerResultEvent):
             else:
                 self.selected_image.color = colors.RED
         # if the image works and the sdk level is 33 or higher, show the additional image selection
-        if self.selected_image.color == colors.GREEN and image_sdk_level(self.state.image_path) >= 33:
+        if (
+            self.selected_image.color == colors.GREEN
+            and image_sdk_level(self.state.image_path) >= 33
+        ):
             self.toggle_additional_image_selection()
         else:
             self.additional_image_selection.controls = []
@@ -485,7 +504,14 @@ def enable_button_if_ready(self, e):
                 return
 
             # check if the additional images work with the device
-            if any(v == False for v in [self.selected_dtbo.value, self.selected_vbmeta.value, self.selected_super_empty.value]):
+            if any(
+                v == False
+                for v in [
+                    self.selected_dtbo.value,
+                    self.selected_vbmeta.value,
+                    self.selected_super_empty.value,
+                ]
+            ):
                 logger.error(
                     "Some additional images don't match. Please select different ones."
                 )

openandroidinstaller/views/step_view.py

@@ -45,6 +45,8 @@
     adb_twrp_copy_partitions,
     fastboot_boot_recovery,
     fastboot_flash_boot,
+    fastboot_flash_recovery,
+    fastboot_reboot_recovery,
     fastboot_flash_additional_partitions,
     fastboot_oem_unlock,
     fastboot_reboot,
@@ -234,6 +236,12 @@ def call_to_phone(self, e, command: str):
                 fastboot_flash_boot,
                 recovery=self.state.recovery_path,
             ),
+            "fastboot_flash_recovery": partial(
+                fastboot_flash_recovery,
+                recovery=self.state.recovery_path,
+                is_ab=self.state.config.is_ab,
+            ),
+            "fastboot_reboot_recovery": fastboot_reboot_recovery,
             "fastboot_flash_additional_partitions": partial(
                 fastboot_flash_additional_partitions,
                 dtbo=self.state.dtbo_path,