Full mypy compliance and small fixes (#1777)

* Fix mypy compliance

---------

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>

2 files changed, 67 insertions, 41 deletions

diff --git a/archinstall/lib/menu/abstract_menu.py b/archinstall/lib/menu/abstract_menu.py
index 53816655..e44d65a4 100644
--- a/archinstall/lib/menu/abstract_menu.py
+++ b/archinstall/lib/menu/abstract_menu.py
@@ -482,9 +482,9 @@ class AbstractMenu:
 			if item in self._menus_to_enable():
 				yield item
 
-	def _select_archinstall_language(self, preset_value: Language) -> Language:
+	def _select_archinstall_language(self, preset: Language) -> Language:
 		from ..user_interaction.general_conf import select_archinstall_language
-		language = select_archinstall_language(self.translation_handler.translated_languages, preset_value)
+		language = select_archinstall_language(self.translation_handler.translated_languages, preset)
 		self._translation_handler.activate(language)
 		return language
 
diff --git a/archinstall/lib/menu/menu.py b/archinstall/lib/menu/menu.py
index 44ac33a6..12dbf1f5 100644
--- a/archinstall/lib/menu/menu.py
+++ b/archinstall/lib/menu/menu.py
@@ -3,7 +3,7 @@ from enum import Enum, auto
 from os import system
 from typing import Dict, List, Union, Any, TYPE_CHECKING, Optional, Callable
 
-from simple_term_menu import TerminalMenu
+from simple_term_menu import TerminalMenu  # type: ignore
 
 from ..exceptions import RequirementError
 from ..output import log
@@ -29,11 +29,11 @@ class MenuSelection:
 
 	@property
 	def single_value(self) -> Any:
-		return self.value
+		return self.value  # type: ignore
 
 	@property
 	def multi_value(self) -> List[Any]:
-		return self.value
+		return self.value  # type: ignore
 
 
 class Menu(TerminalMenu):
@@ -67,7 +67,7 @@ class Menu(TerminalMenu):
 		preview_command: Optional[Callable] = None,
 		preview_size: float = 0.0,
 		preview_title: str = 'Info',
-		header: Union[List[str],str] = None,
+		header: Union[List[str], str] = [],
 		allow_reset: bool = False,
 		allow_reset_warning_msg: Optional[str] = None,
 		clear_screen: bool = True,
@@ -141,8 +141,6 @@ class Menu(TerminalMenu):
 			log(f"invalid parameter at Menu() call was at <{sys._getframe(1).f_code.co_name}>",level=logging.WARNING)
 			raise RequirementError("Menu() requires an iterable as option.")
 
-		self._default_str = str(_('(default)'))
-
 		if isinstance(p_options,dict):
 			options = list(p_options.keys())
 		else:
@@ -193,8 +191,7 @@ class Menu(TerminalMenu):
 		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} {self._default_str}'
-			self._menu_options = [default] + [o for o in self._menu_options if default_option != o]
+			self._menu_options = [self._default_menu_value] + [o for o in self._menu_options if default_option != o]
 
 		if display_back_option and not multi and skip:
 			skip_empty_entries = True
@@ -204,7 +201,18 @@ class Menu(TerminalMenu):
 			skip_empty_entries = True
 			self._menu_options += ['']
 
-		self._preselection(preset_values,cursor_index)
+		preset_list: Optional[List[str]] = None
+
+		if preset_values and isinstance(preset_values, str):
+			preset_list = [preset_values]
+
+		calc_cursor_idx = self._determine_cursor_pos(preset_list, cursor_index)
+
+		# when we're not in multi selection mode we don't care about
+		# passing the pre-selection list to the menu as the position
+		# of the cursor is the one determining the pre-selection
+		if not self._multi:
+			preset_values = None
 
 		cursor = "> "
 		main_menu_cursor_style = ("fg_cyan", "bold")
@@ -217,8 +225,8 @@ class Menu(TerminalMenu):
 			menu_cursor_style=main_menu_cursor_style,
 			menu_highlight_style=main_menu_style,
 			multi_select=multi,
-			preselected_entries=self.preset_values,
-			cursor_index=self.cursor_index,
+			preselected_entries=preset_values,
+			cursor_index=calc_cursor_idx,
 			preview_command=lambda x: self._show_preview(preview_command, x),
 			preview_size=preview_size,
 			preview_title=preview_title,
@@ -231,12 +239,17 @@ class Menu(TerminalMenu):
 			skip_empty_entries=skip_empty_entries
 		)
 
+	@property
+	def _default_menu_value(self) -> str:
+		default_str = str(_('(default)'))
+		return f'{self._default_option} {default_str}'
+
 	def _show_preview(self, preview_command: Optional[Callable], selection: str) -> Optional[str]:
 		if selection == self.back():
 			return None
 
 		if preview_command:
-			if self._default_option is not None and f'{self._default_option} {self._default_str}' == selection:
+			if self._default_option is not None and self._default_menu_value == selection:
 				selection = self._default_option
 			return preview_command(selection)
 
@@ -249,7 +262,7 @@ class Menu(TerminalMenu):
 			return MenuSelection(type_=MenuSelectionType.Reset)
 
 		def check_default(elem):
-			if self._default_option is not None and f'{self._default_option} {self._default_str}' in elem:
+			if self._default_option is not None and self._default_menu_value in elem:
 				return self._default_option
 			else:
 				return elem
@@ -297,31 +310,44 @@ class Menu(TerminalMenu):
 		pos = self._menu_entries.index(value)
 		self.set_cursor_pos(pos)
 
-	def _preselection(self,preset_values :Union[str, List[str]] = [], cursor_index : Optional[int] = None):
-		def from_preset_to_cursor():
-			if preset_values:
-				# if the value is not extant return 0 as cursor index
+	def _determine_cursor_pos(
+		self,
+		preset: Optional[List[str]] = None,
+		cursor_index: Optional[int] = None
+	) -> Optional[int]:
+		"""
+			The priority order to determine the cursor position is:
+			1. A static cursor position was provided
+			2. Preset values have been provided so the cursor will be
+				positioned on those
+			3. A default value for a selection is given so the cursor
+				will be placed on such
+		"""
+		if cursor_index:
+			return cursor_index
+
+		if preset:
+			indexes = []
+
+			for p in preset:
 				try:
-					if isinstance(preset_values,str):
-						self.cursor_index = self._menu_options.index(self.preset_values)
-					else:  # should return an error, but this is smoother
-						self.cursor_index = self._menu_options.index(self.preset_values[0])
-				except ValueError:
-					self.cursor_index = 0
-
-		self.cursor_index = cursor_index
-		if not preset_values:
-			self.preset_values = None
-			return
-
-		self.preset_values = preset_values
+					# the options of the table selection menu
+					# are already escaped so we have to escape
+					# the preset values as well for the comparison
+					if '|' in p:
+						p = p.replace('|', '\\|')
+
+					idx = self._menu_options.index(p)
+					indexes.append(idx)
+				except (IndexError, ValueError):
+					log(f'Error finding index of {p}: {self._menu_options}', level=logging.DEBUG)
+
+			if len(indexes) == 0:
+				indexes.append(0)
+
+			return indexes[0]
+
 		if self._default_option:
-			if isinstance(preset_values,str) and self._default_option == preset_values:
-				self.preset_values = f"{preset_values} {self._default_str}"
-			elif isinstance(preset_values,(list,tuple)) and self._default_option in preset_values:
-				idx = preset_values.index(self._default_option)
-				self.preset_values[idx] = f"{preset_values[idx]} {self._default_str}"
-		if cursor_index is None or not self._multi:
-			from_preset_to_cursor()
-		if not self._multi: # Not supported by the infraestructure
-			self.preset_values = None
+			return self._menu_options.index(self._default_menu_value)
+
+		return None