Implement is_desktop_profile helper function (#575)

* Implement is_desktop_profile helper function

* Make ask_for_audio_selection use generic_select

* Fix default value for audio selection

* Leverage list of supported desktops to perform is_desktop_profile check

* is_desktop_profile was missing a default return value

* Store return value for audio server

archinstall/lib/profiles.py

@@ -23,6 +23,23 @@ def grab_url_data(path):
 	return response.read()
 
 
+def is_desktop_profile(profile) -> bool:
+	if str(profile) == 'Profile(desktop)':
+		return True
+
+	desktop_profile = Profile(None, "desktop")
+	with open(desktop_profile.path, 'r') as source:
+		source_data = source.read()
+
+		if '__name__' in source_data and '__supported__' in source_data:
+			with desktop_profile.load_instructions(namespace=f"{desktop_profile.namespace}.py") as imported:
+				if hasattr(imported, '__supported__'):
+					desktop_profiles = imported.__supported__
+					return str(profile) in [f"Profile({s})" for s in desktop_profiles]
+
+	return False
+
+
 def list_profiles(filter_irrelevant_macs=True, subpath='', filter_top_level_profiles=False):
 	# TODO: Grab from github page as well, not just local static files
 	if filter_irrelevant_macs:

archinstall/lib/user_interaction.py

@@ -372,11 +372,12 @@ def ask_for_bootloader() -> str:
 	return bootloader
 
 
-def ask_for_audio_selection():
+def ask_for_audio_selection(desktop=True):
-	audio = "pulseaudio"  # Default for most desktop environments
+	audio = 'pipewire' if desktop else 'none'
-	pipewire_choice = input("Would you like to install pipewire instead of pulseaudio as the default audio server? [Y/n] ").lower()
+	choices = ['pipewire', 'pulseaudio'] if desktop else ['pipewire', 'pulseaudio', 'none']
-	if pipewire_choice in ("y", ""):
+	selection = generic_select(choices, f'Choose an audio server or leave blank to use {audio}: ', options_output=True)
-		audio = "pipewire"
+	if selection != "":
+		audio = selection
 
 	return audio
 

examples/guided.py

@@ -7,7 +7,7 @@ import archinstall
 from archinstall.lib.general import run_custom_user_commands
 from archinstall.lib.hardware import *
 from archinstall.lib.networking import check_mirror_reachable
-from archinstall.lib.profiles import Profile
+from archinstall.lib.profiles import Profile, is_desktop_profile
 
 if archinstall.arguments.get('help'):
 	print("See `man archinstall` for help.")
@@ -212,13 +212,8 @@ def ask_user_questions():
 
 	# Ask about audio server selection if one is not already set
 	if not archinstall.arguments.get('audio', None):
-		# only ask for audio server selection on a desktop profile
+		# The argument to ask_for_audio_selection lets the library know if it's a desktop profile
-		if str(archinstall.arguments['profile']) == 'Profile(desktop)':
+		archinstall.arguments['audio'] = archinstall.ask_for_audio_selection(is_desktop_profile(archinstall.arguments['profile']))
-			archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
-		else:
-			# packages installed by a profile may depend on audio and something may get installed anyways, not much we can do about that.
-			# we will not try to remove packages post-installation to not have audio, as that may cause multiple issues
-			archinstall.arguments['audio'] = None
 
 	# Ask for preferred kernel:
 	if not archinstall.arguments.get("kernels", None):

profiles/desktop.py

@@ -21,6 +21,21 @@ __packages__ = [
 	'xdg-utils',
 ]
 
+__supported__ = [
+	'gnome',
+	'kde',
+	'awesome',
+	'sway',
+	'cinnamon',
+	'xfce4',
+	'lxqt',
+	'i3',
+	'budgie',
+	'mate',
+	'deepin',
+	'enlightenment',
+]
+
 
 def _prep_function(*args, **kwargs):
 	"""
@@ -30,22 +45,7 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
-	supported_desktops = [
+	desktop = archinstall.generic_select(__supported__, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True)
-		'gnome',
-		'kde',
-		'awesome',
-		'sway',
-		'cinnamon',
-		'xfce4',
-		'lxqt',
-		'i3',
-		'budgie',
-		'mate',
-		'deepin',
-		'enlightenment',
-	]
-
-	desktop = archinstall.generic_select(supported_desktops, 'Select your desired desktop environment: ', allow_empty_input=False, sort=True)
 
 	# Temporarily store the selected desktop profile
 	# in a session-safe location, since this module will get reloaded