Simplify config files

Author: tsterbak

openandroidinstaller/assets/configs/a3y17lte.yaml

@@ -5,29 +5,25 @@ metadata:
 steps:
   unlock_bootloader:
   flash_recovery:
-    - title: "Boot into bootloader"
-      type: call_button
+    - type: call_button
       content: >
         As a first step, you need to boot into the bootloader. A bootloader is the piece of software,
         that tells your phone who to start and run an operating system (like Android). Your device should be turned on.
         Then press 'Confirm and run' to reboot into the bootloader. Continue once it's done.
       command: adb_reboot_download
-    - title: "Flash custom recovery"
-      type: call_button
+    - type: call_button
       content: >
         In this step, you need to flash a custom recovery on your device.
         Press 'Confirm and run' to start the process. Confirm afterwards to continue.
       command: heimdall_flash_recovery
-    - title: "Boot into recovery"
-      type: confirm_button
+    - type: confirm_button
       img: samsung-buttons.png
       content: >
         Unplug the USB cable from your device. Then manually reboot into recovery by pressing the *Volume Down* + *Power buttons* for 
         8~10 seconds until the screen turns black & release the buttons immediately when it does, then boot to recovery with the device powered off, 
         hold *Volume Up* + *Home* + *Power*. Confirm when the recovery screen appears.
   install_os:
-    - title: "Flash LineageOS"
-      type: call_button 
+    - type: call_button 
       content: >
         Connect your device with your computer with the USB-Cable.
         This step will format your phone and wipe all the data. It will also remove encryption and delete all files stored 

openandroidinstaller/assets/configs/sargo.yaml

@@ -4,78 +4,59 @@ metadata:
   devicecode: sargo 
 steps:
   unlock_bootloader:
-    - title: "Unlock the bootloader"
-      type: confirm_button
+    - type: confirm_button
       content: >
         As a first step, you need to unlock the bootloader. A bootloader is the piece of software, that tells your phone
         how to start and run an operating system (like Android). Your device should be turned on.
-    - title: "Unlock the bootloader"
-      type: call_button
+    - type: call_button
       content: Press 'Confirm and run' to reboot into the bootloader.
-      command: "adb reboot bootloader"
-    - title: "Unlock the bootloader"
-      type: confirm_button
+      command: adb_reboot_bootloader
+    - type: confirm_button
       content: >
         Select 'Restart bootloader' on your smartphone screen by pressing the volume button and the confirm by pushing the power button.
         Then press 'Confirm and continue' here.
-    - title: "Unlock the bootloader"
-      type: call_button
+    - type: call_button
       content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: "fastboot flashing unlock"
-      allow_skip: True
-    - title: "Unlock the bootloader"
-      type: confirm_button
+      command: fastboot_unlock
+    - type: confirm_button
       content: >
         At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
         Please take whatever actions the device asks you to to proceed.
-    - title: "Unlock the bootloader"
-      type: call_button
+    - type: call_button
       content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: "fastboot reboot"
-    - title: "Unlock the bootloader"
-      type: confirm_button
+      command: fastboot_reboot
+    - type: confirm_button
       content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable USB debugging to continue.
   flash_recovery:
-    - title: "Flash a custom recovery"
-      type: confirm_button 
+    - type: confirm_button 
       content: >
         Now you need to flash a custom recovery system on the phone. A recovery is a small subsystem on your phone, that manages updating,
         adapting and repairing of the operating system.
-    - title: "Flash a custom recovery"
-      type: call_button
+    - type: call_button
       content: Once the device is fully booted, you need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
-      command: "adb reboot bootloader"
-    - title: "Flash a custom recovery"
-      type: confirm_button
+      command: adb_reboot_bootloader
+    - type: confirm_button
       content: Select 'Restart bootloader' on your smartphone screen. Then confirm to continue.
-    - title: "Flash a custom recovery"
-      type: call_button
+    - type: call_button
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: "fastboot flash boot <recovery>"
+      command: fastboot_flash_recovery
   install_os:
-    - title: "Flash LineageOS"
-      type: confirm_button 
+    - type: confirm_button 
       content: In this step, you finally flash LineageOS. Confirm to continue.
-    - title: "Flash LineageOS"
-      type: confirm_button
+    - type: confirm_button
       content: Select 'Recovery Mode' on your smartphone screen and press the Start-Button to confirm. Then confirm here.
-    - title: "Flash LineageOS"
-      type: confirm_button
+    - type: confirm_button
       content: >
         Now tap Factory Reset, then Format data / Factory reset on your phone screen and continue with the formatting process.
         This will remove encryption and delete all files stored in the internal storage, as well as format your cache partition (if you have one).
-    - title: "Flash LineageOS"
-      type: confirm_button
+    - type: confirm_button
       content: Return to the main menu on the phone.
-    - title: "Flash LineageOS"
-      type: confirm_button
+    - type: confirm_button
       content: On the device, select “Apply Update”, then “Apply from ADB” to begin sideload. Then confirm here.
-    - title: "Flash LineageOS"
-      type: call_button
+    - type: call_button
       content: >
         Now it's time to flash the LineageOS image. Don't remove the USB-Cable and press 'Confirm and run' to start!
         This might take a while. Confirm after it's done.
-      command: "adb sideload <image>"
-    - title: "Flash LineageOS"
-      type: confirm_button
+      command: adb_sideload
+    - type: confirm_button
       content: Flashing finished. Now press 'back' (arrow) and then 'Reboot system now' on the phone screen to finish the installation.

openandroidinstaller/installer_config.py

@@ -73,14 +73,14 @@ def from_file(cls, path):
 
         if raw_steps.get("unlock_bootloader") is not None:
             unlock_bootloader = [
-                Step(**raw_step) 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) 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) 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)
 
 
@@ -115,7 +115,6 @@ def validate_config(config: str) -> bool:
     """Validate the schema of the config."""
 
     step_schema = {
-        "title": str,
         "type": Regex(
             r"text|confirm_button|call_button|call_button_with_input|link_button_with_confirm"
         ),

openandroidinstaller/openandroidinstaller.py

@@ -52,7 +52,6 @@
 from installer_config import Step, _load_config
 from loguru import logger
 from tool_utils import (
-    call_tool_with_command,
     search_device,
     adb_reboot,
     adb_reboot_bootloader,