Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/__init__.py3
-rw-r--r--archinstall/lib/locale_helpers.py29
-rw-r--r--archinstall/lib/user_interaction.py36
3 files changed, 65 insertions, 3 deletions
diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index 69e98ec7..b646c1f7 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -6,4 +6,5 @@ from .lib.installer import *
from .lib.profiles import *
from .lib.luks import *
from .lib.mirrors import *
-from .lib.networking import * \ No newline at end of file
+from .lib.networking import *
+from .lib.locale_helpers import * \ No newline at end of file
diff --git a/archinstall/lib/locale_helpers.py b/archinstall/lib/locale_helpers.py
new file mode 100644
index 00000000..2917a17d
--- /dev/null
+++ b/archinstall/lib/locale_helpers.py
@@ -0,0 +1,29 @@
+import os
+
+from .exceptions import *
+# from .general import sys_command
+
+def list_keyboard_languages(layout='qwerty'):
+ locale_dir = '/usr/share/kbd/keymaps/'
+
+ if not os.path.isdir(locale_dir):
+ raise RequirementError(f'Directory containing locales does not excist: {locale_dir}')
+
+ for root, folders, files in os.walk(locale_dir):
+ # Since qwerty is under /i386/ but other layouts are
+ # in different spots, we'll need to filter the last foldername
+ # of the path to verify against the desired layout.
+ if os.path.basename(root) != layout:
+ continue
+
+ for file in files:
+ if os.path.splitext(file)[1] == '.gz':
+ yield file.strip('.gz').strip('.map')
+
+def search_keyboard_layout(filter, layout='qwerty'):
+ for language in list_keyboard_languages(layout):
+ if filter.lower() in language.lower():
+ yield language
+
+def set_keyboard_language(locale):
+ return os.system(f'loadkeys {locale}') == 0 \ No newline at end of file
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index bd6d117c..f9e7bf18 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -1,8 +1,9 @@
from .exceptions import *
+from .locale_helpers import search_keyboard_layout
def select_disk(dict_o_disks):
drives = sorted(list(dict_o_disks.keys()))
- if len(drives) > 1:
+ if len(drives) >= 1:
for index, drive in enumerate(drives):
print(f"{index}: {drive} ({dict_o_disks[drive]['size'], dict_o_disks[drive].device, dict_o_disks[drive]['label']})")
drive = input('Select one of the above disks (by number or full path): ')
@@ -14,4 +15,35 @@ def select_disk(dict_o_disks):
raise DiskError(f'Selected drive does not exist: "{drive}"')
return drive
- raise DiskError('select_disk() requires a non-empty dictionary of disks to select from.') \ No newline at end of file
+ raise DiskError('select_disk() requires a non-empty dictionary of disks to select from.')
+
+def select_language(options, show_only_country_codes=True):
+ if show_only_country_codes:
+ languages = sorted([language for language in list(options) if len(language) == 2])
+ else:
+ languages = sorted(list(options))
+
+ if len(languages) >= 1:
+ for index, language in enumerate(languages):
+ print(f"{index}: {language}")
+
+ print(' -- You can enter ? or help to search for more languages --')
+ selected_language = input('Select one of the above keyboard languages (by number or full name): ')
+ if selected_language.lower() in ('?', 'help'):
+ filter_string = input('Search for layout containing (example: "sv-"): ')
+ new_options = search_keyboard_layout(filter_string)
+ return select_language(new_options, show_only_country_codes=False)
+ elif selected_language.isdigit() and (pos := int(selected_language)) <= len(languages)-1:
+ selected_language = languages[pos]
+ # I'm leaving "options" on purpose here.
+ # Since languages possibly contains a filtered version of
+ # all possible language layouts, and we might want to write
+ # for instance sv-latin1 (if we know that exists) without havnig to
+ # go through the search step.
+ elif selected_language in options:
+ selected_language = options[options.index(selected_language)]
+ else:
+ RequirementError("Selected language does not exist.")
+ return selected_language
+
+ raise RequirementError("Selecting languages require a least one language to be given as an option.") \ No newline at end of file