Enable terminal output in tool

Author: tsterbak

openandroidinstaller/app_state.py

@@ -45,6 +45,7 @@ def __init__(
         self.progressbar.value = 0
 
         # placeholders
+        self.advanced = False
         self.config = None
         self.image_path = None
         self.recovery_path = None

openandroidinstaller/openandroidinstaller.py

@@ -24,30 +24,19 @@
 import regex as re
 from app_state import AppState
 from flet import (
-    AlertDialog,
     AppBar,
     Banner,
-    Checkbox,
     Column,
     Container,
-    Divider,
     ElevatedButton,
-    FilePicker,
-    FilePickerResultEvent,
-    FilledButton,
     FloatingActionButton,
     Icon,
     Image,
-    Markdown,
     Page,
     ProgressBar,
-    ProgressRing,
-    Row,
     Text,
     TextButton,
-    TextField,
     UserControl,
-    VerticalDivider,
     colors,
     icons,
 )
@@ -59,7 +48,7 @@
 logger.add("openandroidinstaller.log")
 
 # Toggle to True for development purposes
-DEVELOPMENT = True
+DEVELOPMENT = False 
 DEVELOPMENT_CONFIG = "yuga"  # "a3y17lte"  # "sargo"
 
 

openandroidinstaller/tool_utils.py

@@ -16,6 +16,7 @@
 import sys
 from pathlib import Path
 from subprocess import (
+    Popen,
     PIPE,
     STDOUT,
     CalledProcessError,
@@ -34,66 +35,77 @@
 
 def run_command(tool: str, command: List[str], bin_path: Path) -> CompletedProcess:
     """Run a command with a tool (adb, fastboot, heimdall)."""
+    yield f"${' '.join([tool] + command )}"
     if tool not in ["adb", "fastboot", "heimdall"]:
         raise Exception(f"Unknown tool {tool}. Use adb, fastboot or heimdall.")
     if PLATFORM == "win32":
         full_command = [str(bin_path.joinpath(Path(f"{tool}"))) + ".exe"] + command
     else:
         full_command = [str(bin_path.joinpath(Path(f"{tool}")))] + command
-
     logger.info(f"Run command: {full_command}")
-    result = run(full_command, stdout=PIPE, stderr=PIPE, universal_newlines=True)
-    # result contains result.returncode, result.stdout, result.stderr
-    return result
+    with Popen(full_command, stdout=PIPE, stderr=STDOUT, bufsize=1, universal_newlines=True) as p:
+        for line in p.stdout:
+            logger.info(line)
+            yield line
+
+    yield p.returncode == 0
 
 
 def adb_reboot(bin_path: Path) -> bool:
     """Run adb reboot on the device and return success."""
     logger.info("Rebooting device with adb.")
-    result = run_command("adb", ["reboot"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["reboot"], bin_path):
+        yield line
+    if (type(line) == bool) and line:
         logger.info("Reboot failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def adb_reboot_bootloader(bin_path: Path) -> bool:
     """Reboot the device into bootloader and return success."""
     logger.info("Rebooting device into bootloader with adb.")
-    result = run_command("adb", ["reboot", "bootloader"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["reboot", "bootloader"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info("Reboot into bootloader failed.")
-        return False
+        yield False
+        return 
+    sleep(1)
     # check if in fastboot mode
-    result = run_command("fastboot", ["devices"], bin_path)
-    if result.returncode != 0:
-        logger.info("Reboot into bootloader failed.")
-        logger.info(result.returncode)
-        logger.info(result.stdout)
-        logger.info(result.stderr)
-        return False
-    return True
+    for line in run_command("fastboot", ["devices"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
+        logger.info("No fastboot mode detected. Reboot into bootloader failed.")
+        yield False
+    else:
+        yield True
 
 
 def adb_reboot_download(bin_path: Path) -> bool:
     """Reboot the device into download mode of samsung devices and return success."""
     logger.info("Rebooting device into download mode with adb.")
-    result = run_command("adb", ["reboot", "download"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["reboot", "download"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info("Reboot into download mode failed.")
-        return False
-    # check if in download mode with heimdall?
-    return True
+        yield False
+    else: 
+        # check if in download mode with heimdall?
+        yield True
 
 
 def adb_sideload(bin_path: Path, target: str) -> bool:
     """Sideload the target to device and return success."""
     logger.info("Rebooting device into bootloader with adb.")
-    result = run_command("adb", ["sideload", target], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["sideload", target], bin_path):
+        yield line
+    if (type(line) == bool) and line:
         logger.info(f"Sideloading {target} failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
@@ -103,109 +115,132 @@ def adb_twrp_wipe_and_install(bin_path: Path, target: str) -> bool:
     """
     logger.info("Wipe and format data with twrp, then install os image.")
     sleep(7)
-    result = run_command("adb", ["shell", "twrp", "format", "data"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["shell", "twrp", "format", "data"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info("Formatting data failed.")
-        return False
+        yield False
+        return 
+    sleep(1)
     # wipe some partitions
     for partition in ["cache", "system"]:
-        result = run_command("adb", ["shell", "twrp", "wipe", partition], bin_path)
+        for line in run_command("adb", ["shell", "twrp", "wipe", partition], bin_path):
+            yield not line
         sleep(1)
-        if result.returncode != 0:
+        if (type(line) == bool) and not line:
             logger.info(f"Wiping {partition} failed.")
-            return False
+            yield False
+            return 
     # activate sideload
     logger.info("Wiping is done, now activate sideload.")
-    result = run_command("adb", ["shell", "twrp", "sideload"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["shell", "twrp", "sideload"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info("Activating sideload failed.")
-        return False
+        yield False
+        return 
     # now flash os image
     sleep(5)
     logger.info("Sideload and install os image.")
-    result = run_command("adb", ["sideload", f"{target}"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["sideload", f"{target}"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info(f"Sideloading {target} failed.")
-        return False
+        yield False
+        return 
     # wipe some cache partitions
     sleep(5)
     for partition in ["cache", "dalvik"]:
-        result = run_command("adb", ["shell", "twrp", "wipe", partition], bin_path)
+        for line in run_command("adb", ["shell", "twrp", "wipe", partition], bin_path):
+            yield line
         sleep(1)
-        if result.returncode != 0:
+        if (type(line) == bool) and not line:
             logger.info(f"Wiping {partition} failed.")
-            return False
+            yield False
+            return 
     # finally reboot into os
     sleep(5)
     logger.info("Reboot into OS.")
-    result = run_command("adb", ["shell", "twrp", "reboot"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["shell", "twrp", "reboot"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info("Rebooting with twrp failed.")
-        return False
-
-    return True
+        yield False
+        return 
+    else:
+        yield True
 
 
 def fastboot_unlock_with_code(bin_path: Path, unlock_code: str) -> bool:
     """Unlock the device with fastboot and code given."""
     logger.info(f"Unlock the device with fastboot and code: {unlock_code}.")
-    result = run_command("fastboot", ["oem", "unlock", f"{unlock_code}"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["oem", "unlock", f"{unlock_code}"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info(f"Unlocking with code {unlock_code} failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def fastboot_unlock(bin_path: Path) -> bool:
     """Unlock the device with fastboot and without code."""
     logger.info(f"Unlock the device with fastboot.")
-    result = run_command("fastboot", ["flashing", "unlock"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["flashing", "unlock"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info(f"Unlocking failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def fastboot_oem_unlock(bin_path: Path) -> bool:
     """OEM unlock the device with fastboot and without code."""
     logger.info(f"OEM unlocking the device with fastboot.")
-    result = run_command("fastboot", ["oem", "unlock"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("adb", ["oem", "unlock"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info(f"OEM unlocking failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def fastboot_reboot(bin_path: Path) -> bool:
     """Reboot with fastboot"""
     logger.info(f"Rebooting device with fastboot.")
-    result = run_command("fastboot", ["reboot"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("fastboot", ["reboot"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info(f"Rebooting with fastboot failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def fastboot_flash_recovery(bin_path: Path, recovery: str) -> bool:
     """Temporarily, flash custom recovery with fastboot."""
     logger.info(f"Flash custom recovery with fastboot.")
-    result = run_command("fastboot", ["boot", f"{recovery}"], bin_path)
-    if result.returncode != 0:
+    for line in run_command("fastboot", ["boot", f"{recovery}"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
         logger.info(f"Flashing recovery failed.")
-        return False
-    return True
+        yield False
+    else: 
+        yield True
 
 
 def heimdall_flash_recovery(bin_path: Path, recovery: str) -> bool:
     """Temporarily, flash custom recovery with heimdall."""
     logger.info(f"Flash custom recovery with heimdall.")
-    result = run_command(
-        "heimdall", ["flash", "--no-reboot", "--RECOVERY", f"{recovery}"], bin_path
-    )
-    if result.returncode != 0:
-        logger.info(f"Flashing recovery failed.")
-        return False
-    return True
+    for line in run_command("heimdall", ["flash", "--no-reboot", "--RECOVERY", f"{recovery}"], bin_path):
+        yield line
+    if (type(line) == bool) and not line:
+        logger.info(f"Flashing recovery with heimdall failed.")
+        yield False
+    else: 
+        yield True
 
 
 def search_device(platform: str, bin_path: Path) -> Optional[str]: