Clean up and fixes

openandroidinstaller-dev · Jan 17, 2023 · 0462a30 · 0462a30
1 parent f2ae4a6
commit 0462a30
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/openandroidinstaller/installer_config.py b/openandroidinstaller/installer_config.py
@@ -79,7 +79,8 @@ def __init__(
         self.metadata = metadata
         self.requirements = requirements
         self.device_code = metadata.get("devicecode")
-        self.alternative_device_code = self.device_code_mapping.get(
+        inverted_mapping = dict(map(reversed, self.device_code_mapping.items()))
+        self.alternative_device_code = inverted_mapping.get(
             self.device_code, self.device_code
         )
 

diff --git a/openandroidinstaller/tooling.py b/openandroidinstaller/tooling.py
@@ -303,20 +303,6 @@ def heimdall_flash_recovery(bin_path: Path, recovery: str) -> bool:
 def search_device(platform: str, bin_path: Path) -> Optional[str]:
     """Search for a connected device."""
     logger.info(f"Search devices on {platform} with {bin_path}...")
-    # map some detected device codes to their real code.
-    device_code_mapping = {
-        # Sony issues
-        "C6603": "yuga",
-        # OnePlus issues
-        "OnePlus6": "enchilada",
-        "OnePlus6T": "fajita",
-        "OnePlus7": "guacamoleb",
-        "OnePlus7Pro": "guacamole",
-        "OnePlus7T": "hotdogb",
-        "OnePlus7TPro": "hotdog",
-        "Nord": "avicii",
-        "NordN200": "dre",
-    }
     try:
         # read device properties
         if platform in ("linux", "darwin"):
@@ -348,7 +334,7 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
             raise Exception(f"Unknown platform {platform}.")
         device_code = output.split("[")[-1].strip()[:-1].strip()
         logger.info(device_code)
-        return device_code_mapping.get(device_code, device_code)
+        return device_code
     except CalledProcessError:
         logger.error("Failed to detect a device.")
         return None
diff --git a/openandroidinstaller/views/select_view.py b/openandroidinstaller/views/select_view.py
@@ -148,7 +148,7 @@ def build(self):
                                     "Download TWRP recovery",
                                     icon=icons.DOWNLOAD_OUTLINED,
                                     on_click=lambda _: webbrowser.open(
-                                        f"https://dl.twrp.me/{self.state.config.metadata.get('devicecode')}"
+                                        f"https://dl.twrp.me/{self.state.config.device_code}"
                                     ),
                                     expand=True,
                                 ),
@@ -164,7 +164,7 @@ def build(self):
                 Text("Select an OS image:", style="titleSmall"),
                 Markdown(
                     f"""
-The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
+The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.device_code}-signed.zip`."""
                 ),
                 Row(
                     [
@@ -185,7 +185,7 @@ def build(self):
                 Text("Select a TWRP recovery image:", style="titleSmall"),
                 Markdown(
                     f"""
-The recovery image should look something like `twrp-3.6.2_9-0-{self.state.config.metadata.get('devicecode')}.img`.
+The recovery image should look something like `twrp-3.7.0_12-0-{self.state.config.device_code}.img`.
 
 **Note:** This tool **only supports TWRP recoveries**.""",
                     extension_set="gitHubFlavored",

diff --git a/openandroidinstaller/views/start_view.py b/openandroidinstaller/views/start_view.py
@@ -37,6 +37,7 @@
 from app_state import AppState
 from widgets import get_title
 from tooling import search_device
+from installer_config import InstallerConfig
 
 
 class StartView(BaseView):
@@ -224,7 +225,7 @@ def search_devices(self, e):
                 self.continue_button.disabled = False
                 self.bootloader_switch.disabled = False
                 # overwrite the text field with the real name from the config
-                self.device_name.value = f"{device_name} (code: {device_code})"
+                self.device_name.value = f"{device_name} (code: {InstallerConfig.device_code_mapping.get(device_code, device_code)})"
                 self.device_name.color = colors.GREEN
             else:
                 # failed to load config