Format and lint

Author: tsterbak

openandroidinstaller/openandroidinstaller.py

@@ -38,7 +38,14 @@
 from loguru import logger
 
 from app_state import AppState
-from views import SelectFilesView, StepView, SuccessView, StartView, RequirementsView, WelcomeView
+from views import (
+    SelectFilesView,
+    StepView,
+    SuccessView,
+    StartView,
+    RequirementsView,
+    WelcomeView,
+)
 from tooling import run_command
 
 # where to write the logs
@@ -92,7 +99,12 @@ def __init__(self):
             state=self.state,
         )
         # ordered to allow for pop
-        self.default_views = [select_files_view, requirements_view, start_view, welcome_view]
+        self.default_views = [
+            select_files_view,
+            requirements_view,
+            start_view,
+            welcome_view,
+        ]
         # create the final success view
         self.final_view = SuccessView(state=self.state)
 

openandroidinstaller/utils.py

@@ -39,9 +39,7 @@ def get_download_link(devicecode: str) -> Optional[str]:
         return
 
 
-def image_works_with_device(
-    device_code: str, image_path: str
-) -> bool:
+def image_works_with_device(device_code: str, image_path: str) -> bool:
     """Determine if an image works for the given device."""
     with zipfile.ZipFile(image_path) as image_zip:
         with image_zip.open(
@@ -51,17 +49,17 @@ def image_works_with_device(
             supported_devices = str(metadata[-1]).split("=")[-1][:-3].split(",")
             logger.info(f"Image works with device: {supported_devices}")
 
-            if (device_code in supported_devices):
+            if device_code in supported_devices:
                 logger.success("Device supported by the selected image.")
                 return True
             else:
-                logger.error(f"Image file {image_path.split('/')[-1]} is not supported.")
+                logger.error(
+                    f"Image file {image_path.split('/')[-1]} is not supported."
+                )
                 return False
 
 
-def recovery_works_with_device(
-    device_code: str, recovery_path: str
-) -> bool:
+def recovery_works_with_device(device_code: str, recovery_path: str) -> bool:
     """Determine if a recovery works for the given device.
 
     BEWARE: THE RECOVERY PART IS STILL VERY BASIC!
@@ -72,4 +70,4 @@ def recovery_works_with_device(
         return True
     else:
         logger.error(f"Recovery file {recovery_file_name} is not supported.")
-        return False
+        return False

openandroidinstaller/views/requirements_view.py

@@ -29,7 +29,6 @@
 )
 
 from views import BaseView
-from components import ConfirmButton
 from app_state import AppState
 from widgets import get_title
 
@@ -57,7 +56,10 @@ def build(self):
         # build up the main view
         self.right_view.controls.extend(
             [
-                get_title("Check the Requirements", step_indicator_img="steps-header-requirements.png"),
+                get_title(
+                    "Check the Requirements",
+                    step_indicator_img="steps-header-requirements.png",
+                ),
                 Text(
                     "Before continuing you need to check some requirements to progress. Please read the instructions and check the boxes if everything is fine."
                 ),

openandroidinstaller/views/select_view.py

@@ -38,11 +38,7 @@
 from views import BaseView
 from app_state import AppState
 from widgets import get_title, confirm_button
-from utils import (
-    get_download_link,
-    image_works_with_device,
-    recovery_works_with_device
-)
+from utils import get_download_link, image_works_with_device, recovery_works_with_device
 
 
 class SelectFilesView(BaseView):
@@ -60,7 +56,7 @@ def build(self):
             modal=True,
             title=Text("What is an OS image and recovery and why do I need it?"),
             content=Markdown(
-"""## OS image or ROM
+                """## OS image or ROM
 An operating system (OS) is system software that manages computer hardware,
 software resources, and provides common services for computer programs. 
 Popular, custom operating systems for mobile devices based on Android are 
@@ -117,16 +113,20 @@ def build(self):
             icon_color=colors.DEEP_ORANGE_500,
             tooltip="Get more details on custom operating system images and recoveries.",
         )
-        #info_button = IconButton(
+        # info_button = IconButton(
         #    icon=icons.HELP_OUTLINE_OUTLINED,
         #    icon_color=colors.DEEP_ORANGE_500,
         #    icon_size=30,
         #    on_click=self.open_explain_images_dlg,
         #    tooltip="What is an OS image and a recovery file?",
-        #)
+        # )
         # add title and progressbar
         self.right_view.controls.append(
-            get_title("Now pick an OS image and a recovery file:", info_button=info_button, step_indicator_img="steps-header-select.png")
+            get_title(
+                "Now pick an OS image and a recovery file:",
+                info_button=info_button,
+                step_indicator_img="steps-header-select.png",
+            )
         )
         self.right_view.controls.append(self.state.progressbar)
 
@@ -195,7 +195,7 @@ def build(self):
 The recovery image should look something like `twrp-3.6.2_9-0-{self.state.config.metadata.get('devicecode')}.img`.
 
 **Note:** This tool **only supports TWRP recoveries**.""",
-                    extension_set="gitHubFlavored"
+                    extension_set="gitHubFlavored",
                 ),
                 Row(
                     [
@@ -245,7 +245,9 @@ def pick_image_result(self, e: FilePickerResultEvent):
         # check if the image works with the device and show the filename in different colors accordingly
         if e.files:
             device_code = self.state.config.metadata.get("devicecode")
-            if image_works_with_device(device_code=device_code, image_path=self.state.image_path):
+            if image_works_with_device(
+                device_code=device_code, image_path=self.state.image_path
+            ):
                 self.selected_image.color = colors.GREEN
             else:
                 self.selected_image.color = colors.RED
@@ -267,7 +269,9 @@ def pick_recovery_result(self, e: FilePickerResultEvent):
         # check if the recovery works with the device and show the filename in different colors accordingly
         if e.files:
             device_code = self.state.config.metadata.get("devicecode")
-            if recovery_works_with_device(device_code=device_code, recovery_path=self.state.recovery_path):
+            if recovery_works_with_device(
+                device_code=device_code, recovery_path=self.state.recovery_path
+            ):
                 self.selected_recovery.color = colors.GREEN
             else:
                 self.selected_recovery.color = colors.RED
@@ -280,8 +284,13 @@ def enable_button_if_ready(self, e):
             ".img" in self.selected_recovery.value
         ):
             device_code = self.state.config.metadata.get("devicecode")
-            if not (image_works_with_device(device_code=device_code, image_path=self.state.image_path)
-                and recovery_works_with_device(device_code=device_code, recovery_path=self.state.recovery_path)
+            if not (
+                image_works_with_device(
+                    device_code=device_code, image_path=self.state.image_path
+                )
+                and recovery_works_with_device(
+                    device_code=device_code, recovery_path=self.state.recovery_path
+                )
             ):
                 # if image and recovery work for device allow to move on, otherwise display message
                 logger.error(
@@ -290,7 +299,8 @@ def enable_button_if_ready(self, e):
                 self.info_field.controls = [
                     Text(
                         "Image and/or recovery don't work with the device. Make sure you use a TWRP-based recovery.",
-                        color=colors.RED, weight="bold",
+                        color=colors.RED,
+                        weight="bold",
                     )
                 ]
                 self.confirm_button.disabled = True

openandroidinstaller/views/start_view.py

@@ -22,7 +22,6 @@
     Column,
     Divider,
     ElevatedButton,
-    Image,
     OutlinedButton,
     FilledButton,
     Markdown,
@@ -35,7 +34,6 @@
 from flet.buttons import CountinuosRectangleBorder
 
 from views import BaseView
-from components import ConfirmButton
 from app_state import AppState
 from widgets import get_title
 from tooling import search_device
@@ -114,7 +112,10 @@ def check_bootloader_unlocked(e):
         # build up the main view
         self.right_view.controls.extend(
             [
-                get_title("Get the phone ready", step_indicator_img="steps-header-get-ready.png"),
+                get_title(
+                    "Get the phone ready",
+                    step_indicator_img="steps-header-get-ready.png",
+                ),
                 Markdown(
                     """
 To get started you need to 

openandroidinstaller/views/step_view.py

@@ -107,7 +107,10 @@ def check_advanced_switch(e):
             "Install OS": "steps-header-install.png",
         }
         self.right_view.controls = [
-            get_title(f"{self.step.title}", step_indicator_img=steps_indictor_img_lookup.get(self.step.title)),
+            get_title(
+                f"{self.step.title}",
+                step_indicator_img=steps_indictor_img_lookup.get(self.step.title),
+            ),
             self.state.progressbar,
             Text(f"{self.step.content}"),
         ]

openandroidinstaller/views/welcome_view.py

@@ -13,7 +13,6 @@
 # If not, see <https://www.gnu.org/licenses/>."""
 # Author: Tobias Sterbak
 
-from loguru import logger
 from typing import Callable
 
 from flet import (
@@ -75,4 +74,4 @@ def build(self):
                 ),
             ]
         )
-        return self.view
+        return self.view

openandroidinstaller/widgets.py

@@ -17,19 +17,38 @@
 from functools import partial
 from typing import Callable
 
-from flet import Container, ElevatedButton, Row, Text, alignment, icons, IconButton, Image, Column
+from flet import (
+    Container,
+    ElevatedButton,
+    Row,
+    Text,
+    alignment,
+    icons,
+    IconButton,
+    Image,
+    Column,
+)
 
 
-def get_title(title: str, info_button: IconButton=None, step_indicator_img: str=None) -> Container:
+def get_title(
+    title: str, info_button: IconButton = None, step_indicator_img: str = None
+) -> Container:
     if info_button:
         content = Row([Text(f"{title}", style="titleLarge"), info_button])
     else:
         content = Row([Text(f"{title}", style="titleLarge")])
     if step_indicator_img:
-        content = Column(controls=[
-            Image(src=f"/assets/imgs/{step_indicator_img}", fit="fitWidth", tooltip=f"Current step: {title}", width=600),
-            content
-        ])
+        content = Column(
+            controls=[
+                Image(
+                    src=f"/assets/imgs/{step_indicator_img}",
+                    fit="fitWidth",
+                    tooltip=f"Current step: {title}",
+                    width=600,
+                ),
+                content,
+            ]
+        )
     return Container(
         content=content,
         margin=0,