Change how configs are named and how they are detected and processed

tsterbak · tsterbak · commit 9e28956d051c · 2022-09-27T18:53:57.000+02:00
diff --git a/openandroidinstaller/assets/configs/FP2.yaml b/openandroidinstaller/assets/configs/FP2.yaml
@@ -1,5 +1,6 @@
 metadata:
-  - maintainer: Tobias Sterbak (tsterbak)
+  maintainer: Tobias Sterbak (tsterbak)
+  devicename: Fairphone 2
 requirements:
 steps:
   - title: "Flash a custom recovery"
diff --git a/openandroidinstaller/assets/configs/a3y17lte.yaml b/openandroidinstaller/assets/configs/a3y17lte.yaml
@@ -1,5 +1,6 @@
 metadata:
-  - maintainer: Tobias Sterbak (tsterbak)
+  maintainer: Tobias Sterbak (tsterbak)
+  devicename: Samsung Galaxy A3 (2017)
 requirements:
   - heimdall
 steps:
diff --git a/openandroidinstaller/assets/configs/a5xelte.yaml b/openandroidinstaller/assets/configs/a5xelte.yaml
@@ -1,5 +1,6 @@
 metadata:
-  - maintainer: Tobias Sterbak (tsterbak)
+  maintainer: Tobias Sterbak (tsterbak)
+  devicename: Samsung Galaxy A5 (2016)
 requirements:
   - heimdall
 steps:
diff --git a/openandroidinstaller/assets/configs/sargo.yaml b/openandroidinstaller/assets/configs/sargo.yaml
@@ -1,5 +1,6 @@
 metadata:
-  - maintainer: Tobias Sterbak (tsterbak)
+  maintainer: Tobias Sterbak (tsterbak)
+  devicename: Pixel 3a
 requirements:
 steps:
   - title: "Unlock the bootloader"
diff --git a/openandroidinstaller/assets/configs/yuga.yaml b/openandroidinstaller/assets/configs/yuga.yaml
@@ -1,5 +1,6 @@
 metadata:
-  - maintainer: Tobias Sterbak (tsterbak)
+  maintainer: Tobias Sterbak (tsterbak)
+  devicename: Sony Xperia Z
 requirements:
 steps:
   - title: "Unlock the bootloader"
diff --git a/openandroidinstaller/installer_config.py b/openandroidinstaller/installer_config.py
@@ -37,17 +37,20 @@ def __init__(
 
 
 class InstallerConfig:
-    def __init__(self, steps: List[Step]):
+    def __init__(self, steps: List[Step], metadata: dict):
         self.steps = steps
+        self.metadata = metadata
 
     @classmethod
     def from_file(cls, path):
         with open(path, "r") as stream:
             try:
-                raw_steps = yaml.safe_load(stream)
-                raw_steps = dict(raw_steps)["steps"]
+                raw_config = yaml.safe_load(stream)
+                config = dict(raw_config)
+                raw_steps = config["steps"]
+                metadata = config["metadata"]
             except yaml.YAMLError as exc:
                 print(exc)
 
         steps = [Step(**raw_step) for raw_step in raw_steps]
-        return cls(steps)
+        return cls(steps, metadata)
diff --git a/openandroidinstaller/openandroidinstaller.py b/openandroidinstaller/openandroidinstaller.py
@@ -53,7 +53,7 @@
 
 # Toggle to True for development purposes
 DEVELOPMENT = False 
-DEVELOPMENT_CONFIG = "Samsung Galaxy A3 2017"  # "Pixel 3a"
+DEVELOPMENT_CONFIG = "a3y17lte"  # "sargo"
 
 
 PLATFORM = sys.platform
@@ -178,22 +178,20 @@ def close_developer_options_dlg(self, e):
         self.page.update()
 
     def search_devices(self, e):
+        """Search the device when the button is clicked."""
+        logger.info("Search devices...")
         try:
             # read device properties
             # TODO: This is not windows ready...
-            if PLATFORM in ("linux", "MacOS"):
+            if PLATFORM in ("linux", "darwin"):
                 output = check_output(
                     [
                         str(BIN_PATH.joinpath(Path("adb"))),
                         "shell",
-                        "dumpsys",
-                        "bluetooth_manager",
+                        "getprop",
                         "|",
                         "grep",
-                        "'name:'",
-                        "|",
-                        "cut",
-                        "-c9-",
+                        "ro.product.device"
                     ],
                     stderr=STDOUT,
                 ).decode()
@@ -202,27 +200,29 @@ def search_devices(self, e):
                     [
                         str(BIN_PATH.joinpath(Path("adb"))),
                         "shell",
-                        "dumpsys",
-                        "bluetooth_manager",
+                        "getprop",
                         "|",
                         "findstr",
-                        "'name:'",
-                        "|",
-                        "-split",
-                        "-c9-",
+                        "ro.product.device"
                     ],
                     stderr=STDOUT,
                 ).decode()
             else:
                 raise Exception(f"Unknown platform {PLATFORM}.")
 
+            output = output.split("[")[-1][:-2]
+            logger.info(f"Detected {output}")
+            # write the device code to the text shown in the box
             self.device_name.value = output.strip()
             # load config from file
             path = CONFIG_PATH.joinpath(Path(f"{output.strip()}.yaml"))
             load_config_success = self.load_config(path)
+            # display success in the application
             if load_config_success:
                 self.config_found_box.value = True
                 self.continue_button.disabled = False
+                # overwrite the text field with the real name from the config
+                self.device_name.value = f"{load_config_success} (code: {output.strip()})"
             else:
                 # show alternative configs here
                 # select a new path and load again
@@ -427,7 +427,7 @@ def load_config(self, path: str):
         try:
             self.config = InstallerConfig.from_file(path)
             self.num_total_steps = len(self.config.steps)
-            return True
+            return self.config.metadata.get("devicename", "No device name in config.")
         except FileNotFoundError:
             return False
 
