Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSecondThundeR <awayfromgalaxy@gmail.com>2021-04-29 18:47:31 +0300
committerSecondThundeR <awayfromgalaxy@gmail.com>2021-04-29 19:49:08 +0300
commitea14e860c7f730897544cb1bdb43964e25785c74 (patch)
treef3c7e295f1f8bb7e83aaac029447de3809b4b3d6
parent5f1156f80e4038a52719f4ba01c87eae4f0a8660 (diff)
Update `user_interaction.py`
- Reverted some changes for default options in multi select - Added check for dict and convert from dict to list - Replaced spaces with tabs for certain comment line
-rw-r--r--archinstall/lib/user_interaction.py23
1 files changed, 10 insertions, 13 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 10d74b63..f06354d2 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -100,17 +100,18 @@ def print_large_list(options, padding=5, margin_bottom=0, separator=': '):
def generic_multi_select(options, text="Select one or more of the options above (leave blank to continue): ", sort=False, default=None, allow_empty=False):
- # For now, we check for list, but in future it's better to have support for dictionary
- # (At the moment there are no cases of using dictionaries with this function)
- if type(options) not in [list]:
+ # Checking if the options are different from `list` or `dict` or if they are empty
+ if type(options) not in [list, dict]:
log(f" * Generic multi-select doesn't support ({type(options)}) as type of options * ", fg='red')
log(" * If problem persists, please create an issue on https://github.com/archlinux/archinstall/issues * ", fg='yellow')
- raise RequirementError("generic_multi_select() requires list as options.")
+ raise RequirementError("generic_multi_select() requires list or dictionary as options.")
if not options:
log(f" * Generic multi-select didn't find any options to choose from * ", fg='red')
log(" * If problem persists, please create an issue on https://github.com/archlinux/archinstall/issues * ", fg='yellow')
raise RequirementError('generic_multi_select() requires at least one option to proceed.')
# After passing the checks, function continues to work
+ if type(options) == dict:
+ options = list(options.values())
if sort:
options = sorted(options)
@@ -118,10 +119,10 @@ def generic_multi_select(options, text="Select one or more of the options above
selected_options = []
- if not selected_options and default in options:
- selected_options.append(default)
-
while True:
+ if not selected_options and default in options:
+ selected_options.append(default)
+
printed_options = []
for option in options:
if option in selected_options:
@@ -136,19 +137,15 @@ def generic_multi_select(options, text="Select one or more of the options above
section.write_line(text)
section.input_pos = section._cursor_x
selected_option = section.get_keyboard_input(end=None)
- # This string check is necessary to correct work with it
+ # This string check is necessary to correct work with it
# Without this, Python can raise AttributeError because of stripping `None`
# It also allows you to remove empty spaces if the user accidentally entered them.
if isinstance(selected_option, str):
selected_option = selected_option.strip()
try:
if not selected_option:
- # Added break when adding default option to empty list
- # So that the check doesn't go to the next elif
- # Since it still breaks the loop
if not selected_options and default:
selected_options = [default]
- break
elif selected_options or allow_empty:
break
else:
@@ -718,6 +715,6 @@ def select_kernel(options):
kernels = sorted(list(options))
if kernels:
- return generic_multi_select(kernels, f"Choose which kernels to use (Default value for empty selection: {DEFAULT_KERNEL}): ", default=DEFAULT_KERNEL)
+ return generic_multi_select(kernels, f"Choose which kernels to use (leave blank for default: {DEFAULT_KERNEL}): ", default=DEFAULT_KERNEL)
raise RequirementError("Selecting kernels require a least one kernel to be given as an option.")