Refactor logging and formatting

archinstall/applications/audio.py

@@ -1,9 +1,9 @@
 from typing import TYPE_CHECKING
 
 from archinstall.lib.hardware import SysInfo
+from archinstall.lib.log import debug
 from archinstall.lib.models.application import Audio, AudioConfiguration
 from archinstall.lib.models.users import User
-from archinstall.lib.output import debug
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer

archinstall/applications/bluetooth.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from archinstall.lib.output import debug
+from archinstall.lib.log import debug
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer

archinstall/applications/firewall.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
+from archinstall.lib.log import debug
 from archinstall.lib.models.application import Firewall, FirewallConfiguration
-from archinstall.lib.output import debug
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer

archinstall/applications/fonts.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
+from archinstall.lib.log import debug
 from archinstall.lib.models.application import FontsConfiguration
-from archinstall.lib.output import debug
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer

archinstall/applications/power_management.py

@@ -1,7 +1,7 @@
 from typing import TYPE_CHECKING
 
+from archinstall.lib.log import debug
 from archinstall.lib.models.application import PowerManagement, PowerManagementConfiguration
-from archinstall.lib.output import debug
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer

archinstall/applications/print_service.py

@@ -1,6 +1,6 @@
 from typing import TYPE_CHECKING
 
-from archinstall.lib.output import debug
+from archinstall.lib.log import debug
 
 if TYPE_CHECKING:
 	from archinstall.lib.installer import Installer

archinstall/default_profiles/desktop.py

@@ -1,8 +1,8 @@
 from typing import TYPE_CHECKING, Self, override
 
 from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType, SelectResult
+from archinstall.lib.log import info
 from archinstall.lib.menu.helpers import Selection
-from archinstall.lib.output import info
 from archinstall.lib.profile.profiles_handler import profile_handler
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.result import ResultType

archinstall/default_profiles/server.py

@@ -1,8 +1,8 @@
 from typing import TYPE_CHECKING, Self, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult
+from archinstall.lib.log import info
 from archinstall.lib.menu.helpers import Selection
-from archinstall.lib.output import info
 from archinstall.lib.profile.profiles_handler import profile_handler
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.result import ResultType

archinstall/lib/args.py

@@ -14,6 +14,7 @@ from urllib.request import Request, urlopen
 from pydantic.dataclasses import dataclass as p_dataclass
 
 from archinstall.lib.crypt import decrypt
+from archinstall.lib.log import debug, error, logger, warn
 from archinstall.lib.menu.util import get_password
 from archinstall.lib.models.application import ApplicationConfiguration, ZramConfiguration
 from archinstall.lib.models.authentication import AuthenticationConfiguration
@@ -28,7 +29,6 @@ from archinstall.lib.models.packages import Repository
 from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.models.users import Password, User, UserSerialization
-from archinstall.lib.output import debug, error, logger, warn
 from archinstall.lib.plugins import load_plugin
 from archinstall.lib.translationhandler import Language, tr, translation_handler
 from archinstall.lib.version import get_version

archinstall/lib/authentication/authentication_handler.py

@@ -3,9 +3,9 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 from archinstall.lib.command import SysCommandWorker
+from archinstall.lib.log import debug, info
 from archinstall.lib.models.authentication import AuthenticationConfiguration, U2FLoginConfiguration, U2FLoginMethod
 from archinstall.lib.models.users import User
-from archinstall.lib.output import debug, info
 from archinstall.lib.translationhandler import tr
 
 if TYPE_CHECKING:

archinstall/lib/boot.py

@@ -6,7 +6,7 @@ from typing import ClassVar, Self
 
 from archinstall.lib.command import SysCommand, SysCommandWorker
 from archinstall.lib.exceptions import SysCallError
-from archinstall.lib.output import error
+from archinstall.lib.log import error
 
 
 class Boot:

archinstall/lib/command.py

@@ -11,7 +11,7 @@ from types import TracebackType
 from typing import Any, Self, override
 
 from archinstall.lib.exceptions import RequirementError, SysCallError
-from archinstall.lib.output import debug, error, logger
+from archinstall.lib.log import debug, error, logger
 from archinstall.lib.utils.encoding import clear_vt100_escape_codes
 
 

archinstall/lib/configuration.py

@@ -8,10 +8,10 @@ from pydantic import TypeAdapter
 
 from archinstall.lib.args import ArchConfig, ArchConfigType
 from archinstall.lib.crypt import encrypt
+from archinstall.lib.log import debug, logger, warn
 from archinstall.lib.menu.helpers import Confirmation, Selection
 from archinstall.lib.menu.util import get_password, prompt_dir
 from archinstall.lib.models.network import NetworkConfiguration
-from archinstall.lib.output import debug, logger, warn
 from archinstall.lib.translationhandler import tr
 from archinstall.lib.utils.format import as_key_value_pair
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup

archinstall/lib/crypt.py

@@ -6,7 +6,7 @@ from pathlib import Path
 from cryptography.fernet import Fernet, InvalidToken
 from cryptography.hazmat.primitives.kdf.argon2 import Argon2id
 
-from archinstall.lib.output import debug
+from archinstall.lib.log import debug
 
 libcrypt = ctypes.CDLL('libcrypt.so')
 

archinstall/lib/disk/device_handler.py

@@ -15,6 +15,7 @@ from archinstall.lib.disk.utils import (
 	umount,
 )
 from archinstall.lib.exceptions import DiskError, SysCallError, UnknownFilesystemFormat
+from archinstall.lib.log import debug, error, info, log
 from archinstall.lib.models.device import (
 	DEFAULT_ITER_TIME,
 	BDevice,
@@ -35,7 +36,6 @@ from archinstall.lib.models.device import (
 	_PartitionInfo,
 )
 from archinstall.lib.models.users import Password
-from archinstall.lib.output import debug, error, info, log
 from archinstall.lib.pathnames import ARCHISO_MOUNTPOINT
 
 

archinstall/lib/disk/disk_menu.py

@@ -5,6 +5,7 @@ from typing import override
 from archinstall.lib.disk.device_handler import device_handler
 from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
 from archinstall.lib.disk.partitioning_menu import manual_partitioning
+from archinstall.lib.log import debug
 from archinstall.lib.menu.abstract_menu import AbstractSubMenu
 from archinstall.lib.menu.helpers import Confirmation, Notify, Selection, Table
 from archinstall.lib.menu.util import prompt_dir
@@ -35,7 +36,6 @@ from archinstall.lib.models.device import (
 	Unit,
 	_DeviceInfo,
 )
-from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 from archinstall.lib.utils.format import as_table
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup

archinstall/lib/disk/fido.py

@@ -4,9 +4,9 @@ from typing import ClassVar
 
 from archinstall.lib.command import SysCommand, SysCommandWorker
 from archinstall.lib.exceptions import SysCallError
+from archinstall.lib.log import error, info
 from archinstall.lib.models.device import Fido2Device
 from archinstall.lib.models.users import Password
-from archinstall.lib.output import error, info
 from archinstall.lib.utils.encoding import clear_vt100_escape_codes_from_str
 
 

archinstall/lib/disk/filesystem.py

@@ -13,6 +13,7 @@ from archinstall.lib.disk.lvm import (
 	lvm_vol_reduce,
 )
 from archinstall.lib.disk.utils import udev_sync
+from archinstall.lib.log import debug, info
 from archinstall.lib.models.device import (
 	DiskEncryption,
 	DiskLayoutConfiguration,
@@ -27,7 +28,6 @@ from archinstall.lib.models.device import (
 	Size,
 	Unit,
 )
-from archinstall.lib.output import debug, info
 
 
 class FilesystemHandler:

archinstall/lib/disk/luks.py

@@ -7,9 +7,9 @@ from types import TracebackType
 from archinstall.lib.command import SysCommand, SysCommandWorker, run
 from archinstall.lib.disk.utils import get_lsblk_info, umount
 from archinstall.lib.exceptions import DiskError, SysCallError
+from archinstall.lib.log import debug, info
 from archinstall.lib.models.device import DEFAULT_ITER_TIME
 from archinstall.lib.models.users import Password
-from archinstall.lib.output import debug, info
 from archinstall.lib.utils.util import generate_password
 
 

archinstall/lib/disk/lvm.py

@@ -7,6 +7,7 @@ from typing import Literal, overload
 from archinstall.lib.command import SysCommand, SysCommandWorker
 from archinstall.lib.disk.utils import udev_sync
 from archinstall.lib.exceptions import SysCallError
+from archinstall.lib.log import debug
 from archinstall.lib.models.device import (
 	LvmGroupInfo,
 	LvmPVInfo,
@@ -17,7 +18,6 @@ from archinstall.lib.models.device import (
 	Size,
 	Unit,
 )
-from archinstall.lib.output import debug
 
 
 def _lvm_info(

archinstall/lib/disk/utils.py

@@ -4,8 +4,8 @@ from pydantic import BaseModel
 
 from archinstall.lib.command import SysCommand
 from archinstall.lib.exceptions import DiskError, SysCallError
+from archinstall.lib.log import debug, info, warn
 from archinstall.lib.models.device import LsblkInfo
-from archinstall.lib.output import debug, info, warn
 
 
 class LsblkOutput(BaseModel):

archinstall/lib/general/general_menu.py

@@ -1,8 +1,8 @@
 from enum import Enum
 
 from archinstall.lib.locale.utils import list_timezones
+from archinstall.lib.log import warn
 from archinstall.lib.menu.helpers import Confirmation, Input, Selection
-from archinstall.lib.output import warn
 from archinstall.lib.translationhandler import Language, tr
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.result import ResultType

archinstall/lib/hardware.py

@@ -6,8 +6,8 @@ from typing import Self
 
 from archinstall.lib.command import SysCommand
 from archinstall.lib.exceptions import SysCallError
+from archinstall.lib.log import debug
 from archinstall.lib.networking import enrich_iface_types, list_interfaces
-from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 
 

archinstall/lib/installer.py

@@ -29,6 +29,7 @@ from archinstall.lib.exceptions import DiskError, HardwareIncompatibilityError,
 from archinstall.lib.hardware import SysInfo
 from archinstall.lib.linux_path import LPath
 from archinstall.lib.locale.utils import verify_keyboard_layout, verify_x11_keyboard_layout
+from archinstall.lib.log import debug, error, info, log, logger, warn
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
 from archinstall.lib.models.application import ZramAlgorithm
 from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
@@ -52,7 +53,6 @@ from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.users import User
-from archinstall.lib.output import debug, error, info, log, logger, warn
 from archinstall.lib.packages.packages import installed_package
 from archinstall.lib.pacman.config import PacmanConfig
 from archinstall.lib.pacman.pacman import Pacman

archinstall/lib/locale/utils.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 from archinstall.lib.command import SysCommand
 from archinstall.lib.exceptions import ServiceException, SysCallError
-from archinstall.lib.output import error
+from archinstall.lib.log import error
 from archinstall.lib.utils.util import running_from_iso
 
 

archinstall/lib/menu/abstract_menu.py

@@ -2,8 +2,8 @@ from enum import Enum
 from types import TracebackType
 from typing import Any, Self, override
 
+from archinstall.lib.log import error
 from archinstall.lib.menu.helpers import Selection
-from archinstall.lib.output import error
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.components import InstanceRunnable
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup

archinstall/lib/mirror/mirror_handler.py

@@ -2,10 +2,10 @@ import time
 import urllib.parse
 from pathlib import Path
 
+from archinstall.lib.log import debug, info
 from archinstall.lib.models import MirrorRegion
 from archinstall.lib.models.mirrors import MirrorStatusEntryV3, MirrorStatusListV3
 from archinstall.lib.networking import fetch_data_from_url
-from archinstall.lib.output import debug, info
 from archinstall.lib.pathnames import MIRRORLIST
 
 

archinstall/lib/models/bootloader.py

@@ -3,8 +3,8 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Any, Self, override
 
+from archinstall.lib.log import warn
 from archinstall.lib.models.config import SubConfig
-from archinstall.lib.output import warn
 from archinstall.lib.translationhandler import tr
 
 

archinstall/lib/models/device.py

@@ -12,9 +12,9 @@ from parted import Disk, Geometry, Partition
 from pydantic import BaseModel, Field, ValidationInfo, field_serializer, field_validator
 
 from archinstall.lib.hardware import SysInfo
+from archinstall.lib.log import debug
 from archinstall.lib.models.config import SubConfig
 from archinstall.lib.models.users import Password
-from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 
 ENC_IDENTIFIER = 'ainst'

archinstall/lib/models/mirrors.py

@@ -9,10 +9,10 @@ from typing import TYPE_CHECKING, Any, Self, TypedDict, override
 
 from pydantic import BaseModel, ValidationInfo, field_validator, model_validator
 
+from archinstall.lib.log import debug
 from archinstall.lib.models.config import SubConfig
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.networking import DownloadTimer, ping
-from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 
 if TYPE_CHECKING:

archinstall/lib/models/network.py

@@ -3,8 +3,8 @@ from dataclasses import dataclass, field
 from enum import Enum
 from typing import NotRequired, Self, TypedDict, override
 
+from archinstall.lib.log import debug
 from archinstall.lib.models.config import SubConfig
-from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 
 

archinstall/lib/network/wifi_handler.py

@@ -5,9 +5,9 @@ from typing import assert_never, override
 
 from archinstall.lib.command import SysCommand
 from archinstall.lib.exceptions import SysCallError
+from archinstall.lib.log import debug
 from archinstall.lib.models.network import WifiConfiguredNetwork, WifiNetwork
 from archinstall.lib.network.wpa_supplicant import WpaSupplicantConfig
-from archinstall.lib.output import debug
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.components import ConfirmationScreen, InputScreen, InstanceRunnable, LoadingScreen, NotifyScreen, TableSelectionScreen, tui
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup

archinstall/lib/network/wpa_supplicant.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass, field
 from pathlib import Path
 
+from archinstall.lib.log import debug
 from archinstall.lib.models.network import WifiNetwork
-from archinstall.lib.output import debug
 
 
 @dataclass

archinstall/lib/networking.py

@@ -13,7 +13,7 @@ from urllib.parse import urlencode
 from urllib.request import urlopen
 
 from archinstall.lib.exceptions import DownloadTimeout, SysCallError
-from archinstall.lib.output import debug, error, info
+from archinstall.lib.log import debug, error, info
 from archinstall.lib.pacman.pacman import Pacman
 
 

archinstall/lib/packages/packages.py

@@ -1,9 +1,9 @@
 from functools import lru_cache
 
 from archinstall.lib.exceptions import SysCallError
+from archinstall.lib.log import debug
 from archinstall.lib.menu.helpers import Loading, Notify, Selection
 from archinstall.lib.models.packages import AvailablePackage, LocalPackage, PackageGroup, Repository
-from archinstall.lib.output import debug
 from archinstall.lib.pacman.pacman import Pacman
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup

archinstall/lib/packages/util.py

@@ -1,6 +1,6 @@
 from functools import lru_cache
 
-from archinstall.lib.output import debug
+from archinstall.lib.log import debug
 from archinstall.lib.packages.packages import check_package_upgrade
 
 

archinstall/lib/pacman/pacman.py

@@ -5,7 +5,7 @@ from pathlib import Path
 
 from archinstall.lib.command import SysCommand
 from archinstall.lib.exceptions import RequirementError
-from archinstall.lib.output import error, info, warn
+from archinstall.lib.log import error, info, warn
 from archinstall.lib.pathnames import PACMAN_CONF
 from archinstall.lib.plugins import plugins
 from archinstall.lib.translationhandler import tr

archinstall/lib/plugins.py

@@ -7,7 +7,7 @@ import urllib.request
 from importlib import metadata
 from pathlib import Path
 
-from archinstall.lib.output import error, info, warn
+from archinstall.lib.log import error, info, warn
 from archinstall.lib.version import get_version
 
 plugins = {}

archinstall/lib/profile/profiles_handler.py

@@ -9,9 +9,9 @@ from typing import TYPE_CHECKING, NotRequired, TypedDict
 
 from archinstall.default_profiles.profile import CustomSetting, GreeterType, Profile
 from archinstall.lib.hardware import GfxDriver, GfxPackage
+from archinstall.lib.log import debug, error, info
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.networking import fetch_data_from_url
-from archinstall.lib.output import debug, error, info
 from archinstall.lib.translationhandler import tr
 
 if TYPE_CHECKING:

archinstall/lib/translationhandler.py

@@ -9,7 +9,7 @@ from typing import override
 
 from archinstall.lib.command import SysCommand
 from archinstall.lib.exceptions import SysCallError
-from archinstall.lib.output import debug
+from archinstall.lib.log import debug
 from archinstall.lib.utils.util import running_from_iso
 
 

archinstall/main.py

@@ -11,10 +11,10 @@ from pathlib import Path
 from archinstall.lib.args import ArchConfigHandler, SubCommand
 from archinstall.lib.disk.utils import disk_layouts
 from archinstall.lib.hardware import SysInfo
+from archinstall.lib.log import debug, error, info, logger, share_install_log, warn
 from archinstall.lib.menu.helpers import Confirmation
 from archinstall.lib.network.wifi_handler import WifiHandler
 from archinstall.lib.networking import ping
-from archinstall.lib.output import debug, error, info, logger, share_install_log, warn
 from archinstall.lib.packages.util import check_version_upgrade
 from archinstall.lib.pacman.pacman import Pacman
 from archinstall.lib.translationhandler import tr, translation_handler

archinstall/scripts/guided.py

@@ -12,13 +12,13 @@ from archinstall.lib.disk.utils import disk_layouts
 from archinstall.lib.general.general_menu import PostInstallationAction, select_post_installation
 from archinstall.lib.global_menu import GlobalMenu
 from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands
+from archinstall.lib.log import debug, error, info
 from archinstall.lib.menu.util import delayed_warning
 from archinstall.lib.mirror.mirror_handler import MirrorListHandler
 from archinstall.lib.models import Bootloader
 from archinstall.lib.models.device import DiskLayoutType, EncryptionType
 from archinstall.lib.models.users import User
 from archinstall.lib.network.network_handler import install_network_config
-from archinstall.lib.output import debug, error, info
 from archinstall.lib.packages.util import check_version_upgrade
 from archinstall.lib.profile.profiles_handler import profile_handler
 from archinstall.lib.translationhandler import tr

archinstall/scripts/minimal.py

@@ -4,12 +4,12 @@ from archinstall.lib.configuration import ConfigurationOutput
 from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
 from archinstall.lib.disk.filesystem import FilesystemHandler
 from archinstall.lib.installer import Installer
+from archinstall.lib.log import debug, error, info
 from archinstall.lib.menu.util import delayed_warning
 from archinstall.lib.models import Bootloader
 from archinstall.lib.models.profile import ProfileConfiguration
 from archinstall.lib.models.users import Password, User
 from archinstall.lib.network.network_handler import install_network_config
-from archinstall.lib.output import debug, error, info
 from archinstall.lib.profile.profiles_handler import profile_handler
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.components import tui

archinstall/scripts/only_hd.py

@@ -7,8 +7,8 @@ from archinstall.lib.disk.filesystem import FilesystemHandler
 from archinstall.lib.disk.utils import disk_layouts
 from archinstall.lib.global_menu import GlobalMenu
 from archinstall.lib.installer import Installer
+from archinstall.lib.log import debug, error
 from archinstall.lib.menu.util import delayed_warning
-from archinstall.lib.output import debug, error
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.components import tui
 

archinstall/tui/components.py

@@ -19,7 +19,7 @@ from textual.widgets.option_list import Option
 from textual.widgets.selection_list import Selection
 from textual.worker import WorkerCancelled
 
-from archinstall.lib.output import debug
+from archinstall.lib.log import debug
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.result import Result, ResultType

tests/test_share_log.py

@@ -9,7 +9,7 @@ import pytest
 from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
 
-from archinstall.lib.output import share_install_log
+from archinstall.lib.log import share_install_log
 
 urls = st.builds(
 	'{}://{}.{}/{}'.format,