Refactor font handling per review feedback

Author: Softer

archinstall/lib/translationhandler.py

@@ -58,7 +58,7 @@ def _set_console_font(font_name: str | None) -> bool:
 		return False
 
 
-def _save_console_font() -> None:
+def save_console_font() -> None:
 	"""Save the current console font (with unicode map) and console map to temp files."""
 	try:
 		font_fd, font_path = tempfile.mkstemp(prefix='archinstall_font_')
@@ -74,7 +74,7 @@ def _save_console_font() -> None:
 		translation_handler._cmap_backup = None
 
 
-def _restore_console_font() -> None:
+def restore_console_font() -> None:
 	"""Restore console font (with unicode map) and console map from backup."""
 	if translation_handler._font_backup is None or not translation_handler._font_backup.exists():
 		return
@@ -209,6 +209,26 @@ def activate(self, language: Language, set_font: bool = True) -> None:
 		if set_font and not self._using_env_font:
 			_set_console_font(language.console_font)
 
+	def apply_console_font(self) -> None:
+		"""Apply console font from FONT env var or active language mapping.
+
+		If FONT env var is set and valid, use it and skip language mapping.
+		If FONT is set but invalid, fall back to language font.
+		If FONT is not set, use active language font.
+		"""
+		if _ENV_FONT:
+			if _set_console_font(_ENV_FONT):
+				self._using_env_font = True
+				debug(f'Console font set from FONT env var: {_ENV_FONT}')
+			else:
+				debug(f'FONT={_ENV_FONT} could not be set, falling back to language font mapping')
+				if self.active_font:
+					_set_console_font(self.active_font)
+					debug(f'Console font set from language mapping: {self.active_font}')
+		elif self.active_font:
+			_set_console_font(self.active_font)
+			debug(f'Console font set from language mapping: {self.active_font}')
+
 	def _get_locales_dir(self) -> Path:
 		"""
 		Get the locales directory path

archinstall/main.py

@@ -16,7 +16,7 @@
 from archinstall.lib.output import debug, error, info, warn
 from archinstall.lib.packages.util import check_version_upgrade
 from archinstall.lib.pacman.pacman import Pacman
-from archinstall.lib.translationhandler import _restore_console_font, _save_console_font, tr
+from archinstall.lib.translationhandler import restore_console_font, save_console_font, tr
 from archinstall.lib.utils.util import running_from_iso
 from archinstall.tui.ui.components import tui
 
@@ -95,7 +95,7 @@ def run() -> int:
 		print(tr('Archinstall requires root privileges to run. See --help for more.'))
 		return 1
 
-	_save_console_font()
+	save_console_font()
 
 	_log_sys_info()
 
@@ -161,7 +161,7 @@ def main() -> int:
 			_error_message(exc)
 			rc = 1
 
-		_restore_console_font()
+		restore_console_font()
 
 	return rc
 

archinstall/tui/ui/components.py

@@ -19,7 +19,7 @@
 from textual.widgets.selection_list import Selection
 from textual.worker import WorkerCancelled
 
-from archinstall.lib.output import debug, info
+from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import Result, ResultType
@@ -1238,9 +1238,9 @@ def __init__(self, main: InstanceRunnable[ValueT] | Callable[[], Awaitable[Value
 
 	@override
 	async def _on_exit_app(self) -> None:
-		from archinstall.lib.translationhandler import _restore_console_font
+		from archinstall.lib.translationhandler import restore_console_font
 
-		_restore_console_font()
+		restore_console_font()
 		await super()._on_exit_app()
 
 	def action_trigger_help(self) -> None:
@@ -1252,17 +1252,9 @@ def action_trigger_help(self) -> None:
 			_ = self.screen.mount(HelpPanel())
 
 	def on_mount(self) -> None:
-		import archinstall.lib.translationhandler as th
+		from archinstall.lib.translationhandler import translation_handler
 
-		if th._ENV_FONT:
-			if th._set_console_font(th._ENV_FONT):
-				th.translation_handler._using_env_font = True
-			else:
-				debug(f'FONT={th._ENV_FONT} could not be set, using language font mapping')
-				if th.translation_handler.active_font:
-					th._set_console_font(th.translation_handler.active_font)
-		elif th.translation_handler.active_font:
-			th._set_console_font(th.translation_handler.active_font)
+		translation_handler.apply_console_font()
 		self._run_worker()
 
 	@work
@@ -1293,14 +1285,9 @@ class TApp:
 	app: _AppInstance[Any] | None = None
 
 	def run(self, main: InstanceRunnable[ValueT] | Callable[[], Awaitable[ValueT]]) -> ValueT:
-		import archinstall.lib.translationhandler as th
-
 		TApp.app = _AppInstance(main)
 		result: ValueT | Exception | None = TApp.app.run()
 
-		if th._ENV_FONT and not th.translation_handler._using_env_font:
-			info(f'FONT={th._ENV_FONT} could not be set, using language font mapping')
-
 		if isinstance(result, Exception):
 			raise result