Add simple menu for better UX

.flake8

@@ -6,4 +6,4 @@ max-complexity = 40
 max-line-length = 236
 show-source = True
 statistics = True
-per-file-ignores = __init__.py:F401,F403,F405
+per-file-ignores = __init__.py:F401,F403,F405 simple_menu.py:C901,W503

.gitignore

@@ -25,5 +25,6 @@ SAFETY_LOCK
 /guided.py
 /install.log
 venv
+.venv
 .idea/**
-**/install.log
+**/install.log

archinstall/__init__.py

@@ -20,6 +20,7 @@
 from .lib.storage import *
 from .lib.systemd import *
 from .lib.user_interaction import *
+from .lib.menu import Menu
 
 parser = ArgumentParser()
 
@@ -88,7 +89,6 @@ def initialize_arguments():
 
 # TODO: Learn the dark arts of argparse... (I summon thee dark spawn of cPython)
 
-
 def run_as_a_module():
 	"""
 	Since we're running this as a 'python -m archinstall' module OR

archinstall/lib/disk/validators.py

@@ -16,7 +16,8 @@ def valid_parted_position(pos :str):
 
 	return False
 
-def valid_fs_type(fstype :str) -> bool:
+
+def fs_types():
 	# https://www.gnu.org/software/parted/manual/html_node/mkpart.html
 	# Above link doesn't agree with `man parted` /mkpart documentation:
 	"""
@@ -27,16 +28,19 @@ def valid_fs_type(fstype :str) -> bool:
 		"linux-swap",  "ntfs",  "reis‐
 		erfs", "udf", or "xfs".
 	"""
-
-	return fstype.lower() in [
+	return [
 		"btrfs",
 		"ext2",
-		"ext3", "ext4", # `man parted` allows these
+		"ext3", "ext4",  # `man parted` allows these
 		"fat16", "fat32",
-		"hfs", "hfs+", # "hfsx", not included in `man parted`
+		"hfs", "hfs+",  # "hfsx", not included in `man parted`
 		"linux-swap",
 		"ntfs",
 		"reiserfs",
-		"udf", # "ufs", not included in `man parted`
-		"xfs", # `man parted` allows this
+		"udf",  # "ufs", not included in `man parted`
+		"xfs",  # `man parted` allows this
 	]
+
+
+def valid_fs_type(fstype :str) -> bool:
+	return fstype.lower() in fs_types()

archinstall/lib/locale_helpers.py

@@ -47,3 +47,8 @@ def set_keyboard_language(locale):
 		return True
 
 	return False
+
+
+def list_timezones():
+	for line in SysCommand("timedatectl --no-pager list-timezones", environment_vars={'SYSTEMD_COLORS': '0'}):
+		yield line.decode('UTF-8').strip()

archinstall/lib/menu.py

@@ -0,0 +1,91 @@
+from .simple_menu import TerminalMenu
+
+
+class Menu(TerminalMenu):
+	def __init__(self, title, options, skip=True, multi=False, default_option=None, sort=True):
+		"""
+		Creates a new menu
+
+		:param title: Text that will be displayed above the menu
+		:type title: str
+
+		:param options: Options to be displayed in the menu to chose from;
+		if dict is specified then the keys of such will be used as options
+		:type options: list, dict
+
+		:param skip: Indicate if the selection is not mandatory and can be skipped
+		:type skip: bool
+
+		:param multi: Indicate if multiple options can be selected
+		:type multi: bool
+
+		:param default_option: The default option to be used in case the selection processes is skipped
+		:type default_option: str
+
+		:param sort: Indicate if the options should be sorted alphabetically before displaying
+		:type sort: bool
+		"""
+
+		if isinstance(options, dict):
+			options = list(options)
+
+		if sort:
+			options = sorted(options)
+
+		self.menu_options = options
+		self.skip = skip
+		self.default_option = default_option
+		self.multi = multi
+
+		menu_title = f'\n{title}\n\n'
+
+		if skip:
+			menu_title += "Use ESC to skip\n\n"
+
+		if default_option:
+			# if a default value was specified we move that one
+			# to the top of the list and mark it as default as well
+			default = f'{default_option} (default)'
+			self.menu_options = [default] + [o for o in self.menu_options if default_option != o]
+
+		cursor = "> "
+		main_menu_cursor_style = ("fg_red", "bold")
+		main_menu_style = ("bg_red", "fg_yellow")
+
+		super().__init__(
+			menu_entries=self.menu_options,
+			title=menu_title,
+			menu_cursor=cursor,
+			menu_cursor_style=main_menu_cursor_style,
+			menu_highlight_style=main_menu_style,
+			cycle_cursor=True,
+			clear_screen=True,
+			multi_select=multi,
+			show_search_hint=True
+		)
+
+	def _show(self):
+		idx = self.show()
+		if idx is not None:
+			if isinstance(idx, (list, tuple)):
+				return [self.menu_options[i] for i in idx]
+			else:
+				selected = self.menu_options[idx]
+				if ' (default)' in selected and self.default_option:
+					return self.default_option
+				return selected
+		else:
+			if self.default_option:
+				if self.multi:
+					return [self.default_option]
+				else:
+					return self.default_option
+			return None
+
+	def run(self):
+		ret = self._show()
+
+		if ret is None and not self.skip:
+			return self.run()
+
+		return ret