use generic packages tree for all repos

docs/configuration.rst

@@ -146,8 +146,6 @@ Build related configuration. Group name can refer to architecture, e.g. ``build:
 
 Base repository settings.
 
-* ``architecture`` - repository architecture, string. This field is read-only and generated automatically from run options if possible.
-* ``name`` - repository name, string. This field is read-only and generated automatically from run options if possible.
 * ``root`` - root path for application, string, required.
 
 ``sign:*`` groups

package/share/ahriman/settings/ahriman.ini.d/00-triggers.ini

@@ -1,6 +1,5 @@
 [build]
 ; List of well-known triggers. Used only for configuration purposes.
-triggers_known[] = ahriman.core.archive.ArchiveTrigger
 triggers_known[] = ahriman.core.distributed.WorkerLoaderTrigger
 triggers_known[] = ahriman.core.distributed.WorkerTrigger
 triggers_known[] = ahriman.core.support.KeyringTrigger

src/ahriman/application/handlers/status.py

@@ -66,7 +66,7 @@ class Status(Handler):
         Status.check_status(args.exit_code, packages)
 
         comparator: Callable[[tuple[Package, BuildStatus]], Comparable] = lambda item: item[0].base
-        filter_fn: Callable[[tuple[Package, BuildStatus]], bool] = \
+        filter_fn: Callable[[tuple[Package, BuildStatus]], bool] =\
             lambda item: args.status is None or item[1].status == args.status
         for package, package_status in sorted(filter(filter_fn, packages), key=comparator):
             PackagePrinter(package, package_status)(verbose=args.info)

src/ahriman/application/handlers/validate.py

@@ -52,7 +52,7 @@ class Validate(Handler):
         """
         from ahriman.core.configuration.validator import Validator
 
-        schema = Validate.schema(configuration)
+        schema = Validate.schema(repository_id, configuration)
         validator = Validator(configuration=configuration, schema=schema)
 
         if validator.validate(configuration.dump()):
@@ -83,11 +83,12 @@ class Validate(Handler):
         return parser
 
     @staticmethod
-    def schema(configuration: Configuration) -> ConfigurationSchema:
+    def schema(repository_id: RepositoryId, configuration: Configuration) -> ConfigurationSchema:
         """
         get schema with triggers
 
         Args:
+            repository_id(RepositoryId): repository unique identifier
             configuration(Configuration): configuration instance
 
         Returns:
@@ -106,12 +107,12 @@ class Validate(Handler):
                 continue
 
             # default settings if any
-            for schema_name, schema in trigger_class.configuration_schema(None).items():
+            for schema_name, schema in trigger_class.configuration_schema(repository_id, None).items():
                 erased = Validate.schema_erase_required(copy.deepcopy(schema))
                 root[schema_name] = Validate.schema_merge(root.get(schema_name, {}), erased)
 
             # settings according to enabled triggers
-            for schema_name, schema in trigger_class.configuration_schema(configuration).items():
+            for schema_name, schema in trigger_class.configuration_schema(repository_id, configuration).items():
                 root[schema_name] = Validate.schema_merge(root.get(schema_name, {}), copy.deepcopy(schema))
 
         return root

src/ahriman/core/alpm/repo.py

@@ -88,24 +88,22 @@ class Repo(LazyLogging):
         check_output("repo-add", *self.sign_args, str(self.repo_path),
                      cwd=self.root, logger=self.logger, user=self.uid)
 
-    def remove(self, package_name: str | None, filename: Path) -> None:
+    def remove(self, package: str, filename: Path) -> None:
         """
         remove package from repository
 
         Args:
-            package_name(str | None): package name to remove. If none set, it will be guessed from filename
+            package(str): package name to remove
             filename(Path): package filename to remove
         """
-        package_name = package_name or filename.name.rsplit("-", maxsplit=3)[0]
-
         # remove package and signature (if any) from filesystem
         for full_path in self.root.glob(f"**/{filename.name}*"):
             full_path.unlink()
 
         # remove package from registry
         check_output(
-            "repo-remove", *self.sign_args, str(self.repo_path), package_name,
-            exception=BuildError.from_process(package_name),
+            "repo-remove", *self.sign_args, str(self.repo_path), package,
+            exception=BuildError.from_process(package),
             cwd=self.root,
             logger=self.logger,
             user=self.uid,

src/ahriman/core/archive/__init__.py

@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2021-2025 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-from ahriman.core.archive.archive_trigger import ArchiveTrigger

src/ahriman/core/archive/archive_tree.py

@@ -1,127 +0,0 @@
-#
-# Copyright (c) 2021-2025 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-import datetime
-
-from pathlib import Path
-
-from ahriman.core.alpm.repo import Repo
-from ahriman.core.log import LazyLogging
-from ahriman.core.utils import utcnow
-from ahriman.models.package import Package
-from ahriman.models.repository_paths import RepositoryPaths
-
-
-class ArchiveTree(LazyLogging):
-    """
-    wrapper around archive tree
-
-    Attributes:
-        paths(RepositoryPaths): repository paths instance
-        repository_id(RepositoryId): repository unique identifier
-        sign_args(list[str]): additional args which have to be used to sign repository archive
-    """
-
-    def __init__(self, repository_path: RepositoryPaths, sign_args: list[str]) -> None:
-        """
-        Args:
-            repository_path(RepositoryPaths): repository paths instance
-            sign_args(list[str]): additional args which have to be used to sign repository archive
-        """
-        self.paths = repository_path
-        self.repository_id = repository_path.repository_id
-        self.sign_args = sign_args
-
-    def repository_for(self, date: datetime.date | None = None) -> Path:
-        """
-        get full path to repository at the specified date
-
-        Args:
-            date(datetime.date | None, optional): date to generate path. If none supplied then today will be used
-
-        Returns:
-            Path: path to the repository root
-        """
-        date = date or utcnow().today()
-        return (
-            self.paths.archive
-            / "repos"
-            / date.strftime("%Y")
-            / date.strftime("%m")
-            / date.strftime("%d")
-            / self.repository_id.name
-            / self.repository_id.architecture
-        )
-
-    def symlinks_create(self, packages: list[Package]) -> None:
-        """
-        create symlinks for the specified packages in today's repository
-
-        Args:
-            packages(list[Package]): list of packages to be updated
-        """
-        root = self.repository_for()
-        repo = Repo(self.repository_id.name, self.paths, self.sign_args, root)
-
-        for package in packages:
-            archive = self.paths.archive_for(package.base)
-
-            for package_name, single in package.packages.items():
-                if single.filename is None:
-                    self.logger.warning("received empty package filename for %s", package_name)
-                    continue
-
-                has_file = False
-                for file in archive.glob(f"{single.filename}*"):
-                    if not (symlink := root / file.name).exists():
-                        has_file |= True
-                        symlink.symlink_to(file.relative_to(symlink.parent, walk_up=True))
-
-                if has_file:
-                    repo.add(root / single.filename)
-
-    def symlinks_fix(self) -> None:
-        """
-        remove broken symlinks across all repositories
-        """
-        for root, _, files in self.paths.archive.walk():
-            *_, name, architecture = root.parts
-            if self.repository_id.name != name or self.repository_id.architecture != architecture:
-                continue  # we only process same name repositories
-
-            for file in files:
-                path = root / file
-                if not path.is_symlink():
-                    continue  # find symlinks only
-                if path.exists():
-                    continue  # filter out not broken symlinks
-
-                repo = Repo(self.repository_id.name, self.paths, self.sign_args, root)
-                repo.remove(None, path)
-
-    def tree_create(self) -> None:
-        """
-        create repository tree for current repository
-        """
-        path = self.repository_for()
-        if path.exists():
-            return
-
-        with self.paths.preserve_owner(self.paths.archive):
-            path.mkdir(0o755, parents=True)

src/ahriman/core/archive/archive_trigger.py

@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2021-2025 ahriman team.
-#
-# This file is part of ahriman
-# (see https://github.com/arcan1s/ahriman).
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-from ahriman.core import context
-from ahriman.core.archive.archive_tree import ArchiveTree
-from ahriman.core.configuration import Configuration
-from ahriman.core.sign.gpg import GPG
-from ahriman.core.triggers import Trigger
-from ahriman.models.package import Package
-from ahriman.models.repository_id import RepositoryId
-from ahriman.models.result import Result
-
-
-class ArchiveTrigger(Trigger):
-    """
-    archive repository extension
-
-    Attributes:
-        paths(RepositoryPaths): repository paths instance
-    """
-
-    def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
-        """
-        Args:
-            repository_id(RepositoryId): repository unique identifier
-            configuration(Configuration): configuration instance
-        """
-        Trigger.__init__(self, repository_id, configuration)
-
-        self.paths = configuration.repository_paths
-
-        ctx = context.get()
-        self.tree = ArchiveTree(self.paths, ctx.get(GPG).repository_sign_args)
-
-    def on_result(self, result: Result, packages: list[Package]) -> None:
-        """
-        run trigger
-
-        Args:
-            result(Result): build result
-            packages(list[Package]): list of all available packages
-        """
-        self.tree.symlinks_create(packages)
-
-    def on_start(self) -> None:
-        """
-        trigger action which will be called at the start of the application
-        """
-        self.tree.tree_create()
-
-    def on_stop(self) -> None:
-        """
-        trigger action which will be called before the stop of the application
-        """
-        self.tree.symlinks_fix()

src/ahriman/core/configuration/configuration.py

@@ -43,6 +43,7 @@ class Configuration(configparser.RawConfigParser):
         SYSTEM_CONFIGURATION_PATH(Path): (class attribute) default system configuration path distributed by package
         includes(list[Path]): list of includes which were read
         path(Path | None): path to root configuration file
+        repository_id(RepositoryId | None): repository unique identifier
 
     Examples:
         Configuration class provides additional method in order to handle application configuration. Since this class is
@@ -93,7 +94,7 @@ class Configuration(configparser.RawConfigParser):
             },
         )
 
-        self._repository_id: RepositoryId | None = None
+        self.repository_id: RepositoryId | None = None
         self.path: Path | None = None
         self.includes: list[Path] = []
 
@@ -128,32 +129,6 @@ class Configuration(configparser.RawConfigParser):
         """
         return self.getpath("settings", "logging")
 
-    @property
-    def repository_id(self) -> RepositoryId | None:
-        """
-        repository identifier
-
-        Returns:
-            RepositoryId: repository unique identifier
-        """
-        return self._repository_id
-
-    @repository_id.setter
-    def repository_id(self, repository_id: RepositoryId | None) -> None:
-        """
-        setter for repository identifier
-
-        Args:
-            repository_id(RepositoryId | None): repository unique identifier
-        """
-        self._repository_id = repository_id
-        if repository_id is None or repository_id.is_empty:
-            self.remove_option("repository", "name")
-            self.remove_option("repository", "architecture")
-        else:
-            self.set_option("repository", "name", repository_id.name)
-            self.set_option("repository", "architecture", repository_id.architecture)
-
     @property
     def repository_name(self) -> str:
         """

src/ahriman/core/configuration/schema.py

@@ -249,10 +249,6 @@ CONFIGURATION_SCHEMA: ConfigurationSchema = {
     "repository": {
         "type": "dict",
         "schema": {
-            "architecture": {
-                "type": "string",
-                "empty": False,
-            },
             "name": {
                 "type": "string",
                 "empty": False,

src/ahriman/core/repository/executor.py

@@ -17,9 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-import shutil
-
-from collections.abc import Generator, Iterable
+from collections.abc import Iterable
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -27,7 +25,7 @@ from ahriman.core.build_tools.package_archive import PackageArchive
 from ahriman.core.build_tools.task import Task
 from ahriman.core.repository.cleaner import Cleaner
 from ahriman.core.repository.package_info import PackageInfo
-from ahriman.core.utils import atomic_move, filelock, package_like, safe_filename
+from ahriman.core.utils import atomic_move, safe_filename
 from ahriman.models.changes import Changes
 from ahriman.models.event import EventType
 from ahriman.models.package import Package
@@ -41,36 +39,6 @@ class Executor(PackageInfo, Cleaner):
     trait for common repository update processes
     """
 
-    def _archive_lookup(self, package: Package) -> Generator[Path, None, None]:
-        """
-        check if there is a rebuilt package already
-
-        Args:
-            package(Package): package to check
-
-        Yields:
-            Path: list of built packages and signatures if available, empty list otherwise
-        """
-        archive = self.paths.archive_for(package.base)
-
-        # find all packages which have same version
-        same_version = [
-            built
-            for path in filter(package_like, archive.iterdir())
-            if (built := Package.from_archive(path, self.pacman)).version == package.version
-        ]
-        # no packages of the same version found
-        if not same_version:
-            return
-
-        packages = [single for built in same_version for single in built.packages.values()]
-        # all packages must be either any or same architecture
-        if not all(single.architecture in ("any", self.architecture) for single in packages):
-            return
-
-        for single in packages:
-            yield from archive.glob(f"{single.filename}*")
-
     def _archive_rename(self, description: PackageDescription, package_base: str) -> None:
         """
         rename package archive removing special symbols
@@ -80,7 +48,7 @@ class Executor(PackageInfo, Cleaner):
             package_base(str): package base name
         """
         if description.filename is None:
-            self.logger.warning("received empty package filename for base %s", package_base)
+            self.logger.warning("received empty package name for base %s", package_base)
             return  # suppress type checking, it never can be none actually
 
         if (safe := safe_filename(description.filename)) != description.filename:
@@ -106,17 +74,7 @@ class Executor(PackageInfo, Cleaner):
         task = Task(package, self.configuration, self.architecture, self.paths)
         patches = self.reporter.package_patches_get(package.base, None)
         commit_sha = task.init(path, patches, local_version)
-
-        loaded_package = Package.from_build(path, self.architecture, None)
-        if prebuilt := list(self._archive_lookup(loaded_package)):
-            self.logger.info("using prebuilt packages for %s-%s", loaded_package.base, loaded_package.version)
-            built = []
-            for artefact in prebuilt:
-                with filelock(artefact):
-                    shutil.copy(artefact, path)
-                built.append(path / artefact.name)
-        else:
-            built = task.build(path, PACKAGER=packager)
+        built = task.build(path, PACKAGER=packager)
 
         package.with_packages(built, self.pacman)
         for src in built:
@@ -161,7 +119,7 @@ class Executor(PackageInfo, Cleaner):
             packager_key(str | None): packager key identifier
         """
         if filename is None:
-            self.logger.warning("received empty package filename for base %s", package_base)
+            self.logger.warning("received empty package name for base %s", package_base)
             return  # suppress type checking, it never can be none actually
 
         # in theory, it might be NOT packages directory, but we suppose it is

src/ahriman/core/triggers/trigger.py

@@ -80,7 +80,8 @@ class Trigger(LazyLogging):
         return self.repository_id.architecture
 
     @classmethod
-    def configuration_schema(cls, configuration: Configuration | None) -> ConfigurationSchema:
+    def configuration_schema(cls, repository_id: RepositoryId,
+                             configuration: Configuration | None) -> ConfigurationSchema:
         """
         configuration schema based on supplied service configuration
 
@@ -88,6 +89,7 @@ class Trigger(LazyLogging):
             Schema must be in cerberus format, for details and examples you can check built-in triggers.
 
         Args:
+            repository_id(str): repository unique identifier
             configuration(Configuration | None): configuration instance. If set to None, the default schema
                 should be returned
 
@@ -99,15 +101,13 @@ class Trigger(LazyLogging):
 
         result: ConfigurationSchema = {}
         for target in cls.configuration_sections(configuration):
-            for section in configuration.sections():
-                if not (section == target or section.startswith(f"{target}:")):
-                    # either repository specific or exact name
-                    continue
-                schema_name = configuration.get(section, "type", fallback=section)
-
-                if schema_name not in cls.CONFIGURATION_SCHEMA:
-                    continue
-                result[section] = cls.CONFIGURATION_SCHEMA[schema_name]
+            if not configuration.has_section(target):
+                continue
+            section, schema_name = configuration.gettype(
+                target, repository_id, fallback=cls.CONFIGURATION_SCHEMA_FALLBACK)
+            if schema_name not in cls.CONFIGURATION_SCHEMA:
+                continue
+            result[section] = cls.CONFIGURATION_SCHEMA[schema_name]
 
         return result
 

src/ahriman/core/triggers/trigger_loader.py

@@ -17,7 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-import atexit
 import contextlib
 import os
 
@@ -61,8 +60,17 @@ class TriggerLoader(LazyLogging):
 
     def __init__(self) -> None:
         """"""
+        self._on_stop_requested = False
         self.triggers: list[Trigger] = []
 
+    def __del__(self) -> None:
+        """
+        custom destructor object which calls on_stop in case if it was requested
+        """
+        if not self._on_stop_requested:
+            return
+        self.on_stop()
+
     @classmethod
     def load(cls, repository_id: RepositoryId, configuration: Configuration) -> Self:
         """
@@ -242,11 +250,10 @@ class TriggerLoader(LazyLogging):
         run triggers on load
         """
         self.logger.debug("executing triggers on start")
+        self._on_stop_requested = True
         for trigger in self.triggers:
             with self.__execute_trigger(trigger):
                 trigger.on_start()
-        # register on_stop call
-        atexit.register(self.on_stop)
 
     def on_stop(self) -> None:
         """

src/ahriman/core/utils.py

@@ -18,7 +18,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 # pylint: disable=too-many-lines
-import contextlib
 import datetime
 import fcntl
 import io
@@ -48,7 +47,6 @@ __all__ = [
     "dataclass_view",
     "enum_values",
     "extract_user",
-    "filelock",
     "filter_json",
     "full_version",
     "minmax",
@@ -85,8 +83,17 @@ def atomic_move(src: Path, dst: Path) -> None:
 
             >>> atomic_move(src, dst)
     """
-    with filelock(dst):
-        shutil.move(src, dst)
+    lock_path = dst.with_name(f".{dst.name}")
+    try:
+        with lock_path.open("ab") as lock_file:
+            fd = lock_file.fileno()
+            try:
+                fcntl.flock(fd, fcntl.LOCK_EX)  # lock file and wait lock is until available
+                shutil.move(src, dst)
+            finally:
+                fcntl.flock(fd, fcntl.LOCK_UN)  # unlock file first
+    finally:
+        lock_path.unlink(missing_ok=True)  # remove lock file at the end
 
 
 # pylint: disable=too-many-locals
@@ -257,27 +264,6 @@ def extract_user() -> str | None:
     return os.getenv("SUDO_USER") or os.getenv("DOAS_USER") or os.getenv("USER")
 
 
-@contextlib.contextmanager
-def filelock(path: Path) -> Generator[None, None, None]:
-    """
-    lock on file passed as argument
-
-    Args:
-        path(Path): path object on which lock must be performed
-    """
-    lock_path = path.with_name(f".{path.name}")
-    try:
-        with lock_path.open("ab") as lock_file:
-            fd = lock_file.fileno()
-            try:
-                fcntl.flock(fd, fcntl.LOCK_EX)  # lock file and wait lock is until available
-                yield
-            finally:
-                fcntl.flock(fd, fcntl.LOCK_UN)  # unlock file first
-    finally:
-        lock_path.unlink(missing_ok=True)  # remove lock file at the end
-
-
 def filter_json(source: dict[str, Any], known_fields: Iterable[str]) -> dict[str, Any]:
     """
     filter json object by fields used for json-to-object conversion

subpackages.py

@@ -37,7 +37,6 @@ SUBPACKAGES = {
     "ahriman-triggers": [
         prefix / "share" / "ahriman" / "settings" / "ahriman.ini.d" / "00-triggers.ini",
         site_packages / "ahriman" / "application" / "handlers" / "triggers_support.py",
-        site_packages / "ahriman" / "core" / "archive",
         site_packages / "ahriman" / "core" / "distributed",
         site_packages / "ahriman" / "core" / "support",
     ],

tests/ahriman/application/handlers/test_handler_tree_migrate.py

@@ -69,6 +69,7 @@ def test_move_tree(mocker: MockerFixture) -> None:
 
     TreeMigrate.tree_move(from_paths, to_paths)
     rename_mock.assert_has_calls([
+        MockCall(from_paths.archive, to_paths.archive),
         MockCall(from_paths.packages, to_paths.packages),
         MockCall(from_paths.pacman, to_paths.pacman),
         MockCall(from_paths.repository, to_paths.repository),

tests/ahriman/application/handlers/test_handler_validate.py

@@ -2,7 +2,6 @@ import argparse
 import json
 import pytest
 
-from pathlib import Path
 from pytest_mock import MockerFixture
 
 from ahriman.application.handlers.validate import Validate
@@ -54,50 +53,12 @@ def test_run_skip(args: argparse.Namespace, configuration: Configuration, mocker
     print_mock.assert_not_called()
 
 
-def test_run_default(args: argparse.Namespace, configuration: Configuration) -> None:
-    """
-    must run on default configuration without errors
-    """
-    args.exit_code = True
-    _, repository_id = configuration.check_loaded()
-
-    default = Configuration.from_path(Configuration.SYSTEM_CONFIGURATION_PATH, repository_id)
-    # copy autogenerated values
-    for section, key in (("build", "build_command"), ("repository", "root")):
-        value = configuration.get(section, key)
-        default.set_option(section, key, value)
-
-    Validate.run(args, repository_id, default, report=False)
-
-
-def test_run_repo_specific_triggers(args: argparse.Namespace, configuration: Configuration,
-                                    resource_path_root: Path) -> None:
-    """
-    must correctly insert repo specific triggers
-    """
-    args.exit_code = True
-    _, repository_id = configuration.check_loaded()
-
-    # remove unused sections
-    for section in ("archive", "customs3", "github:x86_64", "logs-rotation", "mirrorlist"):
-        configuration.remove_section(section)
-
-    configuration.set_option("report", "target", "test")
-    for section in ("test", "test:i686", "test:another-repo:x86_64"):
-        configuration.set_option(section, "type", "html")
-        configuration.set_option(section, "link_path", "http://link_path")
-        configuration.set_option(section, "path", "path")
-        configuration.set_option(section, "template", "template")
-        configuration.set_option(section, "templates", str(resource_path_root))
-
-    Validate.run(args, repository_id, configuration, report=False)
-
-
 def test_schema(configuration: Configuration) -> None:
     """
     must generate full schema correctly
     """
-    schema = Validate.schema(configuration)
+    _, repository_id = configuration.check_loaded()
+    schema = Validate.schema(repository_id, configuration)
 
     # defaults
     assert schema.pop("console")
@@ -130,7 +91,9 @@ def test_schema_invalid_trigger(configuration: Configuration) -> None:
     """
     configuration.set_option("build", "triggers", "some.invalid.trigger.path.Trigger")
     configuration.remove_option("build", "triggers_known")
-    assert Validate.schema(configuration) == CONFIGURATION_SCHEMA
+    _, repository_id = configuration.check_loaded()
+
+    assert Validate.schema(repository_id, configuration) == CONFIGURATION_SCHEMA
 
 
 def test_schema_erase_required() -> None:

tests/ahriman/core/configuration/test_configuration.py

@@ -20,40 +20,6 @@ def test_architecture(configuration: Configuration) -> None:
     assert configuration.architecture == "x86_64"
 
 
-def test_repository_id(configuration: Configuration, repository_id: RepositoryId) -> None:
-    """
-    must return repository identifier
-    """
-    assert configuration.repository_id == repository_id
-    assert configuration.get("repository", "name") == repository_id.name
-    assert configuration.get("repository", "architecture") == repository_id.architecture
-
-
-def test_repository_id_erase(configuration: Configuration) -> None:
-    """
-    must remove repository identifier properties if empty identifier supplied
-    """
-    configuration.repository_id = None
-    assert configuration.get("repository", "name", fallback=None) is None
-    assert configuration.get("repository", "architecture", fallback=None) is None
-
-    configuration.repository_id = RepositoryId("", "")
-    assert configuration.get("repository", "name", fallback=None) is None
-    assert configuration.get("repository", "architecture", fallback=None) is None
-
-
-def test_repository_id_update(configuration: Configuration, repository_id: RepositoryId) -> None:
-    """
-    must update repository identifier and related configuration options
-    """
-    repository_id = RepositoryId("i686", repository_id.name)
-
-    configuration.repository_id = repository_id
-    assert configuration.repository_id == repository_id
-    assert configuration.get("repository", "name") == repository_id.name
-    assert configuration.get("repository", "architecture") == repository_id.architecture
-
-
 def test_repository_name(configuration: Configuration) -> None:
     """
     must return valid repository name

tests/ahriman/core/repository/test_executor.py

@@ -1,6 +1,5 @@
 import pytest
 
-from dataclasses import replace
 from pathlib import Path
 from pytest_mock import MockerFixture
 from typing import Any
@@ -14,57 +13,6 @@ from ahriman.models.packagers import Packagers
 from ahriman.models.user import User
 
 
-def test_archive_lookup(executor: Executor, package_ahriman: Package, package_python_schedule: Package,
-                        mocker: MockerFixture) -> None:
-    """
-    must existing packages which match the version
-    """
-    mocker.patch("ahriman.models.repository_paths.RepositoryPaths.preserve_owner")
-    mocker.patch("pathlib.Path.iterdir", return_value=[
-        Path("1.pkg.tar.zst"),
-        Path("2.pkg.tar.zst"),
-        Path("3.pkg.tar.zst"),
-    ])
-    mocker.patch("ahriman.models.package.Package.from_archive", side_effect=[
-        package_ahriman,
-        package_python_schedule,
-        replace(package_ahriman, version="1"),
-    ])
-    glob_mock = mocker.patch("pathlib.Path.glob", return_value=[Path("1.pkg.tar.xz")])
-
-    assert list(executor._archive_lookup(package_ahriman)) == [Path("1.pkg.tar.xz")]
-    glob_mock.assert_called_once_with(f"{package_ahriman.packages[package_ahriman.base].filename}*")
-
-
-def test_archive_lookup_version_mismatch(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must return nothing if no packages found with the same version
-    """
-    mocker.patch("ahriman.models.repository_paths.RepositoryPaths.preserve_owner")
-    mocker.patch("pathlib.Path.iterdir", return_value=[
-        Path("1.pkg.tar.zst"),
-    ])
-    mocker.patch("ahriman.models.package.Package.from_archive", return_value=replace(package_ahriman, version="1"))
-
-    assert list(executor._archive_lookup(package_ahriman)) == []
-
-
-def test_archive_lookup_architecture_mismatch(executor: Executor, package_ahriman: Package,
-                                              mocker: MockerFixture) -> None:
-    """
-    must return nothing if architecture doesn't match
-    """
-    package_ahriman.packages[package_ahriman.base].architecture = "x86_64"
-    mocker.patch("ahriman.core.repository.executor.Executor.architecture", return_value="i686")
-    mocker.patch("ahriman.models.repository_paths.RepositoryPaths.preserve_owner")
-    mocker.patch("pathlib.Path.iterdir", return_value=[
-        Path("1.pkg.tar.zst"),
-    ])
-    mocker.patch("ahriman.models.package.Package.from_archive", return_value=package_ahriman)
-
-    assert list(executor._archive_lookup(package_ahriman)) == []
-
-
 def test_archive_rename(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must correctly remove package archive
@@ -97,39 +45,16 @@ def test_package_build(executor: Executor, package_ahriman: Package, mocker: Moc
     mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
     status_client_mock = mocker.patch("ahriman.core.status.Client.set_building")
     init_mock = mocker.patch("ahriman.core.build_tools.task.Task.init", return_value="sha")
-    package_mock = mocker.patch("ahriman.models.package.Package.from_build", return_value=package_ahriman)
-    lookup_mock = mocker.patch("ahriman.core.repository.executor.Executor._archive_lookup", return_value=[])
     with_packages_mock = mocker.patch("ahriman.models.package.Package.with_packages")
     rename_mock = mocker.patch("ahriman.core.repository.executor.atomic_move")
 
     assert executor._package_build(package_ahriman, Path("local"), "packager", None) == "sha"
     status_client_mock.assert_called_once_with(package_ahriman.base)
     init_mock.assert_called_once_with(pytest.helpers.anyvar(int), pytest.helpers.anyvar(int), None)
-    package_mock.assert_called_once_with(Path("local"), executor.architecture, None)
-    lookup_mock.assert_called_once_with(package_ahriman)
     with_packages_mock.assert_called_once_with([Path(package_ahriman.base)], executor.pacman)
     rename_mock.assert_called_once_with(Path(package_ahriman.base), executor.paths.packages / package_ahriman.base)
 
 
-def test_package_build_copy(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must copy package from archive if there are already built ones
-    """
-    path = package_ahriman.packages[package_ahriman.base].filepath
-    mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
-    mocker.patch("ahriman.core.build_tools.task.Task.init")
-    mocker.patch("ahriman.models.package.Package.from_build", return_value=package_ahriman)
-    mocker.patch("ahriman.core.repository.executor.Executor._archive_lookup", return_value=[path])
-    mocker.patch("ahriman.core.repository.executor.atomic_move")
-    mocker.patch("ahriman.models.package.Package.with_packages")
-    copy_mock = mocker.patch("shutil.copy")
-    rename_mock = mocker.patch("ahriman.core.repository.executor.atomic_move")
-
-    executor._package_build(package_ahriman, Path("local"), "packager", None)
-    copy_mock.assert_called_once_with(path, Path("local"))
-    rename_mock.assert_called_once_with(Path("local") / path, executor.paths.packages / path)
-
-
 def test_package_remove(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must run remove for packages

tests/ahriman/core/test_utils.py

@@ -17,7 +17,6 @@ from ahriman.core.utils import (
     dataclass_view,
     enum_values,
     extract_user,
-    filelock,
     filter_json,
     full_version,
     minmax,
@@ -44,12 +43,47 @@ def test_atomic_move(mocker: MockerFixture) -> None:
     """
     must move file with locking
     """
-    filelock_mock = mocker.patch("ahriman.core.utils.filelock")
+    lock_mock = mocker.patch("fcntl.flock")
+    open_mock = mocker.patch("pathlib.Path.open", autospec=True)
     move_mock = mocker.patch("shutil.move")
+    unlink_mock = mocker.patch("pathlib.Path.unlink")
 
     atomic_move(Path("source"), Path("destination"))
-    filelock_mock.assert_called_once_with(Path("destination"))
+    open_mock.assert_called_once_with(Path(".destination"), "ab")
+    lock_mock.assert_has_calls([
+        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_EX),
+        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_UN),
+    ])
     move_mock.assert_called_once_with(Path("source"), Path("destination"))
+    unlink_mock.assert_called_once_with(missing_ok=True)
+
+
+def test_atomic_move_remove_lock(mocker: MockerFixture) -> None:
+    """
+    must remove lock file in case of exception
+    """
+    mocker.patch("pathlib.Path.open", side_effect=Exception)
+    unlink_mock = mocker.patch("pathlib.Path.unlink")
+
+    with pytest.raises(Exception):
+        atomic_move(Path("source"), Path("destination"))
+    unlink_mock.assert_called_once_with(missing_ok=True)
+
+
+def test_atomic_move_unlock(mocker: MockerFixture) -> None:
+    """
+    must unlock file in case of exception
+    """
+    mocker.patch("pathlib.Path.open")
+    mocker.patch("shutil.move", side_effect=Exception)
+    lock_mock = mocker.patch("fcntl.flock")
+
+    with pytest.raises(Exception):
+        atomic_move(Path("source"), Path("destination"))
+    lock_mock.assert_has_calls([
+        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_EX),
+        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_UN),
+    ])
 
 
 def test_check_output(mocker: MockerFixture) -> None:
@@ -271,53 +305,6 @@ def test_extract_user() -> None:
     assert extract_user() == "doas"
 
 
-def test_filelock(mocker: MockerFixture) -> None:
-    """
-    must perform file locking
-    """
-    lock_mock = mocker.patch("fcntl.flock")
-    open_mock = mocker.patch("pathlib.Path.open", autospec=True)
-    unlink_mock = mocker.patch("pathlib.Path.unlink")
-
-    with filelock(Path("local")):
-        pass
-    open_mock.assert_called_once_with(Path(".local"), "ab")
-    lock_mock.assert_has_calls([
-        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_EX),
-        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_UN),
-    ])
-    unlink_mock.assert_called_once_with(missing_ok=True)
-
-
-def test_filelock_remove_lock(mocker: MockerFixture) -> None:
-    """
-    must remove lock file in case of exception
-    """
-    mocker.patch("pathlib.Path.open", side_effect=Exception)
-    unlink_mock = mocker.patch("pathlib.Path.unlink")
-
-    with pytest.raises(Exception):
-        with filelock(Path("local")):
-            pass
-    unlink_mock.assert_called_once_with(missing_ok=True)
-
-
-def test_filelock_unlock(mocker: MockerFixture) -> None:
-    """
-    must unlock file in case of exception
-    """
-    mocker.patch("pathlib.Path.open")
-    lock_mock = mocker.patch("fcntl.flock")
-
-    with pytest.raises(Exception):
-        with filelock(Path("local")):
-            raise Exception
-    lock_mock.assert_has_calls([
-        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_EX),
-        MockCall(pytest.helpers.anyvar(int), fcntl.LOCK_UN),
-    ])
-
-
 def test_filter_json(package_ahriman: Package) -> None:
     """
     must filter fields by known list

tests/ahriman/core/triggers/test_trigger.py

@@ -19,9 +19,10 @@ def test_configuration_schema(configuration: Configuration) -> None:
     """
     section = "console"
     configuration.set_option("report", "target", section)
+    _, repository_id = configuration.check_loaded()
 
     expected = {section: ReportTrigger.CONFIGURATION_SCHEMA[section]}
-    assert ReportTrigger.configuration_schema(configuration) == expected
+    assert ReportTrigger.configuration_schema(repository_id, configuration) == expected
 
 
 def test_configuration_schema_no_section(configuration: Configuration) -> None:
@@ -30,7 +31,9 @@ def test_configuration_schema_no_section(configuration: Configuration) -> None:
     """
     section = "abracadabra"
     configuration.set_option("report", "target", section)
-    assert ReportTrigger.configuration_schema(configuration) == {}
+    _, repository_id = configuration.check_loaded()
+
+    assert ReportTrigger.configuration_schema(repository_id, configuration) == {}
 
 
 def test_configuration_schema_no_schema(configuration: Configuration) -> None:
@@ -40,15 +43,17 @@ def test_configuration_schema_no_schema(configuration: Configuration) -> None:
     section = "abracadabra"
     configuration.set_option("report", "target", section)
     configuration.set_option(section, "key", "value")
+    _, repository_id = configuration.check_loaded()
 
-    assert ReportTrigger.configuration_schema(configuration) == {}
+    assert ReportTrigger.configuration_schema(repository_id, configuration) == {}
 
 
 def test_configuration_schema_empty(configuration: Configuration) -> None:
     """
     must return default schema if no configuration set
     """
-    assert ReportTrigger.configuration_schema(None) == ReportTrigger.CONFIGURATION_SCHEMA
+    _, repository_id = configuration.check_loaded()
+    assert ReportTrigger.configuration_schema(repository_id, None) == ReportTrigger.CONFIGURATION_SCHEMA
 
 
 def test_configuration_schema_variables() -> None:

tests/ahriman/core/triggers/test_trigger_loader.py

@@ -153,12 +153,38 @@ def test_on_start(trigger_loader: TriggerLoader, mocker: MockerFixture) -> None:
     """
     upload_mock = mocker.patch("ahriman.core.upload.UploadTrigger.on_start")
     report_mock = mocker.patch("ahriman.core.report.ReportTrigger.on_start")
-    atexit_mock = mocker.patch("atexit.register")
 
     trigger_loader.on_start()
+    assert trigger_loader._on_stop_requested
     report_mock.assert_called_once_with()
     upload_mock.assert_called_once_with()
-    atexit_mock.assert_called_once_with(trigger_loader.on_stop)
+
+
+def test_on_stop_with_on_start(configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must call on_stop on exit if on_start was called
+    """
+    mocker.patch("ahriman.core.upload.UploadTrigger.on_start")
+    mocker.patch("ahriman.core.report.ReportTrigger.on_start")
+    on_stop_mock = mocker.patch("ahriman.core.triggers.trigger_loader.TriggerLoader.on_stop")
+    _, repository_id = configuration.check_loaded()
+
+    trigger_loader = TriggerLoader.load(repository_id, configuration)
+    trigger_loader.on_start()
+    del trigger_loader
+    on_stop_mock.assert_called_once_with()
+
+
+def test_on_stop_without_on_start(configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must call not on_stop on exit if on_start wasn't called
+    """
+    on_stop_mock = mocker.patch("ahriman.core.triggers.trigger_loader.TriggerLoader.on_stop")
+    _, repository_id = configuration.check_loaded()
+
+    trigger_loader = TriggerLoader.load(repository_id, configuration)
+    del trigger_loader
+    on_stop_mock.assert_not_called()
 
 
 def test_on_stop(trigger_loader: TriggerLoader, mocker: MockerFixture) -> None: