Restructure select page a bit

Author: tsterbak

openandroidinstaller/utils.py

@@ -39,13 +39,10 @@ def get_download_link(devicecode: str) -> Optional[str]:
         return
 
 
-def image_recovery_works_with_device(
-    device_code: str, image_path: str, recovery_path: str
+def image_works_with_device(
+    device_code: str, image_path: str
 ) -> bool:
-    """Determine if an image and recovery works for the given device.
-
-    BEWARE: THE RECOVERY PART IS STILL VERY BASIC!
-    """
+    """Determine if an image works for the given device."""
     with zipfile.ZipFile(image_path) as image_zip:
         with image_zip.open(
             "META-INF/com/android/metadata", mode="r"
@@ -54,17 +51,25 @@ def image_recovery_works_with_device(
             supported_devices = str(metadata[-1]).split("=")[-1][:-3].split(",")
             logger.info(f"Image works with device: {supported_devices}")
 
-            recovery_file_name = recovery_path.split("/")[-1]
-            if (
-                (device_code in supported_devices)
-                and (device_code in recovery_file_name)
-                and ("twrp" in recovery_file_name)
-            ):
-                logger.success("Device supported by the image and recovery.")
+            if (device_code in supported_devices):
+                logger.success("Device supported by the selected image.")
                 return True
             else:
-                logger.error(
-                    f"Recovery {recovery_file_name} and/or image {image_path.split('/')[-1]} are not supported or don't match."
-                )
+                logger.error(f"Image file {image_path.split('/')[-1]} is not supported.")
+                return False
+
 
-    return False
+def recovery_works_with_device(
+    device_code: str, recovery_path: str
+) -> bool:
+    """Determine if a recovery works for the given device.
+
+    BEWARE: THE RECOVERY PART IS STILL VERY BASIC!
+    """
+    recovery_file_name = recovery_path.split("/")[-1]
+    if (device_code in recovery_file_name) and ("twrp" in recovery_file_name):
+        logger.success("Device supported by the selected recovery.")
+        return True
+    else:
+        logger.error(f"Recovery file {recovery_file_name} is not supported.")
+        return False

openandroidinstaller/views/select_view.py

@@ -39,7 +39,8 @@
 from widgets import get_title, confirm_button
 from utils import (
     get_download_link,
-    image_recovery_works_with_device,
+    image_works_with_device,
+    recovery_works_with_device
 )
 
 
@@ -58,25 +59,25 @@ def build(self):
             modal=True,
             title=Text("What is an OS image and recovery and why do I need it?"),
             content=Markdown(
-                """
-## OS image or ROM
-An operating system (OS) is system software that manages computer hardware, software resources, and provides common services for computer programs. 
+"""## OS image or ROM
+An operating system (OS) is system software that manages computer hardware,
+software resources, and provides common services for computer programs. 
 Popular, custom operating systems for mobile devices based on Android are 
 - [LineageOS](https://lineageos.org/)
 - [/e/OS](https://e.foundation/e-os/) or
 - [LineageOS for microG](https://lineage.microg.org/)
 - and many others.
 
-Often, the related OS images are called 'ROM'. 'ROM' stands for *R*ead-*o*nly *m*emory, which is a type of non-volatile memory used in computers
-for storing software that is rarely changed during the life of the system, also known as firmware.
+Often, the related OS images are called 'ROM'. 'ROM' stands for *R*ead-*o*nly *m*emory,
+which is a type of non-volatile memory used in computers for storing software that is
+rarely changed during the life of the system, also known as firmware.
 
 # Recovery Image
 A custom recovery is used for installing custom software on your device.
 This custom software can include smaller modifications like rooting your device or even
 replacing the firmware of the device with a completely custom ROM. .
 
-OpenAndroidInstaller works with the [TWRP recovery project](https://twrp.me/about/).
-""",
+OpenAndroidInstaller works with the [TWRP recovery project](https://twrp.me/about/).""",
                 on_tap_link=lambda e: self.page.launch_url(e.data),
             ),
             actions=[
@@ -220,6 +221,7 @@ def close_developer_options_dlg(self, e):
 
     def pick_image_result(self, e: FilePickerResultEvent):
         path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        # update the textfield with the name of the file
         self.selected_image.value = (
             self.selected_image.value.split(":")[0] + f": {path}"
         )
@@ -229,10 +231,18 @@ def pick_image_result(self, e: FilePickerResultEvent):
             logger.info(f"Selected image from {self.image_path}")
         else:
             logger.info("No image selected.")
+        # check if the image works with the device and show the filename in different colors accordingly
+        device_code = self.state.config.metadata.get("devicecode")
+        if image_works_with_device(device_code=device_code, image_path=self.state.image_path):
+            self.selected_image.color = colors.GREEN
+        else:
+            self.selected_image.color = colors.RED
+        # update
         self.selected_image.update()
 
     def pick_recovery_result(self, e: FilePickerResultEvent):
         path = ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
+        # update the textfield with the name of the file
         self.selected_recovery.value = (
             self.selected_recovery.value.split(":")[0] + f": {path}"
         )
@@ -242,17 +252,23 @@ def pick_recovery_result(self, e: FilePickerResultEvent):
             logger.info(f"Selected recovery from {self.recovery_path}")
         else:
             logger.info("No image selected.")
+        # check if the recovery works with the device and show the filename in different colors accordingly
+        device_code = self.state.config.metadata.get("devicecode")
+        if recovery_works_with_device(device_code=device_code, recovery_path=self.state.recovery_path):
+            self.selected_recovery.color = colors.GREEN
+        else:
+            self.selected_recovery.color = colors.RED
+        # update
         self.selected_recovery.update()
 
     def enable_button_if_ready(self, e):
         """Enable the confirm button if both files have been selected."""
         if (".zip" in self.selected_image.value) and (
             ".img" in self.selected_recovery.value
         ):
-            if not image_recovery_works_with_device(
-                device_code=self.state.config.metadata.get("devicecode"),
-                image_path=self.state.image_path,
-                recovery_path=self.state.recovery_path,
+            device_code = self.state.config.metadata.get("devicecode")
+            if not (image_works_with_device(device_code=device_code, image_path=self.state.image_path)
+                and recovery_works_with_device(device_code=device_code, recovery_path=self.state.recovery_path)
             ):
                 # if image and recovery work for device allow to move on, otherwise display message
                 logger.error(
@@ -261,7 +277,7 @@ def enable_button_if_ready(self, e):
                 self.info_field.controls = [
                     Text(
                         "Image and/or recovery don't work with the device. Make sure you use a TWRP-based recovery.",
-                        color=colors.RED,
+                        color=colors.RED, weight="bold",
                     )
                 ]
                 self.right_view.update()