Skip to content

Refactor mirror_list_handler to use DI #4170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
svartkanin merged 1 commit into from
Jan 27, 2026
+214 −177
Merged

Refactor mirror_list_handler to use DI #4170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions archinstall/lib/global_menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion archinstall/lib/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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)
Expand Down
Loading