Enable pyinstaller build on Ubuntu

Author: tsterbak

Makefile

@@ -7,3 +7,6 @@ app:
 
 build-app:
 	poetry run pyinstaller openandroidinstaller/openandroidinstaller.py --noconsole --noconfirm --onefile --icon "/assets/favicon.ico" --add-data "openandroidinstaller/assets:assets"
+
+clean-build:
+	rm -rf build/ dist/

openandroidinstaller/__init__.py

@@ -21,7 +21,7 @@ steps:
     content: "Return to the previous menu and tap 'Advanced Wipe', then select the 'Cache' and 'System' partitions and then 'Swipe to Wipe'."
   - title: "Flash LineageOS"
     type: confirm_button
-    content: "On the device, go back and select “Advanced”, “ADB Sideload”, then swipe to begin sideload. Then confirm here"
+    content: "Now connect the phone to the computer again with the USB-cable. On the device, go back and select “Advanced”, “ADB Sideload”, then swipe to begin sideload. Then confirm here"
   - title: "Flash LineageOS"
     type: call_button
     content: "Flash lineageOS image. Don't remove the USB-Cable!"

openandroidinstaller/assets/configs/Samsung Galaxy A3 2017.yaml

@@ -1,7 +1,8 @@
 """Class to load config files for the install procedure."""
-import yaml
 from typing import List
 
+import yaml
+
 
 class Step:
     def __init__(

openandroidinstaller/installer_config.py

@@ -1,32 +1,34 @@
-import chunk
+from os import path
+from functools import partial
+from subprocess import STDOUT, CalledProcessError, call, check_output
 from time import sleep
+from typing import List
+
 import flet
 from flet import (
-    Divider,
     AppBar,
-    ElevatedButton,
-    Page,
-    Text,
-    View,
-    Row,
-    ProgressRing,
+    Banner,
     Column,
+    Divider,
+    ElevatedButton,
     FilePicker,
     FilePickerResultEvent,
-    icons,
+    Icon,
+    Page,
     ProgressBar,
-    Banner,
-    colors,
+    ProgressRing,
+    Row,
+    Text,
     TextButton,
-    Icon,
     TextField,
+    View,
+    colors,
+    icons,
 )
-from typing import List
-from subprocess import check_output, STDOUT, call, CalledProcessError
-from functools import partial
-
 from installer_config import InstallerConfig
 
+# CONFIG_PATH = "openandroidinstaller/assets/configs/"
+CONFIG_PATH = path.abspath(path.join(path.dirname(__file__), "assets/configs/"))
 
 recovery_path = None
 image_path = None
@@ -53,7 +55,7 @@ def confirm(e):
         view_num = int(page.views[-1].route) + 1
         global num_views
         if num_views:
-            pb.value = view_num / num_views
+            pb.value = view_num / (num_views - 1)
         page.views.clear()
         page.views.append(views[view_num])
         page.update()
@@ -63,7 +65,6 @@ def close_banner(e):
         page.update()
 
     def search_devices(e):
-        config_path = "openandroidinstaller/assets/configs/"
         try:
             # read device properties
             output = check_output(
@@ -83,7 +84,9 @@ def search_devices(e):
             ).decode()
             page.views[-1].controls.append(Text(f"Detected: {output}"))
             # load config from file
-            config = InstallerConfig.from_file(config_path + output.strip() + ".yaml")
+            config = InstallerConfig.from_file(
+                CONFIG_PATH + "/" + output.strip() + ".yaml"
+            )
             page.views[-1].controls.append(Text(f"Installer configuration found."))
             page.views[-1].controls.append(
                 ElevatedButton(

openandroidinstaller/openandroidinstaller.py

@@ -14,6 +14,7 @@ ruff = "^0.0.25"
 pyinstaller = "^5.3"
 Pillow = "^9.2.0"
 PyYAML = "^6.0"
+isort = "^5.10.1"
 
 [tool.poetry.dev-dependencies]
 

poetry.lock

@@ -1,7 +1,7 @@
 """Script to check if a given lineageOS image works for a connected device."""
 from os import device_encoding
+from subprocess import STDOUT, check_output
 from typing import Dict
-from subprocess import check_output, STDOUT
 
 
 def get_device_info() -> Dict[str, str]:

pyproject.toml

@@ -1,5 +1,5 @@
 """Check if adb works and print the version."""
-from subprocess import check_output, STDOUT
+from subprocess import STDOUT, check_output
 
 
 def check_adb_version():

scripts/check-image-for-device.py

@@ -5,9 +5,10 @@
 Example usage:
     poetry run python scripts/lineageos-on-galaxy-a3.py --recovery images/samsung-galaxy-a3/twrp-3.6.2_9-0-a3y17lte.img --image images/samsung-galaxy-a3/lineage-16.0-20190908-UNOFFICIAL-a3y17lte.zip
 """
-import click
-from time import sleep
 from subprocess import call
+from time import sleep
+
+import click
 
 
 @click.command()