Full mypy compliance and small fixes (#1777)

* Fix mypy compliance

---------

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

1 files changed, 40 insertions, 38 deletions

diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py
index b7ab690d..66230e24 100644
--- a/archinstall/lib/models/network_configuration.py
+++ b/archinstall/lib/models/network_configuration.py
@@ -1,8 +1,9 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+import logging
+from dataclasses import dataclass, field
 from enum import Enum
-from typing import List, Optional, Dict, Union, Any, TYPE_CHECKING
+from typing import List, Optional, Dict, Union, Any, TYPE_CHECKING, Tuple
 
 from ..output import log
 from ..storage import storage
@@ -24,7 +25,7 @@ class NetworkConfiguration:
 	ip: Optional[str] = None
 	dhcp: bool = True
 	gateway: Optional[str] = None
-	dns: Union[None, List[str]] = None
+	dns: List[str] = field(default_factory=list)
 
 	def __str__(self):
 		if self.is_iso():
@@ -53,6 +54,33 @@ class NetworkConfiguration:
 
 		return data
 
+	def as_systemd_config(self) -> str:
+		match: List[Tuple[str, str]] = []
+		network: List[Tuple[str, str]] = []
+
+		if self.iface:
+			match.append(('Name', self.iface))
+
+		if self.dhcp:
+			network.append(('DHCP', 'yes'))
+		else:
+			if self.ip:
+				network.append(('Address', self.ip))
+			if self.gateway:
+				network.append(('Gateway', self.gateway))
+			for dns in self.dns:
+				network.append(('DNS', dns))
+
+		config = {'Match': match, 'Network': network}
+
+		config_str = ''
+		for top, entries in config.items():
+			config_str += f'[{top}]\n'
+			config_str += '\n'.join([f'{k}={v}' for k, v in entries])
+			config_str += '\n\n'
+
+		return config_str
+
 	def json(self) -> Dict:
 		# for json serialization when calling json.dumps(...) on this class
 		return self.__dict__
@@ -90,41 +118,14 @@ class NetworkConfigurationHandler:
 			# Perform a copy of the config
 			if self._configuration.is_iso():
 				installation.copy_iso_network_config(
-					enable_services=True)  # Sources the ISO network configuration to the install medium.
+					enable_services=True # Sources the ISO network configuration to the install medium.
+				)
 			elif self._configuration.is_network_manager():
 				installation.add_additional_packages(["networkmanager"])
 				if (profile := storage['arguments'].get('profile_config')) and profile.is_desktop_type_profile:
 					installation.add_additional_packages(["network-manager-applet"])
 				installation.enable_service('NetworkManager.service')
 
-	def _backwards_compability_config(self, config: Union[str,Dict[str, str]]) -> Union[List[NetworkConfiguration], NetworkConfiguration, None]:
-		def get(config: Dict[str, str], key: str) -> List[str]:
-			if (value := config.get(key, None)) is not None:
-				return [value]
-			return []
-
-		if isinstance(config, str):  # is a ISO network
-			return NetworkConfiguration(NicType.ISO)
-		elif config.get('NetworkManager'):  # is a network manager configuration
-			return NetworkConfiguration(NicType.NM)
-		elif 'ip' in config:
-			return [NetworkConfiguration(
-				NicType.MANUAL,
-				iface=config.get('nic', ''),
-				ip=config.get('ip'),
-				gateway=config.get('gateway', ''),
-				dns=get(config, 'dns'),
-				dhcp=False
-			)]
-		elif 'nic' in config:
-			return [NetworkConfiguration(
-				NicType.MANUAL,
-				iface=config.get('nic', ''),
-				dhcp=True
-			)]
-		else:  # not recognized
-			return None
-
 	def _parse_manual_config(self, configs: List[Dict[str, Any]]) -> Optional[List[NetworkConfiguration]]:
 		configurations = []
 
@@ -145,13 +146,17 @@ class NetworkConfigurationHandler:
 					log(_('Manual nic configuration with no auto DHCP requires an IP address'), fg='red')
 					exit(1)
 
+				dns = manual_config.get('dns', [])
+				if not isinstance(dns, list):
+					dns = [dns]
+
 				configurations.append(
 					NetworkConfiguration(
 						NicType.MANUAL,
 						iface=iface,
 						ip=ip,
 						gateway=manual_config.get('gateway', ''),
-						dns=manual_config.get('dns', []),
+						dns=dns,
 						dhcp=False
 					)
 				)
@@ -176,8 +181,5 @@ class NetworkConfigurationHandler:
 				self._configuration = NetworkConfiguration(type_)
 			else:  # manual configuration settings
 				self._configuration = self._parse_manual_config([config])
-		else:  # old style definitions
-			network_config = self._backwards_compability_config(config)
-			if network_config:
-				return network_config
-			return None
+		else:
+			log(f'Unable to parse network configuration: {config}', level=logging.DEBUG)