Skip to content

Commit e763c11

Browse files
authored
Refactor interactive module (#4315)
* Refactor interactive module * Refactor interactive module * Update
1 parent 1764b49 commit e763c11

File tree

10 files changed

+627
-653
lines changed

10 files changed

+627
-653
lines changed

archinstall/lib/disk/disk_menu.py

Lines changed: 602 additions & 3 deletions
Large diffs are not rendered by default.

archinstall/lib/disk/partitioning_menu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ async def _suggest_partition_layout(
566566
if not await self._reset_confirmation():
567567
return None
568568

569-
from archinstall.lib.interactions.disk_conf import suggest_single_disk_layout
569+
from archinstall.lib.disk.disk_menu import suggest_single_disk_layout
570570

571571
return await suggest_single_disk_layout(self._device)
572572

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
from archinstall.lib.general.general_menu import (
2+
add_number_of_parallel_downloads,
3+
select_archinstall_language,
4+
select_hostname,
5+
select_ntp,
6+
select_timezone,
7+
)
8+
from archinstall.lib.general.system_menu import select_driver, select_kernel, select_swap
9+
10+
__all__ = [
11+
'add_number_of_parallel_downloads',
12+
'select_archinstall_language',
13+
'select_driver',
14+
'select_hostname',
15+
'select_kernel',
16+
'select_ntp',
17+
'select_swap',
18+
'select_timezone',
19+
]
File renamed without changes.
File renamed without changes.

archinstall/lib/global_menu.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from archinstall.lib.bootloader.bootloader_menu import BootloaderMenu
77
from archinstall.lib.configuration import save_config
88
from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
9+
from archinstall.lib.general.general_menu import add_number_of_parallel_downloads, select_hostname, select_ntp, select_timezone
10+
from archinstall.lib.general.system_menu import select_kernel, select_swap
911
from archinstall.lib.hardware import SysInfo
10-
from archinstall.lib.interactions.general_conf import add_number_of_parallel_downloads, select_hostname, select_ntp, select_timezone
11-
from archinstall.lib.interactions.system_conf import select_kernel, select_swap
1212
from archinstall.lib.locale.locale_menu import LocaleMenu
1313
from archinstall.lib.menu.abstract_menu import AbstractMenu, SpecialMenuKey
1414
from archinstall.lib.mirror.mirror_handler import MirrorListHandler
@@ -232,7 +232,7 @@ def is_config_valid(self) -> bool:
232232
return self._validate_bootloader() is None
233233

234234
async def _select_archinstall_language(self, preset: Language) -> Language:
235-
from archinstall.lib.interactions.general_conf import select_archinstall_language
235+
from archinstall.lib.general.general_menu import select_archinstall_language
236236

237237
language = await select_archinstall_language(translation_handler.translated_languages, preset)
238238
translation_handler.activate(language)

archinstall/lib/interactions/__init__.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)