RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert disabling default sorting 

This change reverts a previous change that disabled sorting by default in the multi select function, which would be better disabled manually for pre-sorted lists than manually enabling for unsorted lists.

Also, comments of the line check have been slightly changed
This commit is contained in:
SecondThundeR 2021-04-30 22:31:31 +03:00
parent ea14e860c7
commit efadd4a426
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/user_interaction.py
View File

@ -99,7 +99,7 @@ def print_large_list(options, padding=5, margin_bottom=0, separator=': '):
return column, row return column, row
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): def generic_multi_select(options, text="Select one or more of the options above (leave blank to continue): ", sort=True, default=None, allow_empty=False):
# Checking if the options are different from `list` or `dict` or if they are empty # Checking if the options are different from `list` or `dict` or if they are empty
if type(options) not in [list, dict]: if type(options) not in [list, dict]:
log(f" * Generic multi-select doesn't support ({type(options)}) as type of options * ", fg='red') log(f" * Generic multi-select doesn't support ({type(options)}) as type of options * ", fg='red')
@ -138,8 +138,8 @@ def generic_multi_select(options, text="Select one or more of the options above
section.input_pos = section._cursor_x section.input_pos = section._cursor_x
selected_option = section.get_keyboard_input(end=None) 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` # Without this, Python will raise AttributeError because of stripping `None`
# It also allows you to remove empty spaces if the user accidentally entered them. # It also allows to remove empty spaces if the user accidentally entered them.
if isinstance(selected_option, str): if isinstance(selected_option, str):
selected_option = selected_option.strip() selected_option = selected_option.strip()
try: try:
@ -715,6 +715,6 @@ def select_kernel(options):
kernels = sorted(list(options)) kernels = sorted(list(options))
if kernels: if kernels:
return generic_multi_select(kernels, f"Choose which kernels to use (leave blank for default: {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, sort=False)
raise RequirementError("Selecting kernels require a least one kernel to be given as an option.") raise RequirementError("Selecting kernels require a least one kernel to be given as an option.")