Improve architecture (#34)

- Only support twrp recoveries in tool now
- major refactoring and decoupling of frontend and logic
- Enable terminal output in tool
- Improve logging

Author: tsterbak

openandroidinstaller/app_state.py

@@ -0,0 +1,72 @@
+"""This file contains a class and function to manage the app state over various steps."""
+
+# This file is part of OpenAndroidInstaller.
+# OpenAndroidInstaller is free software: you can redistribute it and/or modify it under the terms of
+# the GNU General Public License as published by the Free Software Foundation,
+# either version 3 of the License, or (at your option) any later version.
+
+# OpenAndroidInstaller is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License along with OpenAndroidInstaller.
+# If not, see <https://www.gnu.org/licenses/>."""
+# Author: Tobias Sterbak
+
+from pathlib import Path
+
+from flet import ProgressBar
+from installer_config import _load_config
+from loguru import logger
+
+
+class AppState:
+    """Container class to store the state of the application."""
+
+    def __init__(
+        self,
+        platform: str,
+        config_path: Path,
+        bin_path: Path,
+        progressbar: ProgressBar,
+        num_steps: int,
+        test: bool = False,
+        test_config: str = None,
+    ):
+        self.platform = platform
+        self.config_path = config_path
+        self.bin_path = bin_path
+        self.progressbar = progressbar
+        self.num_steps = num_steps  # keep track of the steps already taken
+        self.test = test
+        self.test_config = test_config
+
+        # initialize the progress bar at 0
+        self.progressbar.value = 0
+
+        # placeholders
+        self.advanced = False
+        self.config = None
+        self.image_path = None
+        self.recovery_path = None
+
+        # is this still needed?
+        self.steps = None
+
+    def load_config(self, device_code: str):
+        """Load the config from file to state by device code."""
+        self.config = _load_config(device_code, self.config_path)
+        if self.config:
+            self.steps = (
+                self.config.unlock_bootloader
+                + self.config.flash_recovery
+                + self.config.install_os
+            )
+            self.num_total_steps = len(self.steps)
+
+    def increment_progressbar(self):
+        """Increment the progressbar and step counter."""
+        self.progressbar.value = (self.num_steps - 1) / (
+            self.num_total_steps + 2
+        )  # don't show on the first step
+        self.num_steps += 1  # increase the step counter

openandroidinstaller/assets/configs/sargo.yaml

@@ -44,7 +44,7 @@ steps:
     - type: call_button 
       content: >
         In the next steps, you finally flash the selected OS image.
-        Connect your device with your computer with the USB-Cable.
+        Wait until the TWRP screen appears. Then run the command.
         This step will format your phone and wipe all the data. It will also remove encryption and delete all files stored 
         in the internal storage. Then the OS image will be installed. Confirm to run. This might take a while. At the end your phone will boot into the new OS.
       command: adb_twrp_wipe_and_install

openandroidinstaller/installer_config.py

@@ -15,11 +15,11 @@
 
 from pathlib import Path
 from typing import List, Optional
-import schema
-from schema import Regex, Schema, SchemaError
 
+import schema
 import yaml
 from loguru import logger
+from schema import Regex, Schema, SchemaError
 
 
 class Step:
@@ -148,8 +148,8 @@ def validate_config(config: str) -> bool:
     )
     try:
         config_schema.validate(config)
-        logger.info("Config is valid.")
+        logger.success("Config is valid.")
         return True
     except SchemaError as se:
-        logger.info(f"Config is invalid. Error {se}")
+        logger.error(f"Config is invalid. Error {se}")
         return False