Refactor mirror_list_handler to use DI (archlinux#4170)

Author: codefiles

archinstall/lib/global_menu.py

@@ -25,7 +25,7 @@
 from .interactions.system_conf import ask_for_swap, select_kernel
 from .locale.locale_menu import LocaleMenu
 from .menu.abstract_menu import CONFIG_KEY, AbstractMenu
-from .mirrors import MirrorMenu
+from .mirrors import MirrorListHandler, MirrorMenu
 from .models.bootloader import Bootloader, BootloaderConfiguration
 from .models.locale import LocaleConfiguration
 from .models.mirrors import MirrorConfiguration
@@ -38,8 +38,14 @@
 
 
 class GlobalMenu(AbstractMenu[None]):
-	def __init__(self, arch_config: ArchConfig, title: str | None = None) -> None:
+	def __init__(
+		self,
+		arch_config: ArchConfig,
+		mirror_list_handler: MirrorListHandler | None = None,
+		title: str | None = None,
+	) -> None:
 		self._arch_config = arch_config
+		self._mirror_list_handler = mirror_list_handler
 		menu_options = self._get_menu_options()
 
 		self._item_group = MenuItemGroup(
@@ -550,7 +556,12 @@ def _select_additional_packages(self, preset: list[str]) -> list[str]:
 		return packages
 
 	def _mirror_configuration(self, preset: MirrorConfiguration | None = None) -> MirrorConfiguration | None:
-		mirror_configuration = MirrorMenu(preset=preset).run()
+		if self._mirror_list_handler is not None:
+			mirror_list_handler = self._mirror_list_handler
+		else:
+			mirror_list_handler = MirrorListHandler()
+
+		mirror_configuration = MirrorMenu(mirror_list_handler, preset=preset).run()
 
 		if mirror_configuration and mirror_configuration.optional_repositories:
 			# reset the package list cache in case the repository selection has changed

archinstall/lib/installer.py

@@ -42,6 +42,7 @@
 from .hardware import SysInfo
 from .locale.utils import verify_keyboard_layout, verify_x11_keyboard_layout
 from .luks import Luks2
+from .mirrors import MirrorListHandler
 from .models.bootloader import Bootloader
 from .models.locale import LocaleConfiguration
 from .models.mirrors import MirrorConfiguration
@@ -528,6 +529,7 @@ def post_install_check(self, *args: str, **kwargs: str) -> list[str]:
 
 	def set_mirrors(
 		self,
+		mirror_list_handler: MirrorListHandler,
 		mirror_config: MirrorConfiguration,
 		on_target: bool = False,
 	) -> None:
@@ -558,7 +560,7 @@ def set_mirrors(
 			with open(pacman_config, 'a') as fp:
 				fp.write(repositories_config)
 
-		regions_config = mirror_config.regions_config(speed_sort=True)
+		regions_config = mirror_config.regions_config(mirror_list_handler, speed_sort=True)
 		if regions_config:
 			debug(f'Mirrorlist:\n{regions_config}')
 			mirrorlist_config.write_text(regions_config)