refactor(config): common methods for writing errors/warnings

actionless · Jan 14, 2025 · 6c03e43 · 6c03e43
1 parent 5ed3833
commit 6c03e43
Showing 1 changed file with 18 additions and 10 deletions.
diff --git 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",