Create basic workflow to package binaries for linux

Author: tsterbak

Makefile

@@ -6,7 +6,8 @@ app:
 	poetry run python openandroidinstaller/openandroidinstaller.py
 
 build-app:
-	poetry run pyinstaller openandroidinstaller/openandroidinstaller.py --noconsole --noconfirm --onefile --icon "/assets/favicon.ico" --add-data "openandroidinstaller/assets:assets"
+	poetry run pyinstaller openandroidinstaller/openandroidinstaller.py --noconsole --noconfirm --onefile --icon "/assets/favicon.ico" --add-data "openandroidinstaller/assets:assets" --add-binary "openandroidinstaller/bin/adb:bin/adb" --add-binary "openandroidinstaller/bin/fastboot:bin/fastboot" --add-binary "openandroidinstaller/bin/heimdall:bin/heimdall"
+
 
 clean-build:
 	rm -rf build/ dist/

openandroidinstaller/openandroidinstaller.py

@@ -52,15 +52,16 @@
 from widgets import call_button, confirm_button, get_title
 
 # Toggle to True for development purposes
-DEVELOPMENT = False 
-DEVELOPMENT_CONFIG = "Xperia Z"  # "Pixel 3a"
+DEVELOPMENT = True 
+DEVELOPMENT_CONFIG = "Samsung Galaxy A3 2017"  # "Pixel 3a"
 
 
 PLATFORM = sys.platform
 logger.info(f"Running OpenAndroidInstaller on {PLATFORM}")
 # Define asset paths
 CONFIG_PATH = Path(__file__).parent.joinpath(Path("assets/configs")).resolve()
 IMAGE_PATH = Path(__file__).parent.joinpath(Path("assets/imgs")).resolve()
+BIN_PATH = Path(__file__).parent.joinpath(Path("bin")).resolve()
 
 
 class BaseView(UserControl):
@@ -183,7 +184,7 @@ def search_devices(self, e):
             if PLATFORM in ("linux", "MacOS"):
                 output = check_output(
                     [
-                        "adb",
+                        BIN_PATH.joinpath(Path("adb")).name,
                         "shell",
                         "dumpsys",
                         "bluetooth_manager",
@@ -199,7 +200,7 @@ def search_devices(self, e):
             elif PLATFORM == "windows":
                 output = check_output(
                     [
-                        "adb",
+                        BIN_PATH.joinpath(Path("adb")).name,
                         "shell",
                         "dumpsys",
                         "bluetooth_manager",
@@ -501,6 +502,10 @@ def build(self):
         return self.view
 
     def call_to_phone(self, e, command: str):
+        # TODO: use proper windows paths
+        command = command.replace("adb", BIN_PATH.joinpath(Path("adb")).name)
+        command = command.replace("fastboot", BIN_PATH.joinpath(Path("fastboot")).name)
+
         command = command.replace("<recovery>", self.recovery_path)
         command = command.replace("<image>", self.image_path)
         command = command.replace("<inputtext>", self.inputtext.value)

openandroidinstaller/widgets.py

@@ -14,10 +14,9 @@
 # Author: Tobias Sterbak
 
 from functools import partial
-from os import path
 from typing import Callable
 
-from flet import Column, Container, ElevatedButton, Image, Row, Text, alignment, icons
+from flet import Column, Container, ElevatedButton, Row, Text, alignment, icons
 
 
 def get_title(title: str):

poetry.lock

@@ -16,6 +16,7 @@ Pillow = "^9.2.0"
 PyYAML = "^6.0"
 isort = "^5.10.1"
 loguru = "^0.6.0"
+requests = "^2.28.1"
 
 [tool.poetry.dev-dependencies]
 

pyproject.toml

@@ -0,0 +1,70 @@
+"""Basic script to get adb and fastboot.
+
+Inspired by: https://gitlab.com/ubports/installer/android-tools-bin/-/blob/master/build.js
+"""
+import requests
+from pathlib import Path
+import zipfile
+from io import BytesIO
+
+
+def download_adb_fastboot(platform: str):
+    url = f"https://dl.google.com/android/repository/platform-tools-latest-{platform}.zip"
+    # Downloading the file by sending the request to the URL
+    response = requests.get(url, allow_redirects=True)
+    # Split URL to get the file name
+    filename = url.split('/')[-1]
+ 
+    # Writing the file to the local file system
+    download_path = Path(__file__).parent.joinpath(Path("tools")).resolve()
+    file = zipfile.ZipFile(BytesIO(response.content))
+    file.extractall(download_path.name)
+    return filename 
+
+
+def download_heimdall(platform: str):
+    url = f"https://people.ubuntu.com/~neothethird/heimdall-{platform}.zip"
+    # Downloading the file by sending the request to the URL
+    response = requests.get(url, allow_redirects=True)
+    # Split URL to get the file name
+    filename = url.split('/')[-1]
+ 
+    # Writing the file to the local file system
+    download_path = Path(__file__).parent.joinpath(Path("heimdall")).resolve()
+    file = zipfile.ZipFile(BytesIO(response.content))
+    file.extractall(download_path.name)
+    return filename 
+
+
+
+def move_files_to_lib():
+    target_path = Path("openandroidinstaller/bin", exist_ok=True)
+    target_path.mkdir()
+    # move adb
+    adb_path = Path(__file__).parent.joinpath(Path("../tools/platform-tools/adb")).resolve()
+    adb_target_path = Path(__file__).parent.joinpath(Path("../openandroidinstaller/bin/adb")).resolve()
+    adb_path.rename(adb_target_path)
+    # move fastboot
+    fb_path = Path(__file__).parent.joinpath(Path("../tools/platform-tools/fastboot")).resolve()
+    fb_target_path = Path(__file__).parent.joinpath(Path("../openandroidinstaller/bin/fastboot")).resolve()
+    fb_path.rename(fb_target_path)
+    # move heimdall
+    hd_path = Path(__file__).parent.joinpath(Path("../heimdall/heimdall")).resolve()
+    hd_target_path = Path(__file__).parent.joinpath(Path("../openandroidinstaller/bin/heimdall")).resolve()
+    hd_path.rename(hd_target_path)
+    # make executable
+    adb_target_path.chmod(0o755)
+    fb_target_path.chmod(0o755)
+    hd_target_path.chmod(0o755)
+    print("Done")
+    
+
+def main():
+    filename = download_adb_fastboot(platform="linux")
+    print(filename)
+    filename = download_heimdall(platform="linux")
+    move_files_to_lib()
+
+
+if __name__ == "__main__":
+    main()