Simple check if the device code is in the recovery name

Author: tsterbak

openandroidinstaller/installer_config.py

@@ -43,7 +43,6 @@ def __init__(
 
 
 class InstallerConfig:
-
     def __init__(
         self,
         unlock_bootloader: List[Step],
@@ -78,7 +77,9 @@ def from_file(cls, path):
             ]
         else:
             unlock_bootloader = []
-        flash_recovery = [Step(**raw_step) for raw_step in raw_steps.get("flash_recovery", [])]
+        flash_recovery = [
+            Step(**raw_step) for raw_step in raw_steps.get("flash_recovery", [])
+        ]
         install_os = [Step(**raw_step) for raw_step in raw_steps.get("install_os", [])]
         return cls(unlock_bootloader, flash_recovery, install_os, metadata)
 
@@ -111,34 +112,38 @@ def _load_config(device_code: str, config_path: Path) -> Optional[InstallerConfi
 
 
 def validate_config(config: str) -> bool:
-    """Validate the schema of the config.""" 
+    """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"),
+        "type": Regex(
+            r"text|confirm_button|call_button|call_button_with_input|link_button_with_confirm"
+        ),
         "content": str,
-        schema.Optional("command"): Regex(r"^adb\s|^fastboot\s|^heimdall\s"), 
+        schema.Optional("command"): Regex(r"^adb\s|^fastboot\s|^heimdall\s"),
         schema.Optional("allow_skip"): bool,
         schema.Optional("img"): str,
         schema.Optional("link"): str,
     }
 
-    config_schema = Schema({
-        "metadata": {
-            "maintainer": str,
-            "devicename": str,
-            "devicecode": str,
-        },
-        "steps": {
-            "unlock_bootloader": schema.Or(None, [step_schema]),
-            "flash_recovery": [step_schema],
-            "install_os": [step_schema],
+    config_schema = Schema(
+        {
+            "metadata": {
+                "maintainer": str,
+                "devicename": str,
+                "devicecode": str,
+            },
+            "steps": {
+                "unlock_bootloader": schema.Or(None, [step_schema]),
+                "flash_recovery": [step_schema],
+                "install_os": [step_schema],
+            },
         }
-    })
+    )
     try:
         config_schema.validate(config)
         logger.info("Config is valid.")
         return True
     except SchemaError as se:
         logger.info(f"Config is invalid. Error {se}")
-        return False
+        return False

openandroidinstaller/openandroidinstaller.py

@@ -22,26 +22,52 @@
 from typing import Callable, Optional
 
 import flet
-from flet import (AlertDialog, AppBar, Banner, Checkbox, Column, Container,
-                  Divider, ElevatedButton, FilePicker, FilePickerResultEvent,
-                  FilledButton, Icon, Image, Page, ProgressBar, ProgressRing,
-                  Row, Text, TextButton, TextField, UserControl, FloatingActionButton,
-                  VerticalDivider, colors, icons)
+from flet import (
+    AlertDialog,
+    AppBar,
+    Banner,
+    Checkbox,
+    Column,
+    Container,
+    Divider,
+    ElevatedButton,
+    FilePicker,
+    FilePickerResultEvent,
+    FilledButton,
+    Icon,
+    Image,
+    Page,
+    ProgressBar,
+    ProgressRing,
+    Row,
+    Text,
+    TextButton,
+    TextField,
+    UserControl,
+    FloatingActionButton,
+    VerticalDivider,
+    colors,
+    icons,
+)
 from installer_config import InstallerConfig, Step, _load_config
 from loguru import logger
 from tool_utils import call_tool_with_command, search_device
 from utils import AppState, get_download_link, image_recovery_works_with_device
 from widgets import call_button, confirm_button, get_title, link_button
 
 # Toggle to True for development purposes
-DEVELOPMENT = True
+DEVELOPMENT = False
 DEVELOPMENT_CONFIG = "yuga"  # "a3y17lte"  # "sargo"
 
 
 PLATFORM = sys.platform
 # Define asset paths
-CONFIG_PATH = Path(__file__).parent.joinpath(Path(os.sep.join(["assets", "configs"]))).resolve()
-IMAGE_PATH = Path(__file__).parent.joinpath(Path(os.sep.join(["assets", "imgs"]))).resolve()
+CONFIG_PATH = (
+    Path(__file__).parent.joinpath(Path(os.sep.join(["assets", "configs"]))).resolve()
+)
+IMAGE_PATH = (
+    Path(__file__).parent.joinpath(Path(os.sep.join(["assets", "imgs"]))).resolve()
+)
 BIN_PATH = Path(__file__).parent.joinpath(Path("bin")).resolve()
 
 
@@ -117,7 +143,9 @@ def check_bootloader_unlocked(e):
                 self.state.num_total_steps = len(self.state.steps)
 
         self.bootloader_checkbox = Checkbox(
-            label="Bootloader is already unlocked.", on_change=check_bootloader_unlocked, disabled=True
+            label="Bootloader is already unlocked.",
+            on_change=check_bootloader_unlocked,
+            disabled=True,
         )
 
         # build up the main view
@@ -325,7 +353,9 @@ def build(self):
                 ),
                 self.selected_recovery,
                 Divider(),
-                Text("If you selected both files and they work for your device you can continue."),
+                Text(
+                    "If you selected both files and they work for your device you can continue."
+                ),
                 self.info_field,
                 Row([self.confirm_button]),
             ]
@@ -335,12 +365,20 @@ def build(self):
     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 (".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
-                ):
+                device_code=self.state.config.metadata.get("devicecode"),
+                image_path=self.state.image_path,
+                recovery_path=self.state.recovery_path,
+            ):
                 # if image and recovery work for device allow to move on, otherwise display message
-                self.info_field.controls.append(Text("Image and recovery don't work with the device. Please select different ones."))
+                self.info_field.controls.append(
+                    Text(
+                        "Image and recovery don't work with the device. Please select different ones."
+                    )
+                )
                 self.right_view.update()
                 return
             self.info_field.controls = []
@@ -612,15 +650,17 @@ def main(page: Page):
     logger.info(f"Running OpenAndroidInstaller on {PLATFORM}")
     # Configure the application base page
     page.title = "OpenAndroidInstaller"
-    page.window_height = 780 
+    page.window_height = 780
     page.window_width = int(1.77 * page.window_height)
     page.window_top = 100
     page.window_left = 120
     page.scroll = "adaptive"
     page.horizontal_alignment = "center"
 
     # header
-    image_path = Path(__file__).parent.joinpath(Path(os.sep.join(["assets", "logo-192x192.png"])))
+    image_path = Path(__file__).parent.joinpath(
+        Path(os.sep.join(["assets", "logo-192x192.png"]))
+    )
     page.appbar = AppBar(
         leading=Image(src=image_path, height=40, width=40, border_radius=40),
         leading_width=56,

openandroidinstaller/utils.py

@@ -39,16 +39,25 @@ def get_download_link(devicecode: str) -> Optional[str]:
         return
 
 
-def image_recovery_works_with_device(device_code: str, image_path: str) -> bool:
-    """Determine if an image and recovery works for the given device."""
+def image_recovery_works_with_device(
+    device_code: str, image_path: str, recovery_path: str
+) -> bool:
+    """Determine if an image and recovery works for the given device.
+
+    BEWARE: THE RECOVERY PART IS STILL VERY BASIC!
+    """
     with zipfile.ZipFile(image_path) as image_zip:
-        with image_zip.open("META-INF/com/android/metadata", mode="r") as image_metadata:
+        with image_zip.open(
+            "META-INF/com/android/metadata", mode="r"
+        ) as image_metadata:
             metadata = image_metadata.readlines()
             supported_devices = str(metadata[-1]).split("=")[-1][:-3].split(",")
             logger.info(f"Image works with device: {supported_devices}")
 
-            if device_code in supported_devices:
-                logger.info("Device supported by the image.")
+            if (device_code in supported_devices) and (
+                device_code in recovery_path.split("/")[-1]
+            ):
+                logger.info("Device supported by the image and recovery.")
                 return True
     return False
 

openandroidinstaller/widgets.py

@@ -66,4 +66,4 @@ def link_button(link: str, text: str) -> ElevatedButton:
         f"{text}",
         on_click=lambda _: webbrowser.open(link),
         expand=True,
-    )
+    )

scripts/download-tools.py

@@ -67,12 +67,16 @@ def move_files_to_lib(platform: str):
     target_path.mkdir(exist_ok=True)
     # move adb
     adb_path = (
-        Path(__file__).parent.joinpath(Path(os.sep.join(["..", "tools", "platform-tools", "adb"]))).resolve()
+        Path(__file__)
+        .parent.joinpath(Path(os.sep.join(["..", "tools", "platform-tools", "adb"])))
+        .resolve()
     )
     logger.info(adb_path)
     adb_target_path = (
         Path(__file__)
-        .parent.joinpath(Path(os.sep.join(["..", "openandroidinstaller", "bin", "adb"])))
+        .parent.joinpath(
+            Path(os.sep.join(["..", "openandroidinstaller", "bin", "adb"]))
+        )
         .resolve()
     )
     if platform == "win32":
@@ -83,23 +87,33 @@ def move_files_to_lib(platform: str):
     # move fastboot
     fb_path = (
         Path(__file__)
-        .parent.joinpath(Path(os.sep.join(["..", "tools", "platform-tools", "fastboot"])))
+        .parent.joinpath(
+            Path(os.sep.join(["..", "tools", "platform-tools", "fastboot"]))
+        )
         .resolve()
     )
     fb_target_path = (
         Path(__file__)
-        .parent.joinpath(Path(os.sep.join(["..", "openandroidinstaller", "bin", "fastboot"])))
+        .parent.joinpath(
+            Path(os.sep.join(["..", "openandroidinstaller", "bin", "fastboot"]))
+        )
         .resolve()
     )
     if platform == "win32":
         fb_path = fb_path.parents[0] / "fastboot.exe"
         fb_target_path = fb_target_path.parents[0] / "fastboot.exe"
     fb_path.rename(fb_target_path)
     # move heimdall
-    hd_path = Path(__file__).parent.joinpath(Path(os.sep.join(["..", "heimdall", "heimdall"]))).resolve()
+    hd_path = (
+        Path(__file__)
+        .parent.joinpath(Path(os.sep.join(["..", "heimdall", "heimdall"])))
+        .resolve()
+    )
     hd_target_path = (
         Path(__file__)
-        .parent.joinpath(Path(os.sep.join(["..", "openandroidinstaller", "bin", "heimdall"])))
+        .parent.joinpath(
+            Path(os.sep.join(["..", "openandroidinstaller", "bin", "heimdall"]))
+        )
         .resolve()
     )
     if platform == "win32":