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

Update language selection 

Reverted generic_select changes and added ability to choose any layout at first input
This commit is contained in:
Владислав 2021-04-22 12:05:24 +03:00 committed by GitHub
parent 331bb0789b
commit 4209074137
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
archinstall/lib/user_interaction.py
View File

@ -360,13 +360,10 @@ def select_language(options, show_only_country_codes=True):
""" """
Asks the user to select a language from the `options` dictionary parameter. Asks the user to select a language from the `options` dictionary parameter.
Usually this is combined with :ref:`archinstall.list_keyboard_languages`. Usually this is combined with :ref:`archinstall.list_keyboard_languages`.
:param options: A `dict` where keys are the language name, value should be a dict containing language information. :param options: A `dict` where keys are the language name, value should be a dict containing language information.
:type options: dict :type options: dict
:param show_only_country_codes: Filters out languages that are not len(lang) == 2. This to limit the number of results from stuff like dvorak and x-latin1 alternatives. :param show_only_country_codes: Filters out languages that are not len(lang) == 2. This to limit the number of results from stuff like dvorak and x-latin1 alternatives.
:type show_only_country_codes: bool :type show_only_country_codes: bool
:return: The language/dictionary key of the selected language :return: The language/dictionary key of the selected language
:rtype: str :rtype: str
""" """
@ -381,37 +378,31 @@ def select_language(options, show_only_country_codes=True):
for index, language in enumerate(languages): for index, language in enumerate(languages):
print(f"{index}: {language}") print(f"{index}: {language}")
# Current workaround for passing `generic_select`, print(" -- You can choose a layout that isn't in this list, but whose name you know --")
# if these values are provided as input print(" -- Also, you can enter '?' or 'help' to search for more languages, or skip to use US layout --")
languages.extend(['?', 'help'])
languages_length = len(languages)
print(f' -- You can enter ? ({languages_length - 2}) or help ({languages_length - 1}) to search for more languages, or skip to use US layout --') while True:
selected_language = generic_select(languages, 'Select one of the above keyboard languages (by number or full name): ', selected_language = input('Select one of the above keyboard languages (by name or full name): ')
options_output=False) if not selected_language:
return DEFAULT_KEYBOARD_LANGUAGE
if not selected_language: elif selected_language.lower() in ('?', 'help'):
return DEFAULT_KEYBOARD_LANGUAGE while True:
elif selected_language in ('?', 'help'): filter_string = input('Search for layout containing (example: "sv-"): ')
while True: new_options = list(search_keyboard_layout(filter_string))
filter_string = input('Search for layout containing (example: "sv-"): ') if len(new_options) <= 0:
new_options = list(search_keyboard_layout(filter_string)) log(f"Search string '{filter_string}' yielded no results, please try another search or Ctrl+D to abort.", fg='yellow')
continue
if len(new_options) <= 0: return select_language(new_options, show_only_country_codes=False)
log(f"Search string '{filter_string}' yielded no results, please try another search or Ctrl+D to abort.", fg='yellow') elif selected_language.isnumeric():
selected_language = int(selected_language)
if selected_language >= len(languages):
log(' * Selected option is out of range * ', fg='red')
continue continue
return languages[selected_language]
return select_language(new_options, show_only_country_codes=False) elif search_keyboard_layout(selected_language):
return selected_language
# I'm leaving "options" on purpose here. else:
# Since languages possibly contains a filtered version of log(" * Given language wasn't found * ", fg='red')
# all possible language layouts, and we might want to write
# for instance sv-latin1 (if we know that exists) without having to
# go through the search step.
return selected_language
raise RequirementError("Selecting languages require a least one language to be given as an option.")
def select_mirror_regions(mirrors, show_top_mirrors=True): def select_mirror_regions(mirrors, show_top_mirrors=True):
""" """