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

Removed search logic for mirrors since we now have column-printouts, the columns enabled us to print all the regions which means the search was an excessive feature.

This commit is contained in:
Anton Hvornum 2021-03-20 22:15:42 +01:00
parent 42ba36b5d8
commit f3b93c1c1c
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archinstall/lib/user_interaction.py
View File

@ -295,23 +295,13 @@ def select_mirror_regions(mirrors, show_top_mirrors=True):
selected_mirrors = {} selected_mirrors = {}
if len(regions) >= 1: if len(regions) >= 1:
print_large_list(regions, margin_bottom=4) print_large_list(regions, margin_bottom=2)
print(' -- You can enter ? or help to search for more regions --')
print(' -- You can skip this step by leaving the option blank --') print(' -- You can skip this step by leaving the option blank --')
print(' -- (You can use Shift + PageUp to scroll in the list --')
selected_mirror = input('Select one of the above regions to download packages from (by number or full name): ') selected_mirror = input('Select one of the above regions to download packages from (by number or full name): ')
if len(selected_mirror.strip()) == 0: if len(selected_mirror.strip()) == 0:
return {} return {}
elif selected_mirror.lower() in ('?', 'help'):
filter_string = input('Search for a region containing (example: "united"): ').strip().lower()
for region in mirrors:
if filter_string in region.lower():
selected_mirrors[region] = mirrors[region]
return selected_mirrors
elif selected_mirror.isdigit() and (pos := int(selected_mirror)) <= len(regions)-1: elif selected_mirror.isdigit() and (pos := int(selected_mirror)) <= len(regions)-1:
region = regions[int(selected_mirror)] region = regions[int(selected_mirror)]
selected_mirrors[region] = mirrors[region] selected_mirrors[region] = mirrors[region]