Merge remote-tracking branch 'origin' into guided

archinstall/__init__.py

@@ -11,4 +11,4 @@ from .lib.locale_helpers import *
 from .lib.services import *
 from .lib.packages import *
 from .lib.output import *
-from .lib.tss import *
+from .lib.storage import *

archinstall/lib/output.py

@@ -1,5 +1,4 @@
 import sys
-from .tts import TTS
 
 # Found first reference here: https://stackoverflow.com/questions/7445658/how-to-detect-if-the-console-does-support-ansi-escape-codes-in-python
 # And re-used this: https://github.com/django/django/blob/master/django/core/management/color.py#L12
@@ -44,7 +43,4 @@ def log(*args, **kwargs):
 		kwargs = {'bg' : 'black', 'fg': 'white', **kwargs}
 		string = stylize_output(string, **kwargs)
 
-	print(string)
-	with TTS() as tts_instance:
-		if tts_instance.is_available:
-			tts_instance.speak(string.replace('-', '').strip().lstrip())
+	print(string)

archinstall/lib/storage.py

@@ -0,0 +1 @@
+storage = {}

archinstall/lib/tts.py

@@ -1,36 +0,0 @@
-class TTS():
-	def __init__(self):
-		try:
-			import pyttsx3
-			self._available = True
-		except:
-			self._available = False
-
-	@property
-	def available(self):
-		return self._available
-	@property
-	def is_available(self):
-		return self._available
-
-	@property
-	def volume(self):
-		return self.engine.getProperty('volume')
-
-	@volume.setter
-	def volume(self, percentage):
-		self.engine.setProperty('volume', percentage/100)
-		return self.volume
-	
-
-	def speak(self, phrase):
-		if self.available:
-			self.engine.say("I will speak this text")
-			engine.runAndWait()
-
-	def __enter__(self):
-		self.engine = pyttsx3.init()
-		return self
-
-	def __exit__(self, *args, **kwargs):
-		self.engine.stop()

archinstall/lib/user_interaction.py

@@ -5,6 +5,34 @@ from .locale_helpers import search_keyboard_layout
 ## TODO: Some inconsistencies between the selection processes.
 ##       Some return the keys from the options, some the values?
 
+def generic_select(options, input_text="Select one of the above by index or absolute value: ", sort=True):
+	"""
+	A generic select function that does not output anything
+	other than the options and their indexs. As an example:
+
+	generic_select(["first", "second", "third option"])
+	1: first
+	2: second
+	3: third option
+	"""
+
+	if type(options) == dict: options = list(options)
+	if sort: options = sorted(list(options))
+	if len(options) <= 0: raise RequirementError('generic_select() requires at least one option to operate.')
+
+	for index, option in enumerate(options):
+		print(f"{index}: {option}")
+
+	selected_option = input(input_text)
+	if selected_option.isdigit():
+		selected_option = options[int(selected_option)]
+	elif selected_option in options:
+		pass # We gave a correct absolute value
+	else:
+		raise RequirementError(f'Selected option "{selected_option}" does not exist in available options: {options}')
+	
+	return selected_option
+
 def select_disk(dict_o_disks):
 	"""
 	Asks the user to select a harddrive from the `dict_o_disks` selection.

profiles/desktop.py

@@ -0,0 +1,45 @@
+# A desktop environment selector.
+
+import archinstall, os
+
+def _prep_function(*args, **kwargs):
+	"""
+	Magic function called by the importing installer
+	before continuing any further. It also avoids executing any
+	other code in this stage. So it's a safe way to ask the user
+	for more input before any other installer steps start.
+	"""
+
+	supported_desktops = ['gnome', 'kde', 'awesome']
+	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environemtn: ')
+
+	# Temporarly store the selected desktop profile
+	# in a session-safe location, since this module will get re-loaded
+	# the next time it gets executed.
+	archinstall.storage['_desktop_profile'] = desktop
+
+	profile = archinstall.Profile(None, desktop)
+	# Loading the instructions with a custom namespace, ensures that a __name__ comparison is never triggered.
+	with profile.load_instructions(namespace=f"{desktop}.py") as imported:
+		if hasattr(imported, '_prep_function'):
+			return imported._prep_function()
+		else:
+			print(f"Deprecated (??): {desktop} profile has no _prep_function() anymore")
+
+if __name__ == 'desktop':
+	"""
+	This "profile" is a meta-profile.
+	There are no specific desktop-steps, it simply routes
+	the installer to whichever desktop environment/window manager was chosen.
+
+	Maybe in the future, a network manager or similar things *could* be added here.
+	We should honor that Arch Linux does not officially endorse a desktop-setup, nor is
+	it trying to be a turn-key desktop distribution.
+
+	There are plenty of desktop-turn-key-solutions based on Arch Linux,
+	this is therefor just a helper to get started
+	"""
+
+	# TODO: Remove magic variable 'installation' and place it
+	#       in archinstall.storage or archinstall.session/archinstall.installation
+	installation.install_profile(archinstall.storage['_desktop_profile'])