fix: update containerized bridge

Author: seppzer0

builder/core/assets_collector.py

@@ -1,7 +1,7 @@
 import os
 import sys
 import logging
-from typing import Literal
+from typing import Literal, Optional
 from pydantic import BaseModel
 
 from builder.tools import banner, fileoperations as fo, cleaning as cm
@@ -18,14 +18,14 @@ class AssetsCollector(BaseModel, IAssetsCollector):
 
     :param str codename: Device codename.
     :param str base: Kernel source base.
-    :param Literal["full","minimal"] chroot: Chroot type.
+    :param Optional[Literal["full","minimal"]]=None chroot: Chroot type.
     :param bool rom_only: Flag indicating ROM-only asset collection.
     :param bool ksu: Flag indicating KernelSU support.
     """
 
     codename: str
     base: str
-    chroot: Literal["full", "minimal"]
+    chroot: Optional[Literal["full", "minimal"]] = None
     clean_assets: bool
     rom_only: bool
     ksu: bool

builder/utils/bridge.py

@@ -9,6 +9,7 @@
 import logging
 import argparse
 
+from builder.core import KernelBuilder, AssetsCollector
 from builder.tools import Logger
 from builder.managers import ResourceManager
 from builder.commands import KernelCommand, AssetsCommand, BundleCommand
@@ -99,38 +100,65 @@ def parse_args() -> argparse.Namespace:
 
 
 def main(args: argparse.Namespace) -> None:
+
     match args.command:
 
         case "kernel":
-            kc = KernelCommand(
+            kernel_builder = KernelBuilder(
                 codename = args.codename,
                 base = args.base,
                 lkv = args.lkv,
                 clean_kernel = args.clean_kernel,
                 ksu = args.ksu,
                 defconfig = args.defconfig,
+                rmanager = ResourceManager(
+                    codename = args.codename,
+                    lkv = args.lkv,
+                    base = args.base
+                )
             )
+            kc = KernelCommand(kernel_builder=kernel_builder)
             kc.execute()
 
         case "assets":
-            ac = AssetsCommand(
+            assets_collector = AssetsCollector(
                 codename = args.codename,
                 base = args.base,
                 chroot = args.chroot,
                 clean_assets = args.clean_assets,
                 rom_only = args.rom_only,
                 ksu = args.ksu,
             )
+            ac = AssetsCommand(assets_collector=assets_collector)
             ac.execute()
 
         case "bundle":
-            bc = BundleCommand(
+            kernel_builder = KernelBuilder(
                 codename = args.codename,
                 base = args.base,
                 lkv = args.lkv,
-                package_type = args.package_type,
+                clean_kernel = args.clean_kernel,
                 ksu = args.ksu,
                 defconfig = args.defconfig,
+                rmanager = ResourceManager(
+                    codename = args.codename,
+                    lkv = args.lkv,
+                    base = args.base
+                )
+            )
+            assets_collector = AssetsCollector(
+                codename = args.codename,
+                base = args.base,
+                chroot = args.chroot,
+                clean_assets = args.clean_assets,
+                rom_only = args.rom_only,
+                ksu = args.ksu,
+            )
+            bc = BundleCommand(
+                kernel_builder = kernel_builder,
+                assets_collector = assets_collector,
+                package_type = args.package_type,
+                base = args.base
             )
             bc.execute()