Show version number in app and logs

Author: tsterbak

README.md

@@ -36,7 +36,7 @@ If you wish to backup the TA partition first, you can find tutorials related to
 
 ## Usage
 
-Linux is currently the best supported platform (tested with Ubuntu 20.04 LTS). Windows and MacOS are also supported but you might experience more issues. So far there is no support for ARM-based systems.
+Linux is currently the best supported platform (tested with Ubuntu 20.04/22.04 LTS). Windows and MacOS are also supported but you might experience more issues. So far there is no support for ARM-based systems.
 
 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 potentially drivers needed for your device.

openandroidinstaller/openandroidinstaller.py

@@ -52,6 +52,8 @@
 # where to write the logs
 logger.add("openandroidinstaller.log")
 
+# VERSION number
+VERSION = "0.3.4-alpha"
 
 # detect platform
 PLATFORM = sys.platform
@@ -141,19 +143,18 @@ def configure(page: Page):
 def log_version_infos(bin_path):
     """Log the version infos of adb, fastboot and heimdall."""
     # adb
-    adbversion = [line for line in run_command("adb", ["version"], bin_path)]
-    adbversion = "\n".join(adbversion[:1])
-    logger.info(f"{adbversion}")
+    adbversion = [line for line in run_command("adb", ["version"], bin_path, enable_logging=False)]
+    logger.info(f"{adbversion[1].strip()}")
     # fastboot
-    fbversion = [line for line in run_command("fastboot", ["--version"], bin_path)]
-    logger.info(f"{fbversion[0]}")
+    fbversion = [line for line in run_command("fastboot", ["--version"], bin_path, enable_logging=False)]
+    logger.info(f"{fbversion[1].strip()}")
     # heimdall
-    hdversion = [line for line in run_command("heimdall", ["info"], bin_path)]
-    logger.info(f"Heimdall version: {hdversion[0]}")
+    hdversion = [line for line in run_command("heimdall", ["info"], bin_path, enable_logging=False)]
+    logger.info(f"Heimdall version: {hdversion[1].strip()}")
 
 
 def main(page: Page, test: bool = False, test_config: str = "sargo"):
-    logger.info(f"Running OpenAndroidInstaller on {PLATFORM}")
+    logger.info(f"Running OpenAndroidInstaller version '{VERSION}' on '{PLATFORM}'.")
     log_version_infos(bin_path=BIN_PATH)
     logger.info(100 * "-")
 
@@ -168,7 +169,7 @@ def main(page: Page, test: bool = False, test_config: str = "sargo"):
         leading_width=56,
         toolbar_height=72,
         elevation=0,
-        title=Text("OpenAndroidInstaller alpha version", style="displaySmall"),
+        title=Text(f"OpenAndroidInstaller version {VERSION}", style="displaySmall"),
         center_title=False,
         bgcolor="#00d886",
         actions=[

openandroidinstaller/tooling.py

@@ -32,7 +32,7 @@
 PLATFORM = sys.platform
 
 
-def run_command(tool: str, command: List[str], bin_path: Path) -> CompletedProcess:
+def run_command(tool: str, command: List[str], bin_path: Path, enable_logging: bool = True) -> CompletedProcess:
     """Run a command with a tool (adb, fastboot, heimdall)."""
     yield f"${' '.join([tool] + command )}"
     if tool not in ["adb", "fastboot", "heimdall"]:
@@ -45,7 +45,8 @@ def run_command(tool: str, command: List[str], bin_path: Path) -> CompletedProce
     else:
         full_command = [str(bin_path.joinpath(Path(f"{tool}")))] + command
         si = None
-    logger.info(f"Run command: {full_command}")
+    if enable_logging:
+        logger.info(f"Run command: {full_command}")
     # run the command
     with Popen(
         full_command,
@@ -56,7 +57,8 @@ def run_command(tool: str, command: List[str], bin_path: Path) -> CompletedProce
         startupinfo=si,
     ) as p:
         for line in p.stdout:
-            logger.info(line.strip())
+            if enable_logging:
+                logger.info(line.strip())
             yield line
 
     yield p.returncode == 0

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openandroidinstaller"
-version = "0.3.2-alpha"
+version = "0.3.4-alpha"
 description = "Install lineage OS in a nice and easy way."
 authors = ["Tobias Sterbak <[email protected]>"]
 license = "GPLv3"