From 00613096d5d9943bc06b8aa11c7df8c633feb9c4 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Wed, 4 Jan 2023 00:46:03 +0100 Subject: [PATCH] config/state: add config.runtime.colors, fill in main.py --- config/scheme.py | 1 + config/state.py | 1 + main.py | 1 + packages/pkgbuild.py | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/config/scheme.py b/config/scheme.py index 697e4a4..09ece1c 100644 --- a/config/scheme.py +++ b/config/scheme.py @@ -148,6 +148,7 @@ class RuntimeConfiguration(DataClass): arch: Optional[Arch] uid: Optional[int] progress_bars: Optional[bool] + colors: Optional[bool] class ConfigLoadState(DataClass): diff --git a/config/state.py b/config/state.py index a82a0a5..6919c3a 100644 --- a/config/state.py +++ b/config/state.py @@ -62,6 +62,7 @@ CONFIG_RUNTIME_DEFAULTS: RuntimeConfiguration = RuntimeConfiguration.fromDict({ 'arch': None, 'uid': None, 'progress_bars': None, + 'colors': None, }) diff --git a/main.py b/main.py index b8a1a94..a21d354 100755 --- a/main.py +++ b/main.py @@ -36,6 +36,7 @@ def cli( force_progress_bars: Optional[bool] = None, ): setup_logging(verbose, force_colors=force_colors) + config.runtime.colors = force_colors config.runtime.verbose = verbose config.runtime.progress_bars = force_progress_bars config.runtime.no_wrap = wrapper_override is False diff --git a/packages/pkgbuild.py b/packages/pkgbuild.py index 5f76b41..dd2e5c4 100644 --- a/packages/pkgbuild.py +++ b/packages/pkgbuild.py @@ -332,7 +332,7 @@ def parse_pkgbuild( global config if _config: config = _config - setup_logging(verbose=config.runtime.verbose, log_setup=False) # different subprocess needs log setup. + setup_logging(verbose=config.runtime.verbose, force_colors=config.runtime.colors, log_setup=False) # different subprocess needs log setup. logging.info(f"Discovering PKGBUILD for {relative_pkg_dir}") if force_refresh_srcinfo: