Merge pull request #8 from atumm-ra/refactor-bl

Refactor bootloader
atumm-ra · Sep 7, 2023 · 7b6f862 · 7b6f862
2 parents c3bf24f + f1e3c00
commit 7b6f862
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/buti/__init__.py b/buti/__init__.py
diff --git a/buti/core.py b/buti/core.py
@@ -63,9 +63,17 @@ class Bootloader:
     see: examples/
     """
 
-    def __init__(self, buti_store: Optional[ButiStore] = None) -> None:
+    _components: Dict[str, BootableComponent] = {}
+
+    def __init__(
+        self,
+        components: Optional[List[BootableComponent]] = None,
+        buti_store: Optional[ButiStore] = None,
+    ) -> None:
+        if components is None:
+            components = []
         self.buti_store = buti_store if buti_store is not None else ButiStore()
-        self._components: Dict[str, BootableComponent] = {}
+        self.add_components(components)
 
     def add_component(self, component: BootableComponent) -> None:
         self._components[component.__class__.__name__] = component
@@ -105,9 +113,17 @@ class AsyncBootloader:
     Same as Bootloader, see above
     """
 
-    def __init__(self, buti_store: Optional[ButiStore] = None) -> None:
+    _components: Dict[str, AsyncBootableComponent] = {}
+
+    def __init__(
+        self,
+        components: Optional[List[AsyncBootableComponent]] = None,
+        buti_store: Optional[ButiStore] = None,
+    ) -> None:
+        if components is None:
+            components = []
         self.buti_store = buti_store if buti_store is not None else ButiStore()
-        self._components: Dict[str, AsyncBootableComponent] = {}
+        self.add_components(components)
 
     def add_component(self, component: AsyncBootableComponent) -> None:
         self._components[component.__class__.__name__] = component

diff --git a/docs/images/buti-overview.png b/docs/images/buti-overview.png
diff --git a/examples/fastapi_beanie/.env.dist b/examples/fastapi_beanie/.env.dist
diff --git a/examples/fastapi_beanie/components/__init__.py b/examples/fastapi_beanie/components/__init__.py
diff --git a/examples/fastapi_beanie/components/beanie.py b/examples/fastapi_beanie/components/beanie.py
diff --git a/examples/fastapi_beanie/components/config.py b/examples/fastapi_beanie/components/config.py
diff --git a/examples/fastapi_beanie/components/fastapi.py b/examples/fastapi_beanie/components/fastapi.py
diff --git a/examples/fastapi_beanie/ids.py b/examples/fastapi_beanie/ids.py
diff --git a/examples/fastapi_beanie/main.py b/examples/fastapi_beanie/main.py
diff --git a/pdm.lock b/pdm.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/scripts/pre-commit b/scripts/pre-commit
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/conftest.py b/tests/conftest.py
diff --git a/tests/test_async_bootloader.py b/tests/test_async_bootloader.py
diff --git a/tests/test_bootloader.py b/tests/test_bootloader.py
@@ -27,6 +27,12 @@ def test_add_components(self):
         self.assertTrue(self.bootloader.has_component(components[0]))
         self.assertTrue(self.bootloader.has_component(components[1]))
 
+    def test_add_components_constructor(self):
+        components = [MockComponent1(), MockComponent2()]
+        bootloader = Bootloader(components)
+        self.assertTrue(bootloader.has_component(components[0]))
+        self.assertTrue(bootloader.has_component(components[1]))
+
     def test_boot(self):
         component = MockComponent1()
         component.boot = Mock()

diff --git a/tests/test_store.py b/tests/test_store.py