Windows build (#23)

Enable building the tool for windows.

Author: tsterbak

.github/workflows/manual-build-windows.yml

@@ -19,7 +19,7 @@ jobs:
         python-version: 3.9
     - run: pip install -r requirements.txt
     - run: python scripts/download-tools.py
-    - run: pyinstaller openandroidinstaller/openandroidinstaller.py --noconsole --noconfirm --onefile --icon "openandroidinstaller/assets/favicon.ico" --add-data "openandroidinstaller/assets;assets" --add-binary "openandroidinstaller/bin/adb.exe;bin" --add-binary "openandroidinstaller/bin/fastboot.exe;bin" --add-binary "openandroidinstaller/bin/heimdall.exe;bin"
+    - run: pyinstaller openandroidinstaller/openandroidinstaller.py --noconsole --noconfirm --onefile --icon "openandroidinstaller\assets\favicon.ico" --add-data "openandroidinstaller\assets;assets" --add-binary "openandroidinstaller\bin\adb.exe;bin" --add-binary "openandroidinstaller\bin\AdbWinApi.dll;bin" --add-binary "openandroidinstaller\bin\fastboot.exe;bin" --add-binary "openandroidinstaller\bin\heimdall.exe;bin"
     # Optionally verify that it works (provided that it does not need user interaction)
     #- run: ./dist/your-code/your-code
     - uses: actions/upload-artifact@v3

README.md

@@ -47,9 +47,10 @@ Motorola | moto g7 power | ocean | | under development
 
 ## Usage
 
-Currently, Linux (tested with Ubuntu 20.04 LTS) and MacOS are supported. 
+Linux (tested with Ubuntu 20.04 LTS), Windows and MacOS are supported. 
 
 1. Download the AppImage, .exe or appropriate executable file for your OS. You might need to change permissions to run the executable.
+    - On Windows also [install the Universal USB Drivers](https://adb.clockworkmod.com/) and other drivers needed for your device.
 2. Download the lineageOS image and the custom recovery image. A source for files can be found on https://lineageosroms.com or you can just search the web for an appropriate version for your device.
 3. Start the desktop app and follow the instructions.
 

openandroidinstaller/openandroidinstaller.py

@@ -15,8 +15,8 @@
 
 import os
 import sys
-import turtle
 import webbrowser
+import regex as re
 from pathlib import Path
 from time import sleep
 from typing import Callable, Optional
@@ -49,7 +49,7 @@
     colors,
     icons,
 )
-from installer_config import InstallerConfig, Step, _load_config
+from installer_config import 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
@@ -65,9 +65,6 @@
 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()
 
 
@@ -77,7 +74,7 @@ def __init__(self, image: str = "placeholder.png"):
         self.right_view = Column(expand=True)
         self.left_view = Column(
             width=600,
-            controls=[Image(src=IMAGE_PATH.joinpath(Path(image)))],
+            controls=[Image(src=f"/assets/imgs/{image}")],
             expand=True,
             horizontal_alignment="center",
         )
@@ -364,7 +361,6 @@ 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
         ):
@@ -658,11 +654,10 @@ def main(page: Page):
     page.horizontal_alignment = "center"
 
     # header
-    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=Image(
+            src=f"/assets/logo-192x192.png", height=40, width=40, border_radius=40
+        ),
         leading_width=56,
         toolbar_height=72,
         elevation=0,

openandroidinstaller/tool_utils.py

@@ -13,6 +13,7 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 
+import sys
 from pathlib import Path
 from subprocess import STDOUT, CalledProcessError, call, check_output
 from typing import Optional
@@ -21,11 +22,35 @@
 from loguru import logger
 
 
+PLATFORM = sys.platform
+
+
 def call_tool_with_command(command: str, bin_path: Path) -> bool:
     """Call an executable with a specific command."""
-    command = re.sub(r"^adb", str(bin_path.joinpath(Path("adb"))), command)
-    command = re.sub(r"^fastboot", str(bin_path.joinpath(Path("fastboot"))), command)
-    command = re.sub(r"^heimdall", str(bin_path.joinpath(Path("heimdall"))), command)
+    if PLATFORM == "win32":
+        command = re.sub(
+            r"^adb", re.escape(str(bin_path.joinpath(Path("adb")))) + ".exe", command
+        )
+        command = re.sub(
+            r"^fastboot",
+            re.escape(str(bin_path.joinpath(Path("fastboot.exe")))) + ".exe",
+            command,
+        )
+        command = re.sub(
+            r"^heimdall",
+            re.escape(str(bin_path.joinpath(Path("heimdall.exe")))) + ".exe",
+            command,
+        )
+    else:
+        command = re.sub(
+            r"^adb", re.escape(str(bin_path.joinpath(Path("adb")))), command
+        )
+        command = re.sub(
+            r"^fastboot", re.escape(str(bin_path.joinpath(Path("fastboot")))), command
+        )
+        command = re.sub(
+            r"^heimdall", re.escape(str(bin_path.joinpath(Path("heimdall")))), command
+        )
 
     logger.info(f"Run command: {command}")
     res = call(f"{command}", shell=True)
@@ -65,10 +90,13 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
                     "ro.product.device",
                 ],
                 stderr=STDOUT,
+                shell=True,
             ).decode()
         else:
             raise Exception(f"Unknown platform {platform}.")
-        return output.split("[")[-1].strip()[:-1].strip()
+        device_code = output.split("[")[-1].strip()[:-1].strip()
+        logger.info(device_code)
+        return device_code
     except CalledProcessError:
         logger.info(f"Did not detect a device.")
         return None