Fix the bug with the progress bar percentages (#256)

Author: tsterbak

openandroidinstaller/views/install_addons_view.py

@@ -203,6 +203,8 @@ def run_install_addons(self, e):
             self.error_text.value = "Installation failed! Try again or make sure everything is setup correctly."
         else:
             sleep(4)  # wait to make sure everything is fine
+            self.progress_indicator.set_progress_bar(100)
+            self.progress_indicator.update()
             logger.success("Installation process was successful. Allow to continue.")
             # enable the confirm button and disable the call button
             self.confirm_button.disabled = False

openandroidinstaller/views/install_view.py

@@ -210,6 +210,8 @@ def run_install(self, e):
             self.error_text.value = "Installation failed! Try again or make sure everything is setup correctly."
         else:
             sleep(5)  # wait to make sure everything is fine
+            self.progress_indicator.set_progress_bar(100)
+            self.progress_indicator.update()
             logger.success("Installation process was successful. Allow to continue.")
             # enable the confirm button and disable the call button
             self.confirm_button.disabled = False

openandroidinstaller/views/start_view.py

@@ -104,9 +104,7 @@ def check_bootloader_unlocked(e):
                 self.state.steps = []
             else:
                 logger.info("Enabled unlocking the bootloader again.")
-                self.state.steps = copy.deepcopy(
-                    self.state.config.unlock_bootloader
-                ) 
+                self.state.steps = copy.deepcopy(self.state.config.unlock_bootloader)
             # if the recovery is already flashed, skip flashing it again
             if self.recovery_switch.value == False:
                 self.state.steps += copy.deepcopy(self.state.config.boot_recovery)
@@ -122,12 +120,10 @@ def check_bootloader_unlocked(e):
         # toggleswitch to allow skipping flashing recovery
         def check_recovery_already_flashed(e):
             """Enable skipping flashing recovery if selected."""
-            
+
             # manage the bootloader unlocking switch
             if self.bootloader_switch.value == False:
-                self.state.steps = copy.deepcopy(
-                    self.state.config.unlock_bootloader
-                )
+                self.state.steps = copy.deepcopy(self.state.config.unlock_bootloader)
             else:
                 self.state.steps = []
 
@@ -140,7 +136,7 @@ def check_recovery_already_flashed(e):
         self.recovery_switch = Switch(
             label="Custom recovery is already flashed.",
             on_change=check_recovery_already_flashed,
-            disabled=False,
+            disabled=True,
             inactive_thumb_color=colors.YELLOW,
             active_color=colors.GREEN,
         )
@@ -283,6 +279,7 @@ def search_devices_clicked(self, e):
             if device_name:
                 self.continue_button.disabled = False
                 self.bootloader_switch.disabled = False
+                self.recovery_switch.disabled = False
                 # overwrite the text field with the real name from the config
                 self.device_name.value = (
                     f"{device_name} (code: {self.state.config.device_code})"

openandroidinstaller/widgets.py

@@ -114,6 +114,20 @@ def display_progress_bar(self, line: str):
         """Display and update the progress bar for the given line."""
         percentage_done = None
         result = None
+        # create the progress bar
+        if self.progress_bar == None:
+            self.progress_bar = ProgressBar(
+                value=1 / 100,
+                width=500,
+                bar_height=32,
+                color="#00d886",
+                bgcolor="#eeeeee",
+            )
+            # text to display the percentage
+            self.percentage_text = Text("1%")
+            self._container.content.controls.append(
+                Row([self.percentage_text, self.progress_bar])
+            )
         # get the progress numbers from the output lines
         if (type(line) == str) and line.strip():
             result = re.search(
@@ -122,23 +136,29 @@ def display_progress_bar(self, line: str):
             )
         if result:
             if result.group(2):
-                percentage_done = 100
+                percentage_done = 99
             elif result.group(1):
                 percentage_done = int(result.group(1))
+                if percentage_done == 0:
+                    percentage_done = 1
+                elif percentage_done == 100:
+                    percentage_done = 99
 
-            # create the progress bar on first occurrence
-            if percentage_done == 0:
-                self.progress_bar = ProgressBar(
-                    width=500, bar_height=32, color="#00d886", bgcolor="#eeeeee"
-                )
-                self.percentage_text = Text(f"{percentage_done}%")
-                self._container.content.controls.append(
-                    Row([self.percentage_text, self.progress_bar])
-                )
             # update the progress bar
-            if self.progress_bar:
-                self.progress_bar.value = percentage_done / 100
-                self.percentage_text.value = f"{percentage_done}%"
+            self.set_progress_bar(percentage_done)
+
+    def set_progress_bar(self, percentage_done: int):
+        """Set the progress bar to the given percentage.
+
+        Args:
+            percentage_done (int): Percentage of the progress bar to be filled.
+        """
+        assert (
+            percentage_done >= 0 and percentage_done <= 100
+        ), "Percentage must be between 0 and 100"
+        if self.progress_bar:
+            self.progress_bar.value = percentage_done / 100
+            self.percentage_text.value = f"{percentage_done}%"
 
     def display_progress_ring(
         self,

tests/test_progress_bar.py

@@ -30,13 +30,13 @@ def test_init():
 def test_update_progress_bar():
     """Test if the progress bar is updated properly based on lines."""
     progress_indicator = ProgressIndicator(expand=True)
-    build_indicator = progress_indicator.build()
+    progress_indicator.build()
 
     # test if other line is fine
     progress_indicator.display_progress_bar(
         line="Failed to mount '/data' (Device or resource busy)"
     )
-    assert not progress_indicator.progress_bar
+    assert progress_indicator.progress_bar
 
     # test if percentages are parsed correctly and update is performed
     for percentage in range(0, 47):
@@ -46,4 +46,4 @@ def test_update_progress_bar():
 
     # test if the finishing print is detected and updated correctly.
     progress_indicator.display_progress_bar(line="Total xfer: 1.00x\n")
-    assert progress_indicator.progress_bar.value == 1.0
+    assert progress_indicator.progress_bar.value == 0.99