From 6c03e43df94751275dc49c13eb52b340d67da13c Mon Sep 17 00:00:00 2001 From: actionless Date: Tue, 14 Jan 2025 13:39:37 +0100 Subject: [PATCH] refactor(config): common methods for writing errors/warnings --- pikaur/config.py | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pikaur/config.py b/pikaur/config.py index 5ac03e53..f6aa2a2d 100644 --- a/pikaur/config.py +++ b/pikaur/config.py @@ -55,7 +55,21 @@ class ConfigValueType(TypedDict): def _err_write(message: str) -> None: - sys.stderr.write(f"{message}\n") + sys.stderr.write(" ".join([ + DECORATION, + translate("error:"), + message, + "\n", + ])) + + +def _warn_write(message: str) -> None: + sys.stderr.write(" ".join([ + DECORATION, + translate("warning:"), + message, + "\n", + ])) class IntOrBoolSingleton(int): @@ -771,9 +785,7 @@ def _migrate_deprecated_config_key( old_value_was_removed = True if old_value_was_migrated or old_value_was_removed: - _err_write(" ".join([ - DECORATION, - translate("warning:"), + _warn_write(" ".join([ translate( 'Migrating [{}]{}="{}" config option to [{}]{}="{}"...', ).format( @@ -801,9 +813,7 @@ def _migrate_deprecated_config_value( new_default_value = option_schema["default"] cls._config[section_name][option_name] = new_default_value ConfigSchema()[section_name][option_name]["migrated"] = True - _err_write(" ".join([ - DECORATION, - translate("warning:"), + _warn_write(" ".join([ translate( 'Migrating [{}]{}="{}" config option to ="{}"...', ).format( @@ -843,9 +853,7 @@ def _handle_warning( except (KeyError, configparser.NoSectionError): return if current_value in option_schema["warning"]["when_value"]: - _err_write("\n".join([ - "", - translate("warning:"), + _warn_write("\n".join([ f" [{section_name}]{option_name} = {current_value}", option_schema["warning"]["message"], "\n",