From d37c1c0985ed6f584e99ad895587b0e96179ae5a Mon Sep 17 00:00:00 2001
From: Tobias Sterbak <sterbak-it@outlook.com>
Date: Wed, 8 Feb 2023 21:56:37 +0000
Subject: [PATCH] Fix configs

---
 .../assets/configs/cheeseburger.yaml                 | 10 +---------
 openandroidinstaller/assets/configs/dumpling.yaml    | 10 +---------
 openandroidinstaller/assets/configs/griffin.yaml     | 10 +---------
 openandroidinstaller/views/addon_view.py             | 12 +++++++-----
 openandroidinstaller/views/step_view.py              |  5 ++++-
 5 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/openandroidinstaller/assets/configs/cheeseburger.yaml b/openandroidinstaller/assets/configs/cheeseburger.yaml
index f162ed98..8879d60b 100644
--- a/openandroidinstaller/assets/configs/cheeseburger.yaml
+++ b/openandroidinstaller/assets/configs/cheeseburger.yaml
@@ -31,12 +31,4 @@ steps:
       command: adb_reboot_bootloader
     - type: call_button
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_flash_recovery
-  install_os:
-    - type: call_button
-      content: >
-        In the next steps, you finally flash the selected OS image.
-        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
+      command: fastboot_flash_recovery
\ No newline at end of file
diff --git a/openandroidinstaller/assets/configs/dumpling.yaml b/openandroidinstaller/assets/configs/dumpling.yaml
index c52e87df..b67ce02c 100644
--- a/openandroidinstaller/assets/configs/dumpling.yaml
+++ b/openandroidinstaller/assets/configs/dumpling.yaml
@@ -31,12 +31,4 @@ steps:
       command: adb_reboot_bootloader
     - type: call_button
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_flash_recovery
-  install_os:
-    - type: call_button
-      content: >
-        In the next steps, you finally flash the selected OS image.
-        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
+      command: fastboot_flash_recovery
\ No newline at end of file
diff --git a/openandroidinstaller/assets/configs/griffin.yaml b/openandroidinstaller/assets/configs/griffin.yaml
index 1f321c9a..36d18192 100644
--- a/openandroidinstaller/assets/configs/griffin.yaml
+++ b/openandroidinstaller/assets/configs/griffin.yaml
@@ -43,12 +43,4 @@ steps:
       command: adb_reboot_bootloader
     - type: call_button
       content: Flash a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
-      command: fastboot_flash_recovery
-  install_os:
-    - type: call_button
-      content: >
-        In this last step, you finally flash the selected OS image.
-        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
+      command: fastboot_flash_recovery
\ No newline at end of file
diff --git a/openandroidinstaller/views/addon_view.py b/openandroidinstaller/views/addon_view.py
index 2de88587..d9d89333 100644
--- a/openandroidinstaller/views/addon_view.py
+++ b/openandroidinstaller/views/addon_view.py
@@ -140,7 +140,9 @@ def build(self):
                             ),
                         ]
                     ),
-                    Text("Here you can find instructions on how to download the right Google apps for your device."),
+                    Text(
+                        "Here you can find instructions on how to download the right Google apps for your device."
+                    ),
                     Row(
                         [
                             ElevatedButton(
@@ -174,10 +176,10 @@ def build(self):
         self.right_view.controls.extend(
             [
                 Text("Select addons:", style="titleSmall"),
-                #Markdown(
-                    #f"""
-#The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
-#                ),
+                # Markdown(
+                # f"""
+                # The image file should look something like `lineage-19.1-20221101-nightly-{self.state.config.metadata.get('devicecode')}-signed.zip`."""
+                #                ),
                 Row(
                     [
                         FilledButton(
diff --git a/openandroidinstaller/views/step_view.py b/openandroidinstaller/views/step_view.py
index b3c334c2..db830c6c 100644
--- a/openandroidinstaller/views/step_view.py
+++ b/openandroidinstaller/views/step_view.py
@@ -335,7 +335,10 @@ def display_progress_bar(self, line: str):
         result = None
         # get the progress numbers from the output lines
         if (type(line) == str) and line.strip():
-            result = re.search(r"\(\~(\d{1,3})\%\)|(Total xfer:|adb: failed to read command: Success)", line.strip())
+            result = re.search(
+                r"\(\~(\d{1,3})\%\)|(Total xfer:|adb: failed to read command: Success)",
+                line.strip(),
+            )
         if result:
             if result.group(2):
                 percentage_done = 100