|
11 | 11 | PartitionModification, |
12 | 12 | ) |
13 | 13 | from archinstall.lib.translationhandler import tr |
14 | | -from archinstall.tui.curses_menu import SelectMenu |
| 14 | +from archinstall.tui.curses_menu import EditMenu, SelectMenu |
15 | 15 | from archinstall.tui.menu_item import MenuItem, MenuItemGroup |
16 | 16 | from archinstall.tui.result import ResultType |
17 | 17 | from archinstall.tui.types import Alignment, FrameProperties |
@@ -396,29 +396,21 @@ def validate_iter_time(value: str | None) -> str | None: |
396 | 396 | except ValueError: |
397 | 397 | return tr('Please enter a valid number') |
398 | 398 |
|
399 | | - try: |
400 | | - from archinstall.tui.curses_menu import EditMenu |
401 | | - from archinstall.tui.result import ResultType |
402 | | - from archinstall.tui.types import Alignment |
403 | | - |
404 | | - result = EditMenu( |
405 | | - tr('Iteration time (ms)'), |
406 | | - header=header, |
407 | | - alignment=Alignment.CENTER, |
408 | | - allow_skip=True, |
409 | | - default_text=str(preset) if preset else str(DEFAULT_ITER_TIME), |
410 | | - validator=validate_iter_time, |
411 | | - ).input() |
412 | | - |
413 | | - match result.type_: |
414 | | - case ResultType.Skip: |
| 399 | + result = EditMenu( |
| 400 | + tr('Iteration time (ms)'), |
| 401 | + header=header, |
| 402 | + alignment=Alignment.CENTER, |
| 403 | + allow_skip=True, |
| 404 | + default_text=str(preset) if preset else str(DEFAULT_ITER_TIME), |
| 405 | + validator=validate_iter_time, |
| 406 | + ).input() |
| 407 | + |
| 408 | + match result.type_: |
| 409 | + case ResultType.Skip: |
| 410 | + return preset |
| 411 | + case ResultType.Selection: |
| 412 | + if not result.text(): |
415 | 413 | return preset |
416 | | - case ResultType.Selection: |
417 | | - if not result.text(): |
418 | | - return preset |
419 | | - return int(result.text()) |
420 | | - case ResultType.Reset: |
421 | | - return None |
422 | | - except ImportError: |
423 | | - # Fallback for non-interactive mode |
424 | | - return preset or DEFAULT_ITER_TIME |
| 414 | + return int(result.text()) |
| 415 | + case ResultType.Reset: |
| 416 | + return None |
0 commit comments