Automatic builds (#21)

Enable automated build for linux, macos and Windows.

Author: tsterbak

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

@@ -0,0 +1,28 @@
+name: Manual build workflow for windows
+
+on:
+  workflow_dispatch:
+
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['windows-latest']
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        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"
+    # Optionally verify that it works (provided that it does not need user interaction)
+    #- run: ./dist/your-code/your-code
+    - uses: actions/upload-artifact@v3
+      with:
+        name: openandroidinstaller-${{ github.sha }}-${{ matrix.os }}
+        path: dist/

.github/workflows/manual-build.yml

@@ -0,0 +1,28 @@
+name: Manual build workflow
+
+on:
+  workflow_dispatch:
+
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['ubuntu-latest', 'macos-latest']
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+      with:
+        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:bin" --add-binary "openandroidinstaller/bin/fastboot:bin" --add-binary "openandroidinstaller/bin/heimdall: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
+      with:
+        name: openandroidinstaller-${{ github.sha }}-${{ matrix.os }}
+        path: dist/

Makefile

@@ -1,8 +1,13 @@
-install:
+poetry:
 	curl -sSL https://install.python-poetry.org | python3 -
+
+install:
 	poetry install
 	poetry run python scripts/download-tools.py
 
+export:
+	poetry export -f requirements.txt --output requirements.txt
+
 test:
 	poetry run pytest tests/
 
@@ -12,6 +17,5 @@ app:
 build-app:
 	poetry run pyinstaller openandroidinstaller/openandroidinstaller.py --noconsole --noconfirm --onefile --icon "/assets/favicon.ico" --add-data "openandroidinstaller/assets:assets" --add-binary "openandroidinstaller/bin/adb:bin" --add-binary "openandroidinstaller/bin/fastboot:bin" --add-binary "openandroidinstaller/bin/heimdall:bin"
 
-
 clean-build:
 	rm -rf build/ dist/

README.md

@@ -60,7 +60,7 @@ Currently, only linux is supported.
 Currently development is only supported on Ubuntu Linux. MacOS should also work fine.
 
 1. Clone the main branch of this repository
-2. Run `make install` to install poetry to manage python and install the requirend dependencies like adb, fastboot and heimdall.
+2. Run `make poetry` and `make install` to install poetry to manage python and install the required dependencies like adb, fastboot and heimdall.
 3. Run `make app` to start the desktop app from the source.
 
 

openandroidinstaller/installer_config.py

@@ -55,7 +55,7 @@ def __init__(
 
     @classmethod
     def from_file(cls, path):
-        with open(path, "r") as stream:
+        with open(path, "r", encoding="utf-8") as stream:
             try:
                 raw_config = yaml.safe_load(stream)
                 if validate_config(raw_config):

openandroidinstaller/openandroidinstaller.py

@@ -13,6 +13,7 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 
+import os
 import sys
 import webbrowser
 from pathlib import Path
@@ -38,8 +39,8 @@
 
 PLATFORM = sys.platform
 # Define asset paths
-CONFIG_PATH = Path(__file__).parent.joinpath(Path("assets/configs")).resolve()
-IMAGE_PATH = Path(__file__).parent.joinpath(Path("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()
 
 
@@ -115,7 +116,7 @@ def check_bootloader_unlocked(e):
                 self.state.num_total_steps = len(self.state.steps)
 
         self.bootloader_checkbox = Checkbox(
-            label="Bootlaoder 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
@@ -324,7 +325,7 @@ def build(self):
 
     def enable_button_if_ready(self, e):
         """Enable the confirm button if both files have been selected."""
-        if self.selected_image.value and self.selected_recovery.value:
+        if (".zip" in self.selected_image.value) and (".img" in self.selected_recovery.value):
             self.confirm_button.disabled = False
             self.right_view.update()
         else:
@@ -456,16 +457,22 @@ def pick_image_result(self, e: FilePickerResultEvent):
         self.selected_image.value += (
             ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
         )
-        self.image_path = e.files[0].path
-        logger.info(f"Selected image from {self.image_path}")
+        if e.files:
+            self.image_path = e.files[0].path
+            logger.info(f"Selected image from {self.image_path}")
+        else:
+            logger.info("No image selected.")
         self.selected_image.update()
 
     def pick_recovery_result(self, e: FilePickerResultEvent):
         self.selected_recovery.value += (
             ", ".join(map(lambda f: f.name, e.files)) if e.files else "Cancelled!"
         )
-        self.recovery_path = e.files[0].path
-        logger.info(f"Selected recovery from {self.recovery_path}")
+        if e.files:
+            self.recovery_path = e.files[0].path
+            logger.info(f"Selected recovery from {self.recovery_path}")
+        else:
+            logger.info("No image selected.")
         self.selected_recovery.update()
 
 
@@ -587,7 +594,7 @@ def main(page: Page):
     page.horizontal_alignment = "center"
 
     # header
-    image_path = Path(__file__).parent.joinpath(Path("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/tool_utils.py

@@ -54,10 +54,10 @@ def search_device(platform: str, bin_path: Path) -> Optional[str]:
                 ],
                 stderr=STDOUT,
             ).decode()
-        elif platform == "windows":
+        elif platform in ("windows", "win32"):
             output = check_output(
                 [
-                    str(bin_path.joinpath(Path("adb"))),
+                    str(bin_path.joinpath(Path("adb.exe"))),
                     "shell",
                     "getprop",
                     "|",