Cleanup imports and unused code (#1801)

* Cleanup imports and unused code

* Update build check

* Keep deprecation exception

* Simplify logging

---------

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

2 files changed, 9 insertions, 14 deletions

diff --git a/archinstall/lib/models/bootloader.py b/archinstall/lib/models/bootloader.py
index 38254c99..e21cda33 100644
--- a/archinstall/lib/models/bootloader.py
+++ b/archinstall/lib/models/bootloader.py
@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-import logging
 import sys
 from enum import Enum
 from typing import List
 
-from ..hardware import has_uefi
-from ..output import log
+from ..hardware import SysInfo
+from ..output import warn
 
 
 class Bootloader(Enum):
@@ -23,7 +22,7 @@ class Bootloader(Enum):
 
 	@classmethod
 	def get_default(cls) -> Bootloader:
-		if has_uefi():
+		if SysInfo.has_uefi():
 			return Bootloader.Systemd
 		else:
 			return Bootloader.Grub
@@ -35,6 +34,6 @@ class Bootloader(Enum):
 
 		if bootloader not in cls.values():
 			values = ', '.join(cls.values())
-			log(f'Invalid bootloader value "{bootloader}". Allowed values: {values}', level=logging.WARN)
+			warn(f'Invalid bootloader value "{bootloader}". Allowed values: {values}')
 			sys.exit(1)
 		return Bootloader(bootloader)
diff --git a/archinstall/lib/models/network_configuration.py b/archinstall/lib/models/network_configuration.py
index a8795fc1..93dd1c44 100644
--- a/archinstall/lib/models/network_configuration.py
+++ b/archinstall/lib/models/network_configuration.py
@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-import logging
 from dataclasses import dataclass, field
 from enum import Enum
 from typing import List, Optional, Dict, Union, Any, TYPE_CHECKING, Tuple
 
-from ..output import log
+from ..output import debug
 from ..profile import ProfileConfiguration
 
 if TYPE_CHECKING:
@@ -138,8 +137,7 @@ class NetworkConfigurationHandler:
 			iface = manual_config.get('iface', None)
 
 			if iface is None:
-				log(_('No iface specified for manual configuration'))
-				exit(1)
+				raise ValueError('No iface specified for manual configuration')
 
 			if manual_config.get('dhcp', False) or not any([manual_config.get(v, '') for v in ['ip', 'gateway', 'dns']]):
 				configurations.append(
@@ -148,8 +146,7 @@ class NetworkConfigurationHandler:
 			else:
 				ip = manual_config.get('ip', '')
 				if not ip:
-					log(_('Manual nic configuration with no auto DHCP requires an IP address'), fg='red')
-					exit(1)
+					raise ValueError('Manual nic configuration with no auto DHCP requires an IP address')
 
 				dns = manual_config.get('dns', [])
 				if not isinstance(dns, list):
@@ -173,8 +170,7 @@ class NetworkConfigurationHandler:
 			return NicType(nic_type)
 		except ValueError:
 			options = [e.value for e in NicType]
-			log(_('Unknown nic type: {}. Possible values are {}').format(nic_type, options), fg='red')
-			exit(1)
+			raise ValueError(f'Unknown nic type: {nic_type}. Possible values are {options}')
 
 	def parse_arguments(self, config: Any):
 		if isinstance(config, list):  # new data format
@@ -187,4 +183,4 @@ class NetworkConfigurationHandler:
 			else:  # manual configuration settings
 				self._configuration = self._parse_manual_config([config])
 		else:
-			log(f'Unable to parse network configuration: {config}', level=logging.DEBUG)
+			debug(f'Unable to parse network configuration: {config}')