Improve logging

Author: tsterbak

openandroidinstaller/installer_config.py

@@ -148,8 +148,8 @@ def validate_config(config: str) -> bool:
     )
     try:
         config_schema.validate(config)
-        logger.info("Config is valid.")
+        logger.success("Config is valid.")
         return True
     except SchemaError as se:
-        logger.info(f"Config is invalid. Error {se}")
+        logger.error(f"Config is invalid. Error {se}")
         return False

openandroidinstaller/openandroidinstaller.py

@@ -119,6 +119,7 @@ def confirm(self, e):
         else:
             # display the final view
             self.view.controls.append(self.final_view)
+        logger.info("Confirmed.")
         self.view.update()
 
 

openandroidinstaller/tool_utils.py

@@ -57,7 +57,7 @@ def adb_reboot(bin_path: Path) -> bool:
     for line in run_command("adb", ["reboot"], bin_path):
         yield line
     if (type(line) == bool) and line:
-        logger.info("Reboot failed.")
+        logger.debug("Reboot failed.")
         yield False
     else: 
         yield True
@@ -69,15 +69,15 @@ def adb_reboot_bootloader(bin_path: Path) -> bool:
     for line in run_command("adb", ["reboot", "bootloader"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info("Reboot into bootloader failed.")
+        logger.error("Reboot into bootloader failed.")
         yield False
         return 
     sleep(1)
     # check if in fastboot mode
     for line in run_command("fastboot", ["devices"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info("No fastboot mode detected. Reboot into bootloader failed.")
+        logger.error("No fastboot mode detected. Reboot into bootloader failed.")
         yield False
     else:
         yield True
@@ -89,7 +89,7 @@ def adb_reboot_download(bin_path: Path) -> bool:
     for line in run_command("adb", ["reboot", "download"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info("Reboot into download mode failed.")
+        logger.error("Reboot into download mode failed.")
         yield False
     else: 
         # check if in download mode with heimdall?
@@ -118,7 +118,7 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
     for line in run_command("adb", ["shell", "twrp", "format", "data"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info("Formatting data failed.")
+        logger.error("Formatting data failed.")
         yield False
         return 
     sleep(1)
@@ -128,15 +128,15 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
             yield not line
         sleep(1)
         if (type(line) == bool) and not line:
-            logger.info(f"Wiping {partition} failed.")
+            logger.error(f"Wiping {partition} failed.")
             yield False
             return 
     # activate sideload
     logger.info("Wiping is done, now activate sideload.")
     for line in run_command("adb", ["shell", "twrp", "sideload"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info("Activating sideload failed.")
+        logger.error("Activating sideload failed.")
         yield False
         return 
     # now flash os image
@@ -145,7 +145,7 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
     for line in run_command("adb", ["sideload", f"{target}"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"Sideloading {target} failed.")
+        logger.error(f"Sideloading {target} failed.")
         yield False
         return 
     # wipe some cache partitions
@@ -155,7 +155,7 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
             yield line
         sleep(1)
         if (type(line) == bool) and not line:
-            logger.info(f"Wiping {partition} failed.")
+            logger.error(f"Wiping {partition} failed.")
             yield False
             return 
     # finally reboot into os
@@ -164,7 +164,7 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
     for line in run_command("adb", ["shell", "twrp", "reboot"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info("Rebooting with twrp failed.")
+        logger.error("Rebooting with twrp failed.")
         yield False
         return 
     else:
@@ -177,7 +177,7 @@ def fastboot_unlock_with_code(bin_path: Path, unlock_code: str) -> bool:
     for line in run_command("adb", ["oem", "unlock", f"{unlock_code}"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"Unlocking with code {unlock_code} failed.")
+        logger.error(f"Unlocking with code {unlock_code} failed.")
         yield False
     else: 
         yield True
@@ -189,7 +189,7 @@ def fastboot_unlock(bin_path: Path) -> bool:
     for line in run_command("adb", ["flashing", "unlock"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"Unlocking failed.")
+        logger.error(f"Unlocking failed.")
         yield False
     else: 
         yield True
@@ -201,7 +201,7 @@ def fastboot_oem_unlock(bin_path: Path) -> bool:
     for line in run_command("adb", ["oem", "unlock"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"OEM unlocking failed.")
+        logger.error(f"OEM unlocking failed.")
         yield False
     else: 
         yield True
@@ -213,7 +213,7 @@ def fastboot_reboot(bin_path: Path) -> bool:
     for line in run_command("fastboot", ["reboot"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"Rebooting with fastboot failed.")
+        logger.error(f"Rebooting with fastboot failed.")
         yield False
     else: 
         yield True
@@ -225,7 +225,7 @@ def fastboot_flash_recovery(bin_path: Path, recovery: str) -> bool:
     for line in run_command("fastboot", ["boot", f"{recovery}"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"Flashing recovery failed.")
+        logger.error(f"Flashing recovery failed.")
         yield False
     else: 
         yield True
@@ -237,7 +237,7 @@ def heimdall_flash_recovery(bin_path: Path, recovery: str) -> bool:
     for line in run_command("heimdall", ["flash", "--no-reboot", "--RECOVERY", f"{recovery}"], bin_path):
         yield line
     if (type(line) == bool) and not line:
-        logger.info(f"Flashing recovery with heimdall failed.")
+        logger.error(f"Flashing recovery with heimdall failed.")
         yield False
     else: 
         yield True
@@ -279,5 +279,5 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
         logger.info(device_code)
         return device_code
     except CalledProcessError:
-        logger.info(f"Failed to detect a device.")
+        logger.error(f"Failed to detect a device.")
         return None

openandroidinstaller/utils.py

@@ -36,7 +36,7 @@ def get_download_link(devicecode: str) -> Optional[str]:
             logger.info(f"{url} doesn't exist, status_code: {res.status_code}")
             return
     except requests.exceptions.RequestException as e:
-        logger.info(f"{url} doesn't exist, error: {e}")
+        logger.error(f"{url} doesn't exist, error: {e}")
         return
 
 
@@ -59,9 +59,9 @@ def image_recovery_works_with_device(
             if (device_code in supported_devices) and (
                 device_code in recovery_file_name
             ) and ("twrp" in recovery_file_name):
-                logger.info("Device supported by the image and recovery.")
+                logger.success("Device supported by the image and recovery.")
                 return True
             else:
-                logger.info(f"Recovery {recovery_file_name} and/or image {image_path.split('/')[-1]} are not supported or don't match.")
+                logger.error(f"Recovery {recovery_file_name} and/or image {image_path.split('/')[-1]} are not supported or don't match.")
 
     return False

openandroidinstaller/views.py

@@ -247,6 +247,7 @@ def search_devices(self, e):
                 device_code = device_code_mapping.get(device_code, device_code)
                 self.device_name.value = device_code
             else:
+                logger.info("No device detected! Connect to USB and try again.")
                 self.device_name.value = (
                     "No device detected! Connect to USB and try again."
                 )
@@ -269,7 +270,7 @@ def search_devices(self, e):
                 self.device_name.value = f"{device_name} (code: {device_code})"
             else:
                 # failed to load config
-                logger.info(f"Failed to load config for {device_code}.")
+                logger.error(f"Failed to load config for {device_code}.")
                 self.device_name.value = f"Failed to load config for {device_code}."
         self.view.update()
 
@@ -426,13 +427,15 @@ def enable_button_if_ready(self, e):
                 recovery_path=self.state.recovery_path,
             ):
                 # if image and recovery work for device allow to move on, otherwise display message
+                logger.error("Image and recovery don't work with the device. Please select different ones.")
                 self.info_field.controls = [
                     Text(
                         "Image and recovery don't work with the device. Please select different ones."
                     )
                 ]
                 self.right_view.update()
                 return
+            logger.info("Image and recovery work with the device. You can continue.")
             self.info_field.controls = []
             self.confirm_button.disabled = False
             self.right_view.update()
@@ -476,6 +479,7 @@ def build(self):
             Text(f"{self.step.content}"),
         ]
         # basic view depending on step.type
+        logger.info(f"Starting step of type {self.step.type}.")
         self.confirm_button = confirm_button(self.on_confirm)
         if self.step.type == "confirm_button":
             self.right_view.controls.append(Row([self.confirm_button]))
@@ -506,6 +510,7 @@ def build(self):
             )
 
         elif self.step.type != "text":
+            logger.error(f"Unknown step type: {self.step.type}")
             raise Exception(f"Unknown step type: {self.step.type}")
 
         # if skipping is allowed add a button to the view
@@ -590,6 +595,7 @@ def call_to_phone(self, e, command: str):
                     self.terminal_box.update()
             success = line
         else:
+            logger.error(f"Unknown command type: {command}. Stopping.")
             raise Exception(f"Unknown command type: {command}. Stopping.")
 
         # update the view accordingly
@@ -603,6 +609,7 @@ def call_to_phone(self, e, command: str):
             )
         else:
             sleep(5)  # wait to make sure everything is fine
+            logger.success(f"Command {command} run successfully. Allow to continue.")
             # pop the progress bar
             self.right_view.controls.pop()
             self.confirm_button.disabled = False