consistently rename lib.models.mirrors => lib.models.pacman

archinstall/lib/args.py

@@ -21,10 +21,10 @@ from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguratio
 from archinstall.lib.models.config import SubConfig
 from archinstall.lib.models.device import DiskEncryption, DiskLayoutConfiguration
 from archinstall.lib.models.locale import LocaleConfiguration
-from archinstall.lib.models.mirrors import PacmanConfiguration
 from archinstall.lib.models.network import NetworkConfiguration
 from archinstall.lib.models.package_types import DEFAULT_KERNEL
 from archinstall.lib.models.packages import Repository
+from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.models.users import Password, User, UserSerialization
 from archinstall.lib.output import debug, error, logger, warn

archinstall/lib/global_menu.py

@@ -19,10 +19,10 @@ from archinstall.lib.models.authentication import AuthenticationConfiguration
 from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
 from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType, PartitionModification
 from archinstall.lib.models.locale import LocaleConfiguration
-from archinstall.lib.models.mirrors import PacmanConfiguration
 from archinstall.lib.models.network import NetworkConfiguration, NicType
 from archinstall.lib.models.package_types import DEFAULT_KERNEL
 from archinstall.lib.models.packages import Repository
+from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.network.network_menu import select_network
 from archinstall.lib.output import FormattedOutput

archinstall/lib/installer.py

@@ -46,10 +46,10 @@ from archinstall.lib.models.device import (
 	Unit,
 )
 from archinstall.lib.models.locale import LocaleConfiguration
-from archinstall.lib.models.mirrors import PacmanConfiguration
 from archinstall.lib.models.network import Nic
 from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel
 from archinstall.lib.models.packages import Repository
+from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.users import User
 from archinstall.lib.output import debug, error, info, log, logger, warn
 from archinstall.lib.packages.packages import installed_package

archinstall/lib/mirror/mirror_handler.py

@@ -3,7 +3,7 @@ import urllib.parse
 from pathlib import Path
 
 from archinstall.lib.models import MirrorRegion
-from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3
+from archinstall.lib.models.pacman import MirrorStatusEntryV3, MirrorStatusListV3
 from archinstall.lib.networking import fetch_data_from_url
 from archinstall.lib.output import debug, info
 from archinstall.lib.pathnames import MIRRORLIST

archinstall/lib/models/__init__.py

@@ -27,9 +27,9 @@ from archinstall.lib.models.device import (
 	_DeviceInfo,
 )
 from archinstall.lib.models.locale import LocaleConfiguration
-from archinstall.lib.models.mirrors import CustomRepository, MirrorRegion, PacmanConfiguration
 from archinstall.lib.models.network import NetworkConfiguration, Nic, NicType
 from archinstall.lib.models.packages import LocalPackage, PackageSearch, PackageSearchResult, Repository
+from archinstall.lib.models.pacman import CustomRepository, MirrorRegion, PacmanConfiguration
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.models.users import PasswordStrength, User
 

archinstall/lib/pacman/config.py

@@ -1,8 +1,8 @@
 import re
 from pathlib import Path
 
-from archinstall.lib.models.mirrors import PacmanConfiguration
 from archinstall.lib.models.packages import Repository
+from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.pathnames import PACMAN_CONF
 
 

archinstall/lib/pacman/pacman_menu.py

@@ -4,7 +4,8 @@ from archinstall.lib.menu.abstract_menu import AbstractSubMenu
 from archinstall.lib.menu.helpers import Confirmation, Input, Loading, Selection
 from archinstall.lib.menu.list_manager import ListManager
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
-from archinstall.lib.models.mirrors import (
+from archinstall.lib.models.packages import Repository
+from archinstall.lib.models.pacman import (
 	CustomRepository,
 	CustomServer,
 	MirrorRegion,
@@ -12,7 +13,6 @@ from archinstall.lib.models.mirrors import (
 	SignCheck,
 	SignOption,
 )
-from archinstall.lib.models.packages import Repository
 from archinstall.lib.output import FormattedOutput
 from archinstall.lib.pathnames import PACMAN_CONF
 from archinstall.lib.translationhandler import tr

tests/test_args.py

@@ -19,9 +19,9 @@ from archinstall.lib.models.authentication import AuthenticationConfiguration, U
 from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
 from archinstall.lib.models.device import DiskLayoutConfiguration, DiskLayoutType
 from archinstall.lib.models.locale import LocaleConfiguration
-from archinstall.lib.models.mirrors import CustomRepository, CustomServer, MirrorRegion, PacmanConfiguration, SignCheck, SignOption
 from archinstall.lib.models.network import NetworkConfiguration, Nic, NicType
 from archinstall.lib.models.packages import Repository
+from archinstall.lib.models.pacman import CustomRepository, CustomServer, MirrorRegion, PacmanConfiguration, SignCheck, SignOption
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.models.users import Password, User
 from archinstall.lib.profile.profiles_handler import profile_handler