Add minimal logging and improve config for Xperia Z

Author: tsterbak

openandroidinstaller/assets/configs/Xperia Z.yaml

@@ -1,58 +1,56 @@
 steps:
   - title: "Unlock the bootloader"
     type: confirm_button
-    content: "On the device, dial *#*#7378423#*#* (*#*#SERVICE#*#*) to launch the service menu."
+    content: "As a first step, you need to unlock the bootloader of your device. On the device, dial *#*#7378423#*#* (*#*#SERVICE#*#*) to launch the service menu."
   - title: "Unlock the bootloader"
     type: confirm_button
-    content: "Go to service info > configuration and check rooting status – you can only continue if it says Bootloader unlock allowed: Yes."
+    content: "Go to service info > configuration and check rooting status - you can only continue if it says 'Bootloader unlock allowed: Yes.'"
   - title: "Unlock the bootloader"
     type: confirm_button
-    content: "Connect the device to your PC via USB."
+    content: "Connect the device to your PC via USB. And confirm to continue."
   - title: "Unlock the bootloader"
     type: call_button
-    content: "Unlock the bootloader"
+    content: "Press the button to reboot into the bootloader now. Then confirm to continue."
     command: "adb reboot bootloader"
   - title: "Unlock the bootloader"
     type: confirm_button
     content: "Follow the instructions on Sonys official unlocking website to generate an unlock code for your bootloader. https://developer.sonymobile.com/unlockbootloader/unlock-yourboot-loader/"
   - title: "Unlock the bootloader"
     type: call_button_with_input
-    content: "Use your code to unlock the bootloader of your device:"
+    content: "Use your code to unlock the bootloader of your device. Type in the full 18 character code starting with 0x (Example: 0x3EC4F7AD6E0B32B6). If you already did that, you can skip this step."
     command: "fastboot oem unlock <inputtext>"
     allow_skip: True
   - title: "Flash temporary recovery"
-    type: confirm_button
-    content: "Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB."
+    type: call_button
+    content: "Press the button to reboot. Since the device resets completely, you will need to re-enable USB debugging to continue. Connect your device to your PC via USB. Then confirm here to continue."
+    command: "fastboot reboot"
   - title: "Flash temporary recovery"
     type: call_button
-    content: "Reboot into bootloader"
+    content: "Now you have to reboot into bootloader again. Press the button to do it and continue once it is done."
     command: "adb reboot bootloader"
     allow_skip: True
   - title: "Flash temporary recovery"
     type: call_button
-    content: "Flash recovery image"
+    content: "Next, you need to flash a custom recovery image. Press the button to flash the selected image. Then continue."
     command: "fastboot flash boot <recovery>"
   - title: "Flash LineageOS"
     type: call_button
-    content: "Boot into recovery"
+    content: "Now, boot into recovery by pressing the button. Once it's booted again, continue."
     command: "fastboot reboot"
   - title: "Flash LineageOS"
     type: confirm_button
-    content: "Now tap 'Wipe'. Then tap 'Format Data' and continue with the formatting process. This will remove encryption and delete all files stored in the internal storage."
+    content: "Now tap 'Wipe'. Then tap 'Format Data' and continue with the formatting process on your phone. This will remove encryption and delete all files stored in the internal storage. Then press the button to continue."
   - title: "Flash LineageOS"
     type: confirm_button
-    content: "Return to the previous menu and tap 'Advanced Wipe', then select the 'Cache' and 'System' partitions and then 'Swipe to Wipe'."
+    content: "Return to the previous menu and tap 'Advanced Wipe', then select the 'Cache' and 'System' partitions and then 'Swipe to Wipe' on the phone. Once it's finished, confirm here to continue."
   - title: "Flash LineageOS"
     type: confirm_button
-    content: "On the device, go back and select “Advanced”, “ADB Sideload”, then swipe to begin sideload. Then confirm here"
+    content: "On the device, go back to the main menu and select “Advanced”, “ADB Sideload”, then swipe to begin sideload. Then confirm here"
   - title: "Flash LineageOS"
     type: call_button
-    content: "Flash lineageOS image. Don't remove the USB-Cable!"
+    content: "By pressing the button, you flash lineageOS image now. This can take a while. Don't remove the USB-Cable!"
     command: "adb sideload <image>"
   - title: "Reboot"
     type: call_button
-    content: "Reboot into OS"
-    command: "adb reboot"
-  - title: "Successfully finished flashing"
-    type: text
-    content: "Have fun with LineageOS!"
+    content: "As a final step, reboot into LineageOS to finish the installation by pressing the button."
+    command: "adb reboot"

openandroidinstaller/openandroidinstaller.py

@@ -14,6 +14,7 @@
 # Author: Tobias Sterbak
 
 import webbrowser
+from loguru import logger
 from os import path
 from subprocess import STDOUT, CalledProcessError, call, check_output
 from time import sleep
@@ -51,7 +52,7 @@
 
 # Toggle to True for development purposes
 DEVELOPMENT = False
-DEVELOPMENT_CONFIG = "Pixel 3a"
+DEVELOPMENT_CONFIG = "Xperia Z"  # "Pixel 3a"
 
 
 CONFIG_PATH = path.abspath(path.join(path.dirname(__file__), "assets/configs/"))
@@ -134,7 +135,7 @@ def build(self):
                 ),
                 Divider(),
                 Text(
-                    "Now connect your device to this computer via USB, then press 'Search device'."
+                    "Now connect your device to this computer via USB and allow USB debugging in the pop-up on your phone. Then press 'Search device'."
                 ),
                 Divider(),
                 Column(
@@ -483,6 +484,7 @@ def call_to_phone(self, e, command: str):
             )
         )
         self.right_view.update()
+        logger.info(f"Run command: {command}")
         res = call(f"{command}", shell=True)
         if res != 0:
             self.right_view.controls.pop()

poetry.lock

@@ -15,6 +15,7 @@ pyinstaller = "^5.3"
 Pillow = "^9.2.0"
 PyYAML = "^6.0"
 isort = "^5.10.1"
+loguru = "^0.6.0"
 
 [tool.poetry.dev-dependencies]