Update

Author: svartkanin

archinstall/default_profiles/desktops/plasma.py

@@ -1,30 +1,67 @@
-from enum import Enum
+from enum import StrEnum
 from typing import override
 
 from archinstall.default_profiles.profile import CustomSetting, DisplayServerType, GreeterType, Profile, ProfileType
 from archinstall.lib.menu.helpers import Selection
+from archinstall.lib.packages.packages import available_package, package_group_info
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
 
-class PlasmaFlavor(Enum):
-	Plasma = 'plasma'
+class PlasmaFlavor(StrEnum):
 	Meta = 'plasma-meta'
+	Plasma = 'plasma'
 	Desktop = 'plasma-desktop'
 
 	def show(self) -> str:
 		match self:
-			case PlasmaFlavor.Plasma:
-				desc = tr('Extensive KDE Plasma installation')
 			case PlasmaFlavor.Meta:
+				return f'({tr("Recommended")}) {self.value}'
+			case PlasmaFlavor.Plasma | PlasmaFlavor.Desktop:
+				return self.value
+
+	def package_details(self) -> str:
+		ty = ''
+		details = ''
+		desc = ''
+
+		match self:
+			case PlasmaFlavor.Meta:
+				ty = tr('Package')
 				desc = tr('Curated selection of KDE Plasma packages')
+				info = available_package(self.value)
+
+				if info is not None:
+					details = tr('Dependencies') + '\n'
+					details += '\n'.join(f'- {entry}' for entry in info.get_depends_on)
+			case PlasmaFlavor.Plasma:
+				ty = tr('Package group')
+				desc = tr('Extensive KDE Plasma installation')
+				group = package_group_info(self.value)
+
+				if group is not None:
+					details = tr('Packages in group') + '\n'
+					details += '\n'.join(f'- {entry}' for entry in group.packages)
 			case PlasmaFlavor.Desktop:
+				ty = tr('Package group')
 				desc = tr('Minimal KDE Plasma installation')
-			case _:
-				raise ValueError(f'Unknown Plasma flavor: {self}')
+				info = available_package(self.value)
 
-		return f'{self.value}: {desc}'
+				if info is not None:
+					details = tr('Dependencies') + '\n'
+					details += '\n'.join(f'- {entry}' for entry in info.get_depends_on)
+
+		return f'{tr("Type")}: {ty}\n{tr("Description")}: {desc}\n\n{details}'
+
+	def packages(self) -> list[str]:
+		match self:
+			case PlasmaFlavor.Meta:
+				return ['plasma-meta']
+			case PlasmaFlavor.Plasma:
+				return ['plasma']
+			case PlasmaFlavor.Desktop:
+				return ['plasma-desktop']
 
 
 class PlasmaProfile(Profile):
@@ -39,22 +76,13 @@ def __init__(self) -> None:
 	@property
 	@override
 	def packages(self) -> list[str]:
-		flavor_str = self.custom_settings.get(CustomSetting.PlasmaFlavor, PlasmaFlavor.Plasma.value)
-		flavor = PlasmaFlavor(flavor_str)
+		flavor_str = self.custom_settings.get(CustomSetting.PlasmaFlavor)
 
-		match flavor:
-			case PlasmaFlavor.Plasma:
-				return [
-					'plasma',
-				]
-			case PlasmaFlavor.Meta:
-				return [
-					'plasma-meta',
-				]
-			case PlasmaFlavor.Desktop:
-				return [
-					'plasma-desktop',
-				]
+		if flavor_str is not None:
+			flavor = PlasmaFlavor(flavor_str)
+			return flavor.packages()
+		else:
+			return PlasmaFlavor.Meta.packages()  # use plasma-meta as the recommended default
 
 	@property
 	@override
@@ -64,7 +92,14 @@ def default_greeter_type(self) -> GreeterType:
 	async def _select_flavor(self) -> None:
 		header = tr('Select a flavor of KDE Plasma to install') + '\n'
 
-		items = [MenuItem(s.show(), value=s) for s in PlasmaFlavor]
+		items = [
+			MenuItem(
+				s.show(),
+				value=s,
+				preview_action=lambda x: x.value.package_details() if x.value else None,
+			)
+			for s in PlasmaFlavor
+		]
 		group = MenuItemGroup(items, sort_items=False)
 
 		default = self.custom_settings.get(CustomSetting.PlasmaFlavor, None)
@@ -74,6 +109,7 @@ async def _select_flavor(self) -> None:
 			group,
 			header=header,
 			allow_skip=False,
+			preview_location='right',
 		).show()
 
 		if result.type_ == ResultType.Selection:

archinstall/lib/models/packages.py

@@ -142,12 +142,26 @@ def info(self) -> str:
 
 		return output
 
+	@cached_property
+	def get_depends_on(self) -> list[str]:
+		return [entry.strip() for entry in self.depends_on.split(' ') if entry.strip()]
+
+	@cached_property
+	def get_optional_deps(self) -> list[str]:
+		return [entry.strip() for entry in self.optional_deps.split(' ') if entry.strip()]
+
 
 @dataclass
 class PackageGroup:
 	name: str
 	packages: list[str] = field(default_factory=list)
 
+	@classmethod
+	def from_package_group_output(cls, data: list[str]) -> Self:
+		name = data[0].split()[0].strip()
+		packages = [line.split()[1].strip() for line in data if line.strip()]
+		return cls(name, packages)
+
 	@classmethod
 	def from_available_packages(
 		cls,

archinstall/lib/packages/packages.py

@@ -34,6 +34,34 @@ def check_package_upgrade(package: str) -> str | None:
 	return None
 
 
+@lru_cache
+def package_group_info(package: str) -> PackageGroup | None:
+	try:
+		package_info: list[str] = []
+		for line in Pacman.run(f'-Sg {package}'):
+			package_info.append(line.decode().strip())
+		group = PackageGroup.from_package_group_output(package_info)
+		return group
+	except SysCallError:
+		debug(f'Failed to get package info: {package}')
+
+	return None
+
+
+@lru_cache
+def available_package(package: str) -> AvailablePackage | None:
+	try:
+		package_info: list[str] = []
+		for line in Pacman.run(f'-S --info {package}'):
+			package_info.append(line.decode().strip())
+
+		return _parse_package_output(package_info, AvailablePackage)
+	except SysCallError:
+		pass
+
+	return None
+
+
 @lru_cache
 def list_available_packages(
 	repositories: tuple[Repository, ...],
@@ -74,12 +102,18 @@ def _parse_package_output[PackageType: (AvailablePackage, LocalPackage)](
 	cls: type[PackageType],
 ) -> PackageType:
 	package = {}
+	current_key = None
 
 	for line in package_meta:
-		if ':' in line:
-			key, value = line.split(':', 1)
-			key = _normalize_key_name(key)
-			package[key] = value.strip()
+		if not line.strip():
+			continue
+
+		if ':' in line and not line.startswith('  '):
+			key_raw, value = line.split(':', 1)
+			current_key = _normalize_key_name(key_raw)
+			package[current_key] = value.strip()
+		elif current_key:
+			package[current_key] += ' ' + line.strip()
 
 	return cls.model_validate(package)