improve logging, remove unused code

Signed-off-by: Zen <[email protected]>

Author: desultory

src/ugrd/initramfs_dict.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 
 from tomllib import load, TOMLDecodeError
 from pathlib import Path
@@ -133,7 +133,6 @@ def _process_custom_parameters(self, parameter_name: str, parameter_type: type)
         Sets the initial value of the parameter based on the type.
         """
         from pycpio import PyCPIO
-        from .initramfs_generator import InitramfsGenerator  # import here for eval'ing
 
         self['custom_parameters'][parameter_name] = eval(parameter_type)
         self.logger.debug("Registered custom parameter '%s' with type: %s" % (parameter_name, parameter_type))

src/ugrd/initramfs_generator.py

@@ -10,7 +10,7 @@
 @loggify
 class InitramfsGenerator(GeneratorHelpers):
     def __init__(self, config='/etc/ugrd/config.toml', *args, **kwargs):
-        self.config_dict = InitramfsConfigDict(NO_BASE=kwargs.pop('NO_BASE', False), logger=self.logger)
+        self.config_dict = InitramfsConfigDict(NO_BASE=kwargs.pop('NO_BASE', False), logger=self.logger, _log_init=False)
 
         # Used for functions that are added to the bash source file
         self.included_functions = {}
@@ -71,8 +71,10 @@ def __getattr__(self, item):
 
     def build(self) -> None:
         """ Builds the initramfs image. """
+        from importlib.metadata import version
+        self._log_run(f"Running ugrd v{version('ugrd')}")
         self.run_build()
-        self.config_dict.validate()
+        self.config_dict.validate()  # Validate the config after the build tasks have been run
 
         self.generate_init()
         self.pack_build()
@@ -201,12 +203,14 @@ def generate_init(self) -> None:
 
     def run_build(self) -> None:
         """ Runs all build tasks. """
+        self._log_run("Running build tasks")
         for task in self.build_tasks:
             self.logger.debug("Running build task: %s" % task)
             self.run_hook(task, force_exclude=True)
 
     def pack_build(self) -> None:
         """ Packs the initramfs based on self['imports']['pack']."""
+        self._log_run("Packing build")
         if self['imports'].get('pack'):
             self.run_hook('pack')
         else:
@@ -224,8 +228,8 @@ def run_init_hook(self, level: str) -> list[str]:
 
     def run_checks(self) -> None:
         """ Runs checks if defined in self['imports']['checks']. """
+        self._log_run("Running checks")
         if check_output := self.run_hook('checks'):
-            self.logger.info("Completed checks.")
             for check in check_output:
                 self.logger.debug(check)
         else:
@@ -234,10 +238,14 @@ def run_checks(self) -> None:
     def run_tests(self) -> None:
         """ Runs tests if defined in self['imports']['tests']. """
         if test_output := self.run_hook('tests'):
+            self._log_run("Running tests")
             self.logger.info("Completed tests:\n%s", test_output)
         else:
             self.logger.debug("No tests executed.")
 
+    def _log_run(self, logline) -> None:
+        self.logger.info(f"== | {logline}")
+
     def __str__(self) -> str:
         return str(self.config_dict)