clean empty directories

CONTRIBUTING.md

@@ -165,6 +165,11 @@ Again, the most checks can be performed by `tox` command, though some additional
 
     # Blank line again and package imports
     from ahriman.core.configuration import Configuration
+    # Multiline import example
+    from ahriman.core.database.operations import (
+        AuthOperations,
+        BuildOperations,
+    )
     ```
 
 * One file should define only one class, exception is class satellites in case if file length remains less than 400 lines.

docs/ahriman.core.archive.rst

@@ -0,0 +1,29 @@
+ahriman.core.archive package
+============================
+
+Submodules
+----------
+
+ahriman.core.archive.archive\_tree module
+-----------------------------------------
+
+.. automodule:: ahriman.core.archive.archive_tree
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+ahriman.core.archive.archive\_trigger module
+--------------------------------------------
+
+.. automodule:: ahriman.core.archive.archive_trigger
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: ahriman.core.archive
+   :members:
+   :no-undoc-members:
+   :show-inheritance:

docs/ahriman.core.database.migrations.rst

@@ -132,6 +132,14 @@ ahriman.core.database.migrations.m015\_logs\_process\_id module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.core.database.migrations.m016\_archive module
+-----------------------------------------------------
+
+.. automodule:: ahriman.core.database.migrations.m016_archive
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 

docs/ahriman.core.housekeeping.rst

@@ -4,6 +4,14 @@ ahriman.core.housekeeping package
 Submodules
 ----------
 
+ahriman.core.housekeeping.archive\_rotation\_trigger module
+-----------------------------------------------------------
+
+.. automodule:: ahriman.core.housekeeping.archive_rotation_trigger
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.core.housekeeping.logs\_rotation\_trigger module
 --------------------------------------------------------
 

docs/ahriman.core.rst

@@ -8,6 +8,7 @@ Subpackages
    :maxdepth: 4
 
    ahriman.core.alpm
+   ahriman.core.archive
    ahriman.core.auth
    ahriman.core.build_tools
    ahriman.core.configuration

docs/configuration.rst

@@ -97,6 +97,13 @@ libalpm and AUR related configuration. Group name can refer to architecture, e.g
 * ``sync_files_database`` - download files database from mirror, boolean, required.
 * ``use_ahriman_cache`` - use local pacman package cache instead of system one, boolean, required. With this option enabled you might want to refresh database periodically (available as additional flag for some subcommands). If set to ``no``, databases must be synchronized manually.
 
+``archive`` group
+-----------------
+
+Describes settings for packages archives management extensions.
+
+* ``keep_built_packages`` - keep this amount of built packages with different versions, integer, required. ``0`` (or negative number) will effectively disable archives removal.
+
 ``auth`` group
 --------------
 

package/share/ahriman/settings/ahriman.ini

@@ -44,9 +44,11 @@ triggers[] = ahriman.core.report.ReportTrigger
 triggers[] = ahriman.core.upload.UploadTrigger
 triggers[] = ahriman.core.gitremote.RemotePushTrigger
 triggers[] = ahriman.core.housekeeping.LogsRotationTrigger
+triggers[] = ahriman.core.housekeeping.ArchiveRotationTrigger
 ; List of well-known triggers. Used only for configuration purposes.
 triggers_known[] = ahriman.core.gitremote.RemotePullTrigger
 triggers_known[] = ahriman.core.gitremote.RemotePushTrigger
+triggers_known[] = ahriman.core.housekeeping.ArchiveRotationTrigger
 triggers_known[] = ahriman.core.housekeeping.LogsRotationTrigger
 triggers_known[] = ahriman.core.report.ReportTrigger
 triggers_known[] = ahriman.core.upload.UploadTrigger

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

@@ -1,3 +1,7 @@
+[archive]
+; Keep amount of last built packages in archive. 0 means keep all packages
+keep_built_packages = 1
+
 [logs-rotation]
 ; Keep last build logs for each package
 keep_last_logs = 5

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

@@ -1,5 +1,6 @@
 [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/tree_migrate.py

@@ -21,6 +21,7 @@ import argparse
 
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.configuration import Configuration
+from ahriman.core.utils import symlink_relative, walk
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.repository_paths import RepositoryPaths
 
@@ -49,6 +50,7 @@ class TreeMigrate(Handler):
         target_tree.tree_create()
         # perform migration
         TreeMigrate.tree_move(current_tree, target_tree)
+        TreeMigrate.fix_symlinks(target_tree)
 
     @staticmethod
     def _set_service_tree_migrate_parser(root: SubParserAction) -> argparse.ArgumentParser:
@@ -66,6 +68,22 @@ class TreeMigrate(Handler):
         parser.set_defaults(lock=None, quiet=True, report=False)
         return parser
 
+    @staticmethod
+    def fix_symlinks(paths: RepositoryPaths) -> None:
+        """
+        fix package archive symlinks
+
+        Args:
+            paths(RepositoryPaths): new repository paths
+        """
+        archives = {path.name: path for path in walk(paths.archive)}
+        for symlink in walk(paths.repository):
+            if symlink.exists():  # no need to check for symlinks as we have just walked through the tree
+                continue
+            if (source_archive := archives.get(symlink.name)) is not None:
+                symlink.unlink()
+                symlink_relative(symlink, source_archive)
+
     @staticmethod
     def tree_move(from_tree: RepositoryPaths, to_tree: RepositoryPaths) -> None:
         """

src/ahriman/core/alpm/repo.py

@@ -31,20 +31,21 @@ class Repo(LazyLogging):
 
     Attributes:
         name(str): repository name
-        paths(RepositoryPaths): repository paths instance
+        root(Path): repository root
         sign_args(list[str]): additional args which have to be used to sign repository archive
         uid(int): uid of the repository owner user
     """
 
-    def __init__(self, name: str, paths: RepositoryPaths, sign_args: list[str]) -> None:
+    def __init__(self, name: str, paths: RepositoryPaths, sign_args: list[str], root: Path | None = None) -> None:
         """
         Args:
             name(str): repository name
             paths(RepositoryPaths): repository paths instance
             sign_args(list[str]): additional args which have to be used to sign repository archive
+            root(Path | None, optional): repository root. If none set, the default will be used (Default value = None)
         """
         self.name = name
-        self.paths = paths
+        self.root = root or paths.repository
         self.uid, _ = paths.root_owner
         self.sign_args = sign_args
 
@@ -56,45 +57,54 @@ class Repo(LazyLogging):
         Returns:
             Path: path to repository database
         """
-        return self.paths.repository / f"{self.name}.db.tar.gz"
+        return self.root / f"{self.name}.db.tar.gz"
 
-    def add(self, path: Path) -> None:
+    def add(self, path: Path, *, remove: bool = True) -> None:
         """
         add new package to repository
 
         Args:
             path(Path): path to archive to add
+            remove(bool, optional): whether to remove old packages or not (Default value = True)
         """
+        command = ["repo-add", *self.sign_args]
+        if remove:
+            command.extend(["--remove"])
+        command.extend([str(self.repo_path), str(path)])
+
+        # add to repository
         check_output(
-            "repo-add", *self.sign_args, "-R", str(self.repo_path), str(path),
+            *command,
             exception=BuildError.from_process(path.name),
-            cwd=self.paths.repository,
+            cwd=self.root,
             logger=self.logger,
-            user=self.uid)
+            user=self.uid,
+        )
 
     def init(self) -> None:
         """
         create empty repository database. It just calls add with empty arguments
         """
         check_output("repo-add", *self.sign_args, str(self.repo_path),
-                     cwd=self.paths.repository, logger=self.logger, user=self.uid)
+                     cwd=self.root, logger=self.logger, user=self.uid)
 
-    def remove(self, package: str, filename: Path) -> None:
+    def remove(self, package_name: str, filename: Path) -> None:
         """
         remove package from repository
 
         Args:
-            package(str): package name to remove
+            package_name(str): package name to remove
             filename(Path): package filename to remove
         """
         # remove package and signature (if any) from filesystem
-        for full_path in self.paths.repository.glob(f"{filename}*"):
+        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,
-            exception=BuildError.from_process(package),
-            cwd=self.paths.repository,
+            "repo-remove", *self.sign_args, str(self.repo_path), package_name,
+            exception=BuildError.from_process(package_name),
+            cwd=self.root,
             logger=self.logger,
-            user=self.uid)
+            user=self.uid,
+        )

src/ahriman/core/archive/__init__.py

@@ -0,0 +1,20 @@
+#
+# 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

@@ -0,0 +1,181 @@
+#
+# 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 collections.abc import Iterator
+from pathlib import Path
+
+from ahriman.core.alpm.repo import Repo
+from ahriman.core.log import LazyLogging
+from ahriman.core.utils import symlink_relative, utcnow, walk
+from ahriman.models.package import Package
+from ahriman.models.package_description import PackageDescription
+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 _package_symlinks_create(self, package_description: PackageDescription, root: Path, archive: Path) -> bool:
+        """
+        process symlinks creation for single package
+
+        Args:
+            package_description(PackageDescription): archive descriptor
+            root(Path): path to the archive repository root
+            archive(Path): path to directory with archives
+
+        Returns:
+            bool: ``True`` if symlinks were created and ``False`` otherwise
+        """
+        symlinks_created = False
+        # here we glob for archive itself and signature if any
+        for file in archive.glob(f"{package_description.filename}*"):
+            try:
+                symlink_relative(root / file.name, file)
+                symlinks_created = True
+            except FileExistsError:
+                continue  # symlink is already created, skip processing
+
+        return symlinks_created
+
+    def _repo(self, root: Path) -> Repo:
+        """
+        constructs :class:`ahriman.core.alpm.repo.Repo` object for given path
+
+        Args:
+            root(Path): root of the repository
+
+        Returns:
+            Repo: constructed object with correct properties
+        """
+        return Repo(self.repository_id.name, self.paths, self.sign_args, root)
+
+    def directories_fix(self, paths: set[Path]) -> None:
+        """
+        remove empty repository directories recursively
+
+        Args:
+            paths(set[Path]): repositories to check
+        """
+        root = self.paths.archive / "repos"
+        for repository in paths:
+            parents = [repository] + list(repository.parents[:-1])
+            for parent in parents:
+                path = root / parent
+                if not list(path.iterdir()):
+                    path.rmdir()
+
+    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
+                (Default value = None)
+
+        Returns:
+            Path: path to the repository root
+        """
+        date = date or utcnow().date()
+        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 = self._repo(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
+
+                if self._package_symlinks_create(single, root, archive):
+                    repo.add(root / single.filename)
+
+    def symlinks_fix(self) -> Iterator[Path]:
+        """
+        remove broken symlinks across repositories for all dates
+
+        Yields:
+            Path: path of the sub-repository with removed symlinks
+        """
+        for path in walk(self.paths.archive / "repos"):
+            root = path.parent
+            *_, name, architecture = root.parts
+            if self.repository_id.name != name or self.repository_id.architecture != architecture:
+                continue  # we only process same name repositories
+
+            if not path.is_symlink():
+                continue  # find symlinks only
+            if path.exists():
+                continue  # filter out not broken symlinks
+
+            # here we don't have access to original archive, so we have to guess name based on archive name
+            # normally it should be fine to do so
+            package_name = path.name.rsplit("-", maxsplit=3)[0]
+            self._repo(root).remove(package_name, path)
+            yield path.parent.relative_to(self.paths.archive / "repos")
+
+    def tree_create(self) -> None:
+        """
+        create repository tree for current repository
+        """
+        root = self.repository_for()
+        if root.exists():
+            return
+
+        with self.paths.preserve_owner():
+            root.mkdir(0o755, parents=True)
+            # init empty repository here
+            self._repo(root).init()

src/ahriman/core/archive/archive_trigger.py

@@ -0,0 +1,70 @@
+#
+# 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_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
+        tree(ArchiveTree): archive tree wrapper
+    """
+
+    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
+        self.tree = ArchiveTree(self.paths, GPG(configuration).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
+        """
+        repositories = set(self.tree.symlinks_fix())
+        self.tree.directories_fix(repositories)

src/ahriman/core/build_tools/package_version.py

@@ -17,8 +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/>.
 #
-from pyalpm import vercmp  # type: ignore[import-not-found]
-
 from ahriman.core.build_tools.task import Task
 from ahriman.core.configuration import Configuration
 from ahriman.core.log import LazyLogging
@@ -113,5 +111,4 @@ class PackageVersion(LazyLogging):
         else:
             remote_version = remote.version
 
-        result: int = vercmp(self.package.version, remote_version)
-        return result < 0
+        return self.package.vercmp(remote_version) < 0

src/ahriman/core/database/migrations/m016_archive.py

@@ -0,0 +1,86 @@
+#
+# 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 argparse
+
+from dataclasses import replace
+from sqlite3 import Connection
+
+from ahriman.application.handlers.handler import Handler
+from ahriman.core.alpm.pacman import Pacman
+from ahriman.core.configuration import Configuration
+from ahriman.core.sign.gpg import GPG
+from ahriman.core.utils import atomic_move, package_like, symlink_relative
+from ahriman.models.package import Package
+from ahriman.models.pacman_synchronization import PacmanSynchronization
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+__all__ = ["migrate_data"]
+
+
+def migrate_data(connection: Connection, configuration: Configuration) -> None:
+    """
+    perform data migration
+
+    Args:
+        connection(Connection): database connection
+        configuration(Configuration): configuration instance
+    """
+    del connection
+
+    config_path, _ = configuration.check_loaded()
+    args = argparse.Namespace(configuration=config_path, architecture=None, repository=None, repository_id=None)
+
+    for repository_id in Handler.repositories_extract(args):
+        paths = replace(configuration.repository_paths, repository_id=repository_id)
+        pacman = Pacman(repository_id, configuration, refresh_database=PacmanSynchronization.Disabled)
+
+        # create archive directory if required
+        if not paths.archive.is_dir():
+            with paths.preserve_owner():
+                paths.archive.mkdir(mode=0o755, parents=True)
+
+        move_packages(paths, pacman)
+
+
+def move_packages(repository_paths: RepositoryPaths, pacman: Pacman) -> None:
+    """
+    move packages from repository to archive and create symbolic links
+
+    Args:
+        repository_paths(RepositoryPaths): repository paths instance
+        pacman(Pacman): alpm wrapper instance
+    """
+    for archive in filter(package_like, repository_paths.repository.iterdir()):
+        if not archive.is_file(follow_symlinks=False):
+            continue  # skip symbolic links if any
+
+        package = Package.from_archive(archive, pacman)
+        artifacts = [archive]
+        # check if there are signatures for this package and append it here too
+        if (signature := GPG.signature(archive)).exists():
+            artifacts.append(signature)
+
+        for source in artifacts:
+            # move package to the archive directory
+            target = repository_paths.archive_for(package.base) / source.name
+            atomic_move(source, target)
+            # create symlink to the archive
+            symlink_relative(source, target)

src/ahriman/core/database/sqlite.py

@@ -25,8 +25,16 @@ from typing import Self
 
 from ahriman.core.configuration import Configuration
 from ahriman.core.database.migrations import Migrations
-from ahriman.core.database.operations import AuthOperations, BuildOperations, ChangesOperations, \
-    DependenciesOperations, EventOperations, LogsOperations, PackageOperations, PatchOperations
+from ahriman.core.database.operations import (
+    AuthOperations,
+    BuildOperations,
+    ChangesOperations,
+    DependenciesOperations,
+    EventOperations,
+    LogsOperations,
+    PackageOperations,
+    PatchOperations,
+)
 from ahriman.models.repository_id import RepositoryId
 
 

src/ahriman/core/housekeeping/__init__.py

@@ -17,4 +17,5 @@
 # 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.housekeeping.archive_rotation_trigger import ArchiveRotationTrigger
 from ahriman.core.housekeeping.logs_rotation_trigger import LogsRotationTrigger

src/ahriman/core/housekeeping/archive_rotation_trigger.py

@@ -0,0 +1,116 @@
+#
+# 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 collections.abc import Callable
+from functools import cmp_to_key
+
+from ahriman.core import context
+from ahriman.core.alpm.pacman import Pacman
+from ahriman.core.configuration import Configuration
+from ahriman.core.triggers import Trigger
+from ahriman.core.utils import package_like
+from ahriman.models.package import Package
+from ahriman.models.repository_id import RepositoryId
+from ahriman.models.result import Result
+
+
+class ArchiveRotationTrigger(Trigger):
+    """
+    remove packages from archive
+
+    Attributes:
+        keep_built_packages(int): number of last packages to keep
+        paths(RepositoryPaths): repository paths instance
+    """
+
+    CONFIGURATION_SCHEMA = {
+        "archive": {
+            "type": "dict",
+            "schema": {
+                "keep_built_packages": {
+                    "type": "integer",
+                    "required": True,
+                    "coerce": "integer",
+                    "min": 0,
+                },
+            },
+        },
+    }
+
+    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)
+
+        section = next(iter(self.configuration_sections(configuration)))
+        self.keep_built_packages = max(configuration.getint(section, "keep_built_packages"), 0)
+        self.paths = configuration.repository_paths
+
+    @classmethod
+    def configuration_sections(cls, configuration: Configuration) -> list[str]:
+        """
+        extract configuration sections from configuration
+
+        Args:
+            configuration(Configuration): configuration instance
+
+        Returns:
+            list[str]: read configuration sections belong to this trigger
+        """
+        return list(cls.CONFIGURATION_SCHEMA.keys())
+
+    def archives_remove(self, package: Package, pacman: Pacman) -> None:
+        """
+        remove older versions of the specified package
+
+        Args:
+            package(Package): package which has been updated to check for older versions
+            pacman(Pacman): alpm wrapper instance
+        """
+        packages: dict[tuple[str, str], Package] = {}
+        # we can't use here load_archives, because it ignores versions
+        for full_path in filter(package_like, self.paths.archive_for(package.base).iterdir()):
+            local = Package.from_archive(full_path, pacman)
+            packages.setdefault((local.base, local.version), local).packages.update(local.packages)
+
+        comparator: Callable[[Package, Package], int] = lambda left, right: left.vercmp(right.version)
+        to_remove = sorted(packages.values(), key=cmp_to_key(comparator))
+        # 0 will implicitly be translated into [:0], meaning we keep all packages
+        for single in to_remove[:-self.keep_built_packages]:
+            self.logger.info("removing version %s of package %s", single.version, single.base)
+            for archive in single.packages.values():
+                for path in self.paths.archive_for(single.base).glob(f"{archive.filename}*"):
+                    path.unlink()
+
+    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
+        """
+        ctx = context.get()
+        pacman = ctx.get(Pacman)
+
+        for package in result.success:
+            self.archives_remove(package, pacman)

src/ahriman/core/housekeeping/logs_rotation_trigger.py

@@ -47,7 +47,6 @@ class LogsRotationTrigger(Trigger):
             },
         },
     }
-    REQUIRES_REPOSITORY = True
 
     def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
         """

src/ahriman/core/report/report_trigger.py

@@ -336,7 +336,6 @@ class ReportTrigger(Trigger):
             },
         },
     }
-    REQUIRES_REPOSITORY = True
 
     def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
         """

src/ahriman/core/repository/executor.py

@@ -19,7 +19,7 @@
 #
 import shutil
 
-from collections.abc import Iterable
+from collections.abc import Iterable, Iterator
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
@@ -27,7 +27,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 safe_filename
+from ahriman.core.utils import atomic_move, filelock, package_like, safe_filename, symlink_relative
 from ahriman.models.changes import Changes
 from ahriman.models.event import EventType
 from ahriman.models.package import Package
@@ -41,6 +41,141 @@ class Executor(PackageInfo, Cleaner):
     trait for common repository update processes
     """
 
+    def _archive_lookup(self, package: Package) -> Iterator[Path]:
+        """
+        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
+
+        Args:
+            description(PackageDescription): package description
+            package_base(str): package base name
+        """
+        if description.filename is None:
+            self.logger.warning("received empty package filename for base %s", package_base)
+            return  # suppress type checking, it never can be none actually
+
+        if (safe := safe_filename(description.filename)) != description.filename:
+            atomic_move(self.paths.packages / description.filename, self.paths.packages / safe)
+            description.filename = safe
+
+    def _package_build(self, package: Package, path: Path, packager: str | None,
+                       local_version: str | None) -> str | None:
+        """
+        build single package
+
+        Args:
+            package(Package): package to build
+            path(Path): path to directory with package files
+            packager(str | None): packager identifier used for this package
+            local_version(str | None): local version of the package
+
+        Returns:
+            str | None: current commit sha if available
+        """
+        self.reporter.set_building(package.base)
+
+        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 artifact in prebuilt:
+                with filelock(artifact):
+                    shutil.copy(artifact, path)
+                built.append(path / artifact.name)
+        else:
+            built = task.build(path, PACKAGER=packager)
+
+        package.with_packages(built, self.pacman)
+        for src in built:
+            dst = self.paths.packages / src.name
+            atomic_move(src, dst)
+
+        return commit_sha
+
+    def _package_remove(self, package_name: str, path: Path) -> None:
+        """
+        remove single package from repository
+
+        Args:
+            package_name(str): package name
+            path(Path): path to package archive
+        """
+        try:
+            self.repo.remove(package_name, path)
+        except Exception:
+            self.logger.exception("could not remove %s", package_name)
+
+    def _package_remove_base(self, package_base: str) -> None:
+        """
+        remove package base from repository
+
+        Args:
+            package_base(str): package base name
+        """
+        try:
+            with self.in_event(package_base, EventType.PackageRemoved):
+                self.reporter.package_remove(package_base)
+        except Exception:
+            self.logger.exception("could not remove base %s", package_base)
+
+    def _package_update(self, filename: str | None, package_base: str, packager_key: str | None) -> None:
+        """
+        update built package in repository database
+
+        Args:
+            filename(str | None): archive filename
+            package_base(str): package base name
+            packager_key(str | None): packager key identifier
+        """
+        if filename is None:
+            self.logger.warning("received empty package filename 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
+        full_path = self.paths.packages / filename
+        files = self.sign.process_sign_package(full_path, packager_key)
+
+        for src in files:
+            dst = self.paths.archive_for(package_base) / src.name
+            atomic_move(src, dst)  # move package to archive directory
+            if not (symlink := self.paths.repository / dst.name).exists():
+                symlink_relative(symlink, dst)  # create link to archive
+
+        self.repo.add(self.paths.repository / filename)
+
     def process_build(self, updates: Iterable[Package], packagers: Packagers | None = None, *,
                       bump_pkgrel: bool = False) -> Result:
         """
@@ -55,21 +190,6 @@ class Executor(PackageInfo, Cleaner):
         Returns:
             Result: build result
         """
-        def build_single(package: Package, local_path: Path, packager_id: str | None) -> str | None:
-            self.reporter.set_building(package.base)
-            task = Task(package, self.configuration, self.architecture, self.paths)
-            local_version = local_versions.get(package.base) if bump_pkgrel else None
-            patches = self.reporter.package_patches_get(package.base, None)
-            commit_sha = task.init(local_path, patches, local_version)
-            built = task.build(local_path, PACKAGER=packager_id)
-
-            package.with_packages(built, self.pacman)
-            for src in built:
-                dst = self.paths.packages / src.name
-                shutil.move(src, dst)
-
-            return commit_sha
-
         packagers = packagers or Packagers()
         local_versions = {package.base: package.version for package in self.packages()}
 
@@ -80,16 +200,21 @@ class Executor(PackageInfo, Cleaner):
                 try:
                     with self.in_event(single.base, EventType.PackageUpdated, failure=EventType.PackageUpdateFailed):
                         packager = self.packager(packagers, single.base)
-                        last_commit_sha = build_single(single, Path(dir_name), packager.packager_id)
+                        local_version = local_versions.get(single.base) if bump_pkgrel else None
+                        commit_sha = self._package_build(single, Path(dir_name), packager.packager_id, local_version)
+
                         # update commit hash for changes keeping current diff if there is any
                         changes = self.reporter.package_changes_get(single.base)
-                        self.reporter.package_changes_update(single.base, Changes(last_commit_sha, changes.changes))
+                        self.reporter.package_changes_update(single.base, Changes(commit_sha, changes.changes))
+
                         # update dependencies list
                         package_archive = PackageArchive(self.paths.build_root, single, self.pacman, self.scan_paths)
                         dependencies = package_archive.depends_on()
                         self.reporter.package_dependencies_update(single.base, dependencies)
+
                         # update result set
                         result.add_updated(single)
+
                 except Exception:
                     self.reporter.set_failed(single.base)
                     result.add_failed(single)
@@ -107,19 +232,6 @@ class Executor(PackageInfo, Cleaner):
         Returns:
             Result: remove result
         """
-        def remove_base(package_base: str) -> None:
-            try:
-                with self.in_event(package_base, EventType.PackageRemoved):
-                    self.reporter.package_remove(package_base)
-            except Exception:
-                self.logger.exception("could not remove base %s", package_base)
-
-        def remove_package(package: str, archive_path: Path) -> None:
-            try:
-                self.repo.remove(package, archive_path)  # remove the package itself
-            except Exception:
-                self.logger.exception("could not remove %s", package)
-
         packages_to_remove: dict[str, Path] = {}
         bases_to_remove: list[str] = []
 
@@ -136,6 +248,7 @@ class Executor(PackageInfo, Cleaner):
                 })
                 bases_to_remove.append(local.base)
                 result.add_removed(local)
+
             elif requested.intersection(local.packages.keys()):
                 packages_to_remove.update({
                     package: properties.filepath
@@ -152,11 +265,11 @@ class Executor(PackageInfo, Cleaner):
 
         # remove packages from repository files
         for package, filename in packages_to_remove.items():
-            remove_package(package, filename)
+            self._package_remove(package, filename)
 
         # remove bases from registered
         for package in bases_to_remove:
-            remove_base(package)
+            self._package_remove_base(package)
 
         return result
 
@@ -172,27 +285,6 @@ class Executor(PackageInfo, Cleaner):
         Returns:
             Result: path to repository database
         """
-        def rename(archive: PackageDescription, package_base: str) -> None:
-            if archive.filename is None:
-                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(archive.filename)) != archive.filename:
-                shutil.move(self.paths.packages / archive.filename, self.paths.packages / safe)
-                archive.filename = safe
-
-        def update_single(name: str | None, package_base: str, packager_key: str | None) -> None:
-            if name is None:
-                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
-            full_path = self.paths.packages / name
-            files = self.sign.process_sign_package(full_path, packager_key)
-            for src in files:
-                dst = self.paths.repository / safe_filename(src.name)
-                shutil.move(src, dst)
-            package_path = self.paths.repository / safe_filename(name)
-            self.repo.add(package_path)
-
         current_packages = {package.base: package for package in self.packages()}
         local_versions = {package_base: package.version for package_base, package in current_packages.items()}
 
@@ -207,8 +299,8 @@ class Executor(PackageInfo, Cleaner):
                     packager = self.packager(packagers, local.base)
 
                     for description in local.packages.values():
-                        rename(description, local.base)
-                        update_single(description.filename, local.base, packager.key)
+                        self._archive_rename(description, local.base)
+                        self._package_update(description.filename, local.base, packager.key)
                     self.reporter.set_success(local)
                     result.add_updated(local)
 
@@ -216,12 +308,13 @@ class Executor(PackageInfo, Cleaner):
                     if local.base in current_packages:
                         current_package_archives = set(current_packages[local.base].packages.keys())
                     removed_packages.extend(current_package_archives.difference(local.packages))
+
                 except Exception:
                     self.reporter.set_failed(local.base)
                     result.add_failed(local)
                     self.logger.exception("could not process %s", local.base)
-        self.clear_packages()
 
+        self.clear_packages()
         self.process_remove(removed_packages)
 
         return result

src/ahriman/core/support/keyring_trigger.py

@@ -103,7 +103,6 @@ class KeyringTrigger(Trigger):
             },
         },
     }
-    REQUIRES_REPOSITORY = True
 
     def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
         """

src/ahriman/core/support/mirrorlist_trigger.py

@@ -90,7 +90,6 @@ class MirrorlistTrigger(Trigger):
             },
         },
     }
-    REQUIRES_REPOSITORY = True
 
     def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
         """

src/ahriman/core/upload/upload_trigger.py

@@ -160,7 +160,6 @@ class UploadTrigger(Trigger):
             },
         },
     }
-    REQUIRES_REPOSITORY = True
 
     def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
         """

src/ahriman/core/utils.py

@@ -18,13 +18,16 @@
 # 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
 import itertools
 import logging
 import os
 import re
 import selectors
+import shutil
 import subprocess
 
 from collections.abc import Callable, Iterable, Iterator, Mapping
@@ -39,11 +42,13 @@ from ahriman.core.types import Comparable
 
 
 __all__ = [
+    "atomic_move",
     "check_output",
     "check_user",
     "dataclass_view",
     "enum_values",
     "extract_user",
+    "filelock",
     "filter_json",
     "full_version",
     "list_flatmap",
@@ -58,6 +63,7 @@ __all__ = [
     "safe_filename",
     "srcinfo_property",
     "srcinfo_property_list",
+    "symlink_relative",
     "trim_package",
     "utcnow",
     "walk",
@@ -68,6 +74,25 @@ R = TypeVar("R", bound=Comparable)
 T = TypeVar("T")
 
 
+def atomic_move(src: Path, dst: Path) -> None:
+    """
+    move file from ``source`` location to ``destination``. This method uses lock and :func:`shutil.move` to ensure that
+    file will be copied (if not rename) atomically. This method blocks execution until lock is available
+
+    Args:
+        src(Path): path to the source file
+        dst(Path): path to the destination
+
+    Examples:
+        This method is a drop-in replacement for :func:`shutil.move` (except it doesn't allow to override copy method)
+        which first locking destination file. To use it simply call method with arguments::
+
+            >>> atomic_move(src, dst)
+    """
+    with filelock(dst):
+        shutil.move(src, dst)
+
+
 # pylint: disable=too-many-locals
 def check_output(*args: str, exception: Exception | Callable[[int, list[str], str, str], Exception] | None = None,
                  cwd: Path | None = None, input_data: str | None = None,
@@ -239,6 +264,29 @@ 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) -> Iterator[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:
+        # remove lock file at the end
+        # there might be a race condition here, but we don't care about this case
+        lock_path.unlink(missing_ok=True)
+
+
 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
@@ -510,6 +558,17 @@ def srcinfo_property_list(key: str, srcinfo: Mapping[str, Any], package_srcinfo:
     return values
 
 
+def symlink_relative(symlink: Path, source: Path) -> None:
+    """
+    create symlink with relative path to the target directory
+
+    Args:
+        symlink(Path): path to symlink to create
+        source(Path): source file to be symlinked
+    """
+    symlink.symlink_to(source.relative_to(symlink.parent, walk_up=True))
+
+
 def trim_package(package_name: str) -> str:
     """
     remove version bound and description from package name. Pacman allows to specify version bound (=, <=, >= etc.) for

src/ahriman/models/package.py

@@ -357,7 +357,7 @@ class Package(LazyLogging):
         if local_version is None:
             return None  # local version not found, keep upstream pkgrel
 
-        if vercmp(self.version, local_version) > 0:
+        if self.vercmp(local_version) > 0:
             return None  # upstream version is newer than local one, keep upstream pkgrel
 
         *_, local_pkgrel = parse_version(local_version)
@@ -378,6 +378,19 @@ class Package(LazyLogging):
         details = "" if self.is_single_package else f""" ({" ".join(sorted(self.packages.keys()))})"""
         return f"{self.base}{details}"
 
+    def vercmp(self, version: str) -> int:
+        """
+        typed wrapper around :func:`pyalpm.vercmp()`
+
+        Args:
+            version(str): version to compare
+
+        Returns:
+            int: negative if current version is less than provided, positive if greater than and zero if equals
+        """
+        result: int = vercmp(self.version, version)
+        return result
+
     def view(self) -> dict[str, Any]:
         """
         generate json package view

src/ahriman/models/repository_paths.py

@@ -85,6 +85,16 @@ class RepositoryPaths(LazyLogging):
                 return Path(self.repository_id.architecture)  # legacy tree suffix
         return Path(self.repository_id.name) / self.repository_id.architecture
 
+    @property
+    def archive(self) -> Path:
+        """
+        archive directory root
+
+        Returns:
+            Path: archive directory root
+        """
+        return self.root / "archive"
+
     @property
     def build_root(self) -> Path:
         """
@@ -208,6 +218,23 @@ class RepositoryPaths(LazyLogging):
 
         return set(walk(instance))
 
+    def archive_for(self, package_base: str) -> Path:
+        """
+        get path to archive specified search criteria
+
+        Args:
+            package_base(str): package base name
+
+        Returns:
+            Path: path to archive directory for package base
+        """
+        directory = self.archive / "packages" / package_base[0] / package_base
+        if not directory.is_dir():  # create if not exists
+            with self.preserve_owner():
+                directory.mkdir(mode=0o755, parents=True)
+
+        return directory
+
     def cache_for(self, package_base: str) -> Path:
         """
         get path to cached PKGBUILD and package sources for the package base
@@ -265,6 +292,7 @@ class RepositoryPaths(LazyLogging):
         """
         for directory in (
                 self.cache_for(package_base),
+                self.archive_for(package_base),
         ):
             shutil.rmtree(directory, ignore_errors=True)
 
@@ -277,6 +305,7 @@ class RepositoryPaths(LazyLogging):
 
         with self.preserve_owner():
             for directory in (
+                    self.archive,
                     self.cache,
                     self.chroot,
                     self.packages,

src/ahriman/web/middlewares/exception_handler.py

@@ -21,8 +21,18 @@ import aiohttp_jinja2
 import logging
 
 from aiohttp.typedefs import Middleware
-from aiohttp.web import HTTPClientError, HTTPException, HTTPMethodNotAllowed, HTTPNoContent, HTTPServerError, \
-    HTTPUnauthorized, Request, StreamResponse, json_response, middleware
+from aiohttp.web import (
+    HTTPClientError,
+    HTTPException,
+    HTTPMethodNotAllowed,
+    HTTPNoContent,
+    HTTPServerError,
+    HTTPUnauthorized,
+    Request,
+    StreamResponse,
+    json_response,
+    middleware,
+)
 
 from ahriman.web.middlewares import HandlerType
 

src/ahriman/web/views/v1/packages/package.py

@@ -25,8 +25,12 @@ from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.package import Package
 from ahriman.models.user_access import UserAccess
 from ahriman.web.apispec.decorators import apidocs
-from ahriman.web.schemas import PackageNameSchema, PackageStatusSchema, PackageStatusSimplifiedSchema, \
-    RepositoryIdSchema
+from ahriman.web.schemas import (
+    PackageNameSchema,
+    PackageStatusSchema,
+    PackageStatusSimplifiedSchema,
+    RepositoryIdSchema,
+)
 from ahriman.web.views.base import BaseView
 from ahriman.web.views.status_view_guard import StatusViewGuard
 

src/ahriman/web/views/v1/service/upload.py

@@ -26,6 +26,7 @@ from tempfile import NamedTemporaryFile
 from typing import ClassVar
 
 from ahriman.core.configuration import Configuration
+from ahriman.core.utils import atomic_move
 from ahriman.models.repository_paths import RepositoryPaths
 from ahriman.models.user_access import UserAccess
 from ahriman.web.apispec.decorators import apidocs
@@ -152,10 +153,8 @@ class UploadView(BaseView):
 
             files.append(await self.save_file(part, target, max_body_size=max_body_size))
 
-        # and now we can rename files, which is relatively fast operation
-        # it is probably good way to call lock here, however
         for filename, current_location in files:
             target_location = current_location.parent / filename
-            current_location.rename(target_location)
+            atomic_move(current_location, target_location)
 
         raise HTTPCreated

subpackages.py

@@ -37,6 +37,7 @@ 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

@@ -6,6 +6,7 @@ from unittest.mock import call as MockCall
 
 from ahriman.application.handlers.tree_migrate import TreeMigrate
 from ahriman.core.configuration import Configuration
+from ahriman.models.package import Package
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.repository_paths import RepositoryPaths
 
@@ -16,6 +17,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
     """
     tree_create_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.tree_create")
     application_mock = mocker.patch("ahriman.application.handlers.tree_migrate.TreeMigrate.tree_move")
+    symlinks_mock = mocker.patch("ahriman.application.handlers.tree_migrate.TreeMigrate.fix_symlinks")
     _, repository_id = configuration.check_loaded()
     old_paths = configuration.repository_paths
     new_paths = RepositoryPaths(old_paths.root, old_paths.repository_id, _force_current_tree=True)
@@ -23,6 +25,37 @@ def test_run(args: argparse.Namespace, configuration: Configuration, mocker: Moc
     TreeMigrate.run(args, repository_id, configuration, report=False)
     tree_create_mock.assert_called_once_with()
     application_mock.assert_called_once_with(old_paths, new_paths)
+    symlinks_mock.assert_called_once_with(new_paths)
+
+
+def test_fix_symlinks(repository_paths: RepositoryPaths, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must replace symlinks during migration
+    """
+    mocker.patch("ahriman.models.repository_paths.RepositoryPaths.preserve_owner")
+    mocker.patch("ahriman.application.handlers.tree_migrate.walk", side_effect=[
+        [
+            repository_paths.archive_for(package_ahriman.base) / "file",
+            repository_paths.archive_for(package_ahriman.base) / "symlink",
+        ],
+        [
+            repository_paths.repository / "file",
+            repository_paths.repository / "symlink",
+        ],
+    ])
+    mocker.patch("pathlib.Path.exists", autospec=True, side_effect=lambda p: p.name == "file")
+    unlink_mock = mocker.patch("pathlib.Path.unlink")
+    symlink_mock = mocker.patch("pathlib.Path.symlink_to")
+
+    TreeMigrate.fix_symlinks(repository_paths)
+    unlink_mock.assert_called_once_with()
+    symlink_mock.assert_called_once_with(
+        Path("..") /
+        ".." /
+        ".." /
+        repository_paths.archive_for(package_ahriman.base).relative_to(repository_paths.root) /
+        "symlink"
+    )
 
 
 def test_move_tree(mocker: MockerFixture) -> None:

tests/ahriman/application/handlers/test_handler_validate.py

@@ -79,7 +79,7 @@ def test_run_repo_specific_triggers(args: argparse.Namespace, configuration: Con
     _, repository_id = configuration.check_loaded()
 
     # remove unused sections
-    for section in ("customs3", "github:x86_64", "logs-rotation", "mirrorlist"):
+    for section in ("archive", "customs3", "github:x86_64", "logs-rotation", "mirrorlist"):
         configuration.remove_section(section)
 
     configuration.set_option("report", "target", "test")

tests/ahriman/conftest.py

@@ -1,8 +1,10 @@
 import datetime
 import pytest
 
+from dataclasses import replace
 from pathlib import Path
 from pytest_mock import MockerFixture
+from sqlite3 import Cursor
 from typing import Any, TypeVar
 from unittest.mock import MagicMock, PropertyMock
 
@@ -11,12 +13,14 @@ from ahriman.core.alpm.remote import AUR
 from ahriman.core.auth import Auth
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
+from ahriman.core.database.migrations import Migrations
 from ahriman.core.repository import Repository
 from ahriman.core.spawn import Spawn
 from ahriman.core.status import Client
 from ahriman.core.status.watcher import Watcher
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
+from ahriman.models.migration import Migration
 from ahriman.models.package import Package
 from ahriman.models.package_description import PackageDescription
 from ahriman.models.package_source import PackageSource
@@ -48,7 +52,9 @@ def anyvar(cls: type[T], strict: bool = False) -> T:
         T: any wrapper
     """
     class AnyVar(cls):
-        """any value wrapper"""
+        """
+        any value wrapper
+        """
 
         def __eq__(self, other: Any) -> bool:
             """
@@ -271,16 +277,23 @@ def configuration(repository_id: RepositoryId, tmp_path: Path, resource_path_roo
 
 
 @pytest.fixture
-def database(configuration: Configuration) -> SQLite:
+def database(configuration: Configuration, mocker: MockerFixture) -> SQLite:
     """
     database fixture
 
     Args:
         configuration(Configuration): configuration fixture
+        mocker(MockerFixture): mocker object
 
     Returns:
         SQLite: database test instance
     """
+    original_method = Migrations.perform_migration
+
+    def perform_migration(self: Migrations, cursor: Cursor, migration: Migration) -> None:
+        original_method(self, cursor, replace(migration, migrate_data=lambda *args: None))
+
+    mocker.patch.object(Migrations, "perform_migration", autospec=True, side_effect=perform_migration)
     return SQLite.load(configuration)
 
 

tests/ahriman/core/alpm/test_repo.py

@@ -4,6 +4,16 @@ from pathlib import Path
 from pytest_mock import MockerFixture
 
 from ahriman.core.alpm.repo import Repo
+from ahriman.models.package import Package
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+def test_root(repository_paths: RepositoryPaths) -> None:
+    """
+    must correctly define repository root
+    """
+    assert Repo(repository_paths.repository_id.name, repository_paths, []).root == repository_paths.repository
+    assert Repo(repository_paths.repository_id.name, repository_paths, [], Path("path")).root == Path("path")
 
 
 def test_repo_path(repo: Repo) -> None:
@@ -22,6 +32,18 @@ def test_repo_add(repo: Repo, mocker: MockerFixture) -> None:
     repo.add(Path("path"))
     check_output_mock.assert_called_once()  # it will be checked later
     assert check_output_mock.call_args[0][0] == "repo-add"
+    assert "--remove" in check_output_mock.call_args[0]
+
+
+def test_repo_add_no_remove(repo: Repo, mocker: MockerFixture) -> None:
+    """
+    must call repo-add without remove flag
+    """
+    check_output_mock = mocker.patch("ahriman.core.alpm.repo.check_output")
+
+    repo.add(Path("path"), remove=False)
+    check_output_mock.assert_called_once()  # it will be checked later
+    assert "--remove" not in check_output_mock.call_args[0]
 
 
 def test_repo_init(repo: Repo, mocker: MockerFixture) -> None:
@@ -35,21 +57,23 @@ def test_repo_init(repo: Repo, mocker: MockerFixture) -> None:
     assert check_output_mock.call_args[0][0] == "repo-add"
 
 
-def test_repo_remove(repo: Repo, mocker: MockerFixture) -> None:
+def test_repo_remove(repo: Repo, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
-    must call repo-remove on package addition
+    must call repo-remove on package removal
     """
+    filepath = package_ahriman.packages[package_ahriman.base].filepath
     mocker.patch("pathlib.Path.glob", return_value=[])
     check_output_mock = mocker.patch("ahriman.core.alpm.repo.check_output")
 
-    repo.remove("package", Path("package.pkg.tar.xz"))
+    repo.remove(package_ahriman.base, filepath)
     check_output_mock.assert_called_once()  # it will be checked later
     assert check_output_mock.call_args[0][0] == "repo-remove"
+    assert package_ahriman.base in check_output_mock.call_args[0]
 
 
 def test_repo_remove_fail_no_file(repo: Repo, mocker: MockerFixture) -> None:
     """
-    must fail on missing file
+    must fail removal on missing file
     """
     mocker.patch("pathlib.Path.glob", return_value=[Path("package.pkg.tar.xz")])
     mocker.patch("pathlib.Path.unlink", side_effect=FileNotFoundError)

tests/ahriman/core/archive/conftest.py

@@ -0,0 +1,34 @@
+import pytest
+
+from ahriman.core.archive import ArchiveTrigger
+from ahriman.core.archive.archive_tree import ArchiveTree
+from ahriman.core.configuration import Configuration
+
+
+@pytest.fixture
+def archive_tree(configuration: Configuration) -> ArchiveTree:
+    """
+    archive tree fixture
+
+    Args:
+        configuration(Configuration): configuration fixture
+
+    Returns:
+        ArchiveTree: archive tree test instance
+    """
+    return ArchiveTree(configuration.repository_paths, [])
+
+
+@pytest.fixture
+def archive_trigger(configuration: Configuration) -> ArchiveTrigger:
+    """
+    archive trigger fixture
+
+    Args:
+        configuration(Configuration): configuration fixture
+
+    Returns:
+        ArchiveTrigger: archive trigger test instance
+    """
+    _, repository_id = configuration.check_loaded()
+    return ArchiveTrigger(repository_id, configuration)

tests/ahriman/core/archive/test_archive_tree.py

@@ -0,0 +1,175 @@
+from pathlib import Path
+from pytest_mock import MockerFixture
+from unittest.mock import call as MockCall
+
+from ahriman.core.archive.archive_tree import ArchiveTree
+from ahriman.core.utils import utcnow
+from ahriman.models.package import Package
+
+
+def test_repo(archive_tree: ArchiveTree) -> None:
+    """
+    must return correct repository object
+    """
+    local = Path("local")
+    repo = archive_tree._repo(local)
+
+    assert repo.sign_args == archive_tree.sign_args
+    assert repo.name == archive_tree.repository_id.name
+    assert repo.root == local
+
+
+def test_repository_for(archive_tree: ArchiveTree) -> None:
+    """
+    must correctly generate path to repository
+    """
+    path = archive_tree.repository_for()
+    assert path.is_relative_to(archive_tree.paths.archive / "repos")
+    assert (archive_tree.repository_id.name, archive_tree.repository_id.architecture) == path.parts[-2:]
+    assert set(map("{:02d}".format, utcnow().timetuple()[:3])).issubset(path.parts)
+
+
+def test_directories_fix(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
+    """
+    must remove empty directories recursively
+    """
+    root = archive_tree.paths.archive / "repos"
+    (root / "a" / "b").mkdir(parents=True, exist_ok=True)
+    (root / "a" / "b" / "file").touch()
+    (root / "a" / "b" / "c" / "d").mkdir(parents=True, exist_ok=True)
+
+    _original_rmdir = Path.rmdir
+    rmdir_mock = mocker.patch("pathlib.Path.rmdir", autospec=True, side_effect=_original_rmdir)
+
+    archive_tree.directories_fix({Path("a") / "b" / "c" / "d"})
+    rmdir_mock.assert_has_calls([
+        MockCall(root / "a" / "b" / "c" / "d"),
+        MockCall(root / "a" / "b" / "c"),
+    ])
+
+
+def test_symlinks_create(archive_tree: ArchiveTree, package_ahriman: Package, package_python_schedule: Package,
+                         mocker: MockerFixture) -> None:
+    """
+    must create symlinks
+    """
+    _original_exists = Path.exists
+
+    symlinks_mock = mocker.patch("pathlib.Path.symlink_to", side_effect=(None, FileExistsError, FileExistsError))
+    add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
+    mocker.patch("pathlib.Path.glob", autospec=True, side_effect=lambda path, name: [path / name[:-1]])
+
+    archive_tree.symlinks_create([package_ahriman, package_python_schedule])
+    symlinks_mock.assert_has_calls([
+        MockCall(Path("..") /
+                 ".." /
+                 ".." /
+                 ".." /
+                 ".." /
+                 ".." /
+                 archive_tree.paths.archive_for(package.base)
+                 .relative_to(archive_tree.paths.root)
+                 .relative_to("archive") /
+                 single.filename
+                 )
+        for package in (package_ahriman, package_python_schedule)
+        for single in package.packages.values()
+    ])
+    add_mock.assert_called_once_with(
+        archive_tree.repository_for() / package_ahriman.packages[package_ahriman.base].filename
+    )
+
+
+def test_symlinks_create_empty_filename(archive_tree: ArchiveTree, package_ahriman: Package,
+                                        mocker: MockerFixture) -> None:
+    """
+    must skip symlinks creation if filename is not set
+    """
+    package_ahriman.packages[package_ahriman.base].filename = None
+    symlinks_mock = mocker.patch("pathlib.Path.symlink_to")
+
+    archive_tree.symlinks_create([package_ahriman])
+    symlinks_mock.assert_not_called()
+
+
+def test_symlinks_fix(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
+    """
+    must fix broken symlinks
+    """
+    _original_exists = Path.exists
+
+    def exists_mock(path: Path) -> bool:
+        if path.name.startswith("symlink"):
+            return True
+        return _original_exists(path)
+
+    mocker.patch("pathlib.Path.is_symlink", side_effect=[True, True, False])
+    mocker.patch("pathlib.Path.exists", autospec=True, side_effect=exists_mock)
+    walk_mock = mocker.patch("ahriman.core.archive.archive_tree.walk", return_value=[
+        archive_tree.repository_for() / filename
+        for filename in (
+            "symlink-1.0.0-1-x86_64.pkg.tar.zst",
+            "broken_symlink-1.0.0-1-x86_64.pkg.tar.zst",
+            "file-1.0.0-1-x86_64.pkg.tar.zst",
+        )
+    ])
+    remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
+
+    assert list(archive_tree.symlinks_fix()) == [
+        archive_tree.repository_for().relative_to(archive_tree.paths.archive / "repos"),
+    ]
+    walk_mock.assert_called_once_with(archive_tree.paths.archive / "repos")
+    remove_mock.assert_called_once_with(
+        "broken_symlink", archive_tree.repository_for() / "broken_symlink-1.0.0-1-x86_64.pkg.tar.zst")
+
+
+def test_symlinks_fix_foreign_repository(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
+    """
+    must skip symlinks check if repository name or architecture doesn't match
+    """
+    _original_exists = Path.exists
+
+    def exists_mock(path: Path) -> bool:
+        if path.name.startswith("symlink"):
+            return True
+        return _original_exists(path)
+
+    mocker.patch("pathlib.Path.is_symlink", side_effect=[True, True, False])
+    mocker.patch("pathlib.Path.exists", autospec=True, side_effect=exists_mock)
+    mocker.patch("ahriman.core.archive.archive_tree.walk", return_value=[
+        archive_tree.repository_for().with_name("i686") / filename
+        for filename in (
+            "symlink-1.0.0-1-x86_64.pkg.tar.zst",
+            "broken_symlink-1.0.0-1-x86_64.pkg.tar.zst",
+            "file-1.0.0-1-x86_64.pkg.tar.zst",
+        )
+    ])
+    remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
+
+    assert list(archive_tree.symlinks_fix()) == []
+    remove_mock.assert_not_called()
+
+
+def test_tree_create(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
+    """
+    must create repository root if not exists
+    """
+    owner_guard_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.preserve_owner")
+    mkdir_mock = mocker.patch("pathlib.Path.mkdir")
+    init_mock = mocker.patch("ahriman.core.alpm.repo.Repo.init")
+
+    archive_tree.tree_create()
+    owner_guard_mock.assert_called_once_with()
+    mkdir_mock.assert_called_once_with(0o755, parents=True)
+    init_mock.assert_called_once_with()
+
+
+def test_tree_create_exists(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
+    """
+    must skip directory creation if already exists
+    """
+    mocker.patch("pathlib.Path.exists", return_value=True)
+    mkdir_mock = mocker.patch("pathlib.Path.mkdir")
+
+    archive_tree.tree_create()
+    mkdir_mock.assert_not_called()

tests/ahriman/core/archive/test_archive_trigger.py

@@ -0,0 +1,37 @@
+from pathlib import Path
+from pytest_mock import MockerFixture
+
+from ahriman.core.archive import ArchiveTrigger
+from ahriman.models.package import Package
+from ahriman.models.result import Result
+
+
+def test_on_result(archive_trigger: ArchiveTrigger, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must create symlinks for actual repository
+    """
+    symlinks_mock = mocker.patch("ahriman.core.archive.archive_tree.ArchiveTree.symlinks_create")
+    archive_trigger.on_result(Result(), [package_ahriman])
+    symlinks_mock.assert_called_once_with([package_ahriman])
+
+
+def test_on_start(archive_trigger: ArchiveTrigger, mocker: MockerFixture) -> None:
+    """
+    must create repository tree on load
+    """
+    tree_mock = mocker.patch("ahriman.core.archive.archive_tree.ArchiveTree.tree_create")
+    archive_trigger.on_start()
+    tree_mock.assert_called_once_with()
+
+
+def test_on_stop(archive_trigger: ArchiveTrigger, mocker: MockerFixture) -> None:
+    """
+    must fix broken symlinks on stop
+    """
+    local = Path("local")
+    symlinks_mock = mocker.patch("ahriman.core.archive.archive_tree.ArchiveTree.symlinks_fix", return_value=[local])
+    directories_mock = mocker.patch("ahriman.core.archive.archive_tree.ArchiveTree.directories_fix")
+
+    archive_trigger.on_stop()
+    symlinks_mock.assert_called_once_with()
+    directories_mock.assert_called_once_with({local})

tests/ahriman/core/database/migrations/test_m016_archive.py

@@ -0,0 +1,78 @@
+import pytest
+
+from dataclasses import replace
+from pathlib import Path
+from pytest_mock import MockerFixture
+from sqlite3 import Connection
+from typing import Any
+from unittest.mock import call as MockCall
+
+from ahriman.core.alpm.pacman import Pacman
+from ahriman.core.configuration import Configuration
+from ahriman.core.database.migrations.m016_archive import migrate_data, move_packages
+from ahriman.models.package import Package
+from ahriman.models.repository_paths import RepositoryPaths
+
+
+def test_migrate_data(connection: Connection, configuration: Configuration, mocker: MockerFixture) -> None:
+    """
+    must perform data migration
+    """
+    _, repository_id = configuration.check_loaded()
+    repositories = [
+        repository_id,
+        replace(repository_id, architecture="i686"),
+    ]
+    mocker.patch("ahriman.application.handlers.handler.Handler.repositories_extract", return_value=repositories)
+    migration_mock = mocker.patch("ahriman.core.database.migrations.m016_archive.move_packages")
+
+    migrate_data(connection, configuration)
+    migration_mock.assert_has_calls([
+        MockCall(replace(configuration.repository_paths, repository_id=repository), pytest.helpers.anyvar(int))
+        for repository in repositories
+    ])
+
+
+def test_move_packages(repository_paths: RepositoryPaths, pacman: Pacman, package_ahriman: Package,
+                       mocker: MockerFixture) -> None:
+    """
+    must move packages to the archive directory
+    """
+
+    def is_file(self: Path, *args: Any, **kwargs: Any) -> bool:
+        return "file" in self.name
+
+    mocker.patch("pathlib.Path.iterdir", return_value=[
+        repository_paths.repository / ".hidden-file.pkg.tar.xz",
+        repository_paths.repository / "directory",
+        repository_paths.repository / "file.pkg.tar.xz",
+        repository_paths.repository / "file.pkg.tar.xz.sig",
+        repository_paths.repository / "file2.pkg.tar.xz",
+        repository_paths.repository / "symlink.pkg.tar.xz",
+    ])
+    mocker.patch("pathlib.Path.is_dir", return_value=True)
+    mocker.patch("pathlib.Path.is_file", autospec=True, side_effect=is_file)
+    mocker.patch("pathlib.Path.exists", return_value=True)
+    archive_mock = mocker.patch("ahriman.models.package.Package.from_archive", return_value=package_ahriman)
+    move_mock = mocker.patch("ahriman.core.database.migrations.m016_archive.atomic_move")
+    symlink_mock = mocker.patch("pathlib.Path.symlink_to")
+
+    move_packages(repository_paths, pacman)
+    archive_mock.assert_has_calls([
+        MockCall(repository_paths.repository / filename, pacman)
+        for filename in ("file.pkg.tar.xz", "file2.pkg.tar.xz")
+    ])
+    move_mock.assert_has_calls([
+        MockCall(repository_paths.repository / filename, repository_paths.archive_for(package_ahriman.base) / filename)
+        for filename in ("file.pkg.tar.xz", "file.pkg.tar.xz.sig", "file2.pkg.tar.xz")
+    ])
+    symlink_mock.assert_has_calls([
+        MockCall(
+            Path("..") /
+            ".." /
+            ".." /
+            repository_paths.archive_for(package_ahriman.base).relative_to(repository_paths.root) /
+            filename
+        )
+        for filename in ("file.pkg.tar.xz", "file.pkg.tar.xz.sig", "file2.pkg.tar.xz")
+    ])

tests/ahriman/core/housekeeping/conftest.py

@@ -1,13 +1,28 @@
 import pytest
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.housekeeping import LogsRotationTrigger
+from ahriman.core.housekeeping import ArchiveRotationTrigger, LogsRotationTrigger
+
+
+@pytest.fixture
+def archive_rotation_trigger(configuration: Configuration) -> ArchiveRotationTrigger:
+    """
+    archive rotation trigger fixture
+
+    Args:
+        configuration(Configuration): configuration fixture
+
+    Returns:
+        ArchiveRotationTrigger: archive rotation trigger test instance
+    """
+    _, repository_id = configuration.check_loaded()
+    return ArchiveRotationTrigger(repository_id, configuration)
 
 
 @pytest.fixture
 def logs_rotation_trigger(configuration: Configuration) -> LogsRotationTrigger:
     """
-    logs roration trigger fixture
+    logs rotation trigger fixture
 
     Args:
         configuration(Configuration): configuration fixture

tests/ahriman/core/housekeeping/test_archive_rotation_trigger.py

@@ -0,0 +1,83 @@
+import pytest
+
+from dataclasses import replace
+from pathlib import Path
+from pytest_mock import MockerFixture
+from typing import Any
+from unittest.mock import call as MockCall
+
+from ahriman.core.alpm.pacman import Pacman
+from ahriman.core.configuration import Configuration
+from ahriman.core.housekeeping import ArchiveRotationTrigger
+from ahriman.models.package import Package
+from ahriman.models.result import Result
+
+
+def test_configuration_sections(configuration: Configuration) -> None:
+    """
+    must correctly parse target list
+    """
+    assert ArchiveRotationTrigger.configuration_sections(configuration) == ["archive"]
+
+
+def test_archives_remove(archive_rotation_trigger: ArchiveRotationTrigger, package_ahriman: Package,
+                         pacman: Pacman, mocker: MockerFixture) -> None:
+    """
+    must remove older packages
+    """
+    def package(version: Any, *args: Any, **kwargs: Any) -> Package:
+        generated = replace(package_ahriman, version=str(version))
+        generated.packages = {
+            key: replace(value, filename=str(version))
+            for key, value in generated.packages.items()
+        }
+        return generated
+
+    mocker.patch("pathlib.Path.is_dir", return_value=True)
+    mocker.patch("ahriman.core.housekeeping.archive_rotation_trigger.package_like", return_value=True)
+    mocker.patch("pathlib.Path.glob", return_value=[Path(str(i)) for i in range(5)])
+    mocker.patch("pathlib.Path.iterdir", return_value=[Path(str(i)) for i in range(5)])
+    mocker.patch("ahriman.models.package.Package.from_archive", side_effect=package)
+    unlink_mock = mocker.patch("pathlib.Path.unlink", autospec=True)
+
+    archive_rotation_trigger.archives_remove(package_ahriman, pacman)
+    unlink_mock.assert_has_calls([
+        MockCall(Path("0")),
+        MockCall(Path("1")),
+    ])
+
+
+def test_archives_remove_keep(archive_rotation_trigger: ArchiveRotationTrigger, package_ahriman: Package,
+                              pacman: Pacman, mocker: MockerFixture) -> None:
+    """
+    must keep all packages if set to
+    """
+    def package(version: Any, *args: Any, **kwargs: Any) -> Package:
+        generated = replace(package_ahriman, version=str(version))
+        generated.packages = {
+            key: replace(value, filename=str(version))
+            for key, value in generated.packages.items()
+        }
+        return generated
+
+    mocker.patch("pathlib.Path.is_dir", return_value=True)
+    mocker.patch("ahriman.core.housekeeping.archive_rotation_trigger.package_like", return_value=True)
+    mocker.patch("pathlib.Path.glob", return_value=[Path(str(i)) for i in range(5)])
+    mocker.patch("pathlib.Path.iterdir", return_value=[Path(str(i)) for i in range(5)])
+    mocker.patch("ahriman.models.package.Package.from_archive", side_effect=package)
+    unlink_mock = mocker.patch("pathlib.Path.unlink", autospec=True)
+
+    archive_rotation_trigger.keep_built_packages = 0
+    archive_rotation_trigger.archives_remove(package_ahriman, pacman)
+    unlink_mock.assert_not_called()
+
+
+def test_on_result(archive_rotation_trigger: ArchiveRotationTrigger, package_ahriman: Package,
+                   package_python_schedule: Package, mocker: MockerFixture) -> None:
+    """
+    must rotate archives
+    """
+    mocker.patch("ahriman.core._Context.get")
+    remove_mock = mocker.patch("ahriman.core.housekeeping.ArchiveRotationTrigger.archives_remove")
+    archive_rotation_trigger.on_result(Result(added=[package_ahriman], failed=[package_python_schedule]), [])
+    remove_mock.assert_called_once_with(package_ahriman, pytest.helpers.anyvar(int))

tests/ahriman/core/housekeeping/test_logs_rotation_trigger.py

@@ -7,13 +7,6 @@ from ahriman.core.status import Client
 from ahriman.models.result import Result
 
 
-def test_requires_repository() -> None:
-    """
-    must require repository identifier to be set to start
-    """
-    assert LogsRotationTrigger.REQUIRES_REPOSITORY
-
-
 def test_configuration_sections(configuration: Configuration) -> None:
     """
     must correctly parse target list
@@ -21,7 +14,7 @@ def test_configuration_sections(configuration: Configuration) -> None:
     assert LogsRotationTrigger.configuration_sections(configuration) == ["logs-rotation"]
 
 
-def test_rotate(logs_rotation_trigger: LogsRotationTrigger, mocker: MockerFixture) -> None:
+def test_on_result(logs_rotation_trigger: LogsRotationTrigger, mocker: MockerFixture) -> None:
     """
     must rotate logs
     """

tests/ahriman/core/report/test_report_trigger.py

@@ -5,13 +5,6 @@ from ahriman.core.report import ReportTrigger
 from ahriman.models.result import Result
 
 
-def test_requires_repository() -> None:
-    """
-    must require repository identifier to be set to start
-    """
-    assert ReportTrigger.REQUIRES_REPOSITORY
-
-
 def test_configuration_sections(configuration: Configuration) -> None:
     """
     must correctly parse target list

tests/ahriman/core/repository/test_executor.py

@@ -1,5 +1,6 @@
 import pytest
 
+from dataclasses import replace
 from pathlib import Path
 from pytest_mock import MockerFixture
 from typing import Any
@@ -13,34 +14,212 @@ 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
+    """
+    path = "gconf-3.2.6+11+g07808097-10-x86_64.pkg.tar.zst"
+    safe_path = "gconf-3.2.6-11-g07808097-10-x86_64.pkg.tar.zst"
+    package_ahriman.packages[package_ahriman.base].filename = path
+    rename_mock = mocker.patch("ahriman.core.repository.executor.atomic_move")
+
+    executor._archive_rename(package_ahriman.packages[package_ahriman.base], package_ahriman.base)
+    rename_mock.assert_called_once_with(executor.paths.packages / path, executor.paths.packages / safe_path)
+    assert package_ahriman.packages[package_ahriman.base].filename == safe_path
+
+
+def test_archive_rename_empty_filename(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must skip renaming if filename is not set
+    """
+    package_ahriman.packages[package_ahriman.base].filename = None
+    rename_mock = mocker.patch("ahriman.core.repository.executor.atomic_move")
+
+    executor._archive_rename(package_ahriman.packages[package_ahriman.base], package_ahriman.base)
+    rename_mock.assert_not_called()
+
+
+def test_package_build(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must build single package
+    """
+    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
+    """
+    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
+    executor._package_remove(package_ahriman.base, package_ahriman.packages[package_ahriman.base].filepath)
+    repo_remove_mock.assert_called_once_with(
+        package_ahriman.base, package_ahriman.packages[package_ahriman.base].filepath)
+
+
+def test_package_remove_failed(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must suppress errors during archive removal
+    """
+    mocker.patch("ahriman.core.alpm.repo.Repo.remove", side_effect=Exception)
+    executor._package_remove(package_ahriman.base, package_ahriman.packages[package_ahriman.base].filepath)
+
+
+def test_package_remove_base(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must run remove base from status client
+    """
+    status_client_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove")
+    executor._package_remove_base(package_ahriman.base)
+    status_client_mock.assert_called_once_with(package_ahriman.base)
+
+
+def test_package_remove_base_failed(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must suppress errors during base removal
+    """
+    mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove", side_effect=Exception)
+    executor._package_remove_base(package_ahriman.base)
+
+
+def test_package_update(executor: Executor, package_ahriman: Package, user: User, mocker: MockerFixture) -> None:
+    """
+    must update built package in repository
+    """
+    rename_mock = mocker.patch("ahriman.core.repository.executor.atomic_move")
+    symlink_mock = mocker.patch("pathlib.Path.symlink_to")
+    repo_add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
+    sign_package_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process_sign_package", side_effect=lambda fn, _: [fn])
+    filepath = next(package.filepath for package in package_ahriman.packages.values())
+
+    executor._package_update(filepath, package_ahriman.base, user.key)
+    # must move files (once)
+    rename_mock.assert_called_once_with(
+        executor.paths.packages / filepath, executor.paths.archive_for(package_ahriman.base) / filepath)
+    # must sign package
+    sign_package_mock.assert_called_once_with(executor.paths.packages / filepath, user.key)
+    # symlink to the archive
+    symlink_mock.assert_called_once_with(
+        Path("..") /
+        ".." /
+        ".." /
+        executor.paths.archive_for(package_ahriman.base).relative_to(executor.paths.root) /
+        filepath)
+    # must add package
+    repo_add_mock.assert_called_once_with(executor.paths.repository / filepath)
+
+
+def test_package_update_empty_filename(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must skip update for package which does not have path
+    """
+    rename_mock = mocker.patch("ahriman.core.repository.executor.atomic_move")
+    executor._package_update(None, package_ahriman.base, None)
+    rename_mock.assert_not_called()
+
+
 def test_process_build(executor: Executor, package_ahriman: Package, passwd: Any, mocker: MockerFixture) -> None:
     """
     must run build process
     """
     mocker.patch("ahriman.models.repository_paths.getpwuid", return_value=passwd)
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
-    init_mock = mocker.patch("ahriman.core.build_tools.task.Task.init", return_value="sha")
-    move_mock = mocker.patch("shutil.move")
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_building")
     changes_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_changes_get",
                                 return_value=Changes("commit", "change"))
     commit_sha_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_changes_update")
     depends_on_mock = mocker.patch("ahriman.core.build_tools.package_archive.PackageArchive.depends_on",
                                    return_value=Dependencies())
     dependencies_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_dependencies_update")
-    with_packages_mock = mocker.patch("ahriman.models.package.Package.with_packages")
+    build_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_build", return_value="sha")
 
     executor.process_build([package_ahriman], Packagers("packager"), bump_pkgrel=False)
-    init_mock.assert_called_once_with(pytest.helpers.anyvar(int), pytest.helpers.anyvar(int), None)
-    with_packages_mock.assert_called_once_with([Path(package_ahriman.base)], executor.pacman)
     changes_mock.assert_called_once_with(package_ahriman.base)
+    build_mock.assert_called_once_with(package_ahriman, pytest.helpers.anyvar(Path, strict=True), None, None)
     depends_on_mock.assert_called_once_with()
     dependencies_mock.assert_called_once_with(package_ahriman.base, Dependencies())
-    # must move files (once)
-    move_mock.assert_called_once_with(Path(package_ahriman.base), executor.paths.packages / package_ahriman.base)
-    # must update status
-    status_client_mock.assert_called_once_with(package_ahriman.base)
     commit_sha_mock.assert_called_once_with(package_ahriman.base, Changes("sha", "change"))
 
 
@@ -50,7 +229,7 @@ def test_process_build_bump_pkgrel(executor: Executor, package_ahriman: Package,
     """
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
     mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
-    mocker.patch("shutil.move")
+    mocker.patch("ahriman.core.repository.executor.atomic_move")
     init_mock = mocker.patch("ahriman.core.build_tools.task.Task.init")
 
     executor.process_build([package_ahriman], Packagers("packager"), bump_pkgrel=True)
@@ -67,7 +246,7 @@ def test_process_build_failure(executor: Executor, package_ahriman: Package, moc
     mocker.patch("ahriman.core.repository.executor.Executor.packages_built")
     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("shutil.move", side_effect=Exception)
+    mocker.patch("ahriman.core.repository.executor.atomic_move", side_effect=Exception)
     status_client_mock = mocker.patch("ahriman.core.status.Client.set_failed")
 
     executor.process_build([package_ahriman])
@@ -79,15 +258,15 @@ def test_process_remove_base(executor: Executor, package_ahriman: Package, mocke
     must run remove process for whole base
     """
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
-    status_client_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove")
+    remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove")
+    base_remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove_base")
 
     executor.process_remove([package_ahriman.base])
     # must remove via alpm wrapper
-    repo_remove_mock.assert_called_once_with(
+    remove_mock.assert_called_once_with(
         package_ahriman.base, package_ahriman.packages[package_ahriman.base].filepath)
     # must update status and remove package files
-    status_client_mock.assert_called_once_with(package_ahriman.base)
+    base_remove_mock.assert_called_once_with(package_ahriman.base)
 
 
 def test_process_remove_with_debug(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
@@ -99,12 +278,12 @@ def test_process_remove_with_debug(executor: Executor, package_ahriman: Package,
         f"{package_ahriman.base}-debug": package_ahriman.packages[package_ahriman.base],
     }
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove")
-    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
+    mocker.patch("ahriman.core.repository.executor.Executor._package_remove_base")
+    remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove")
 
     executor.process_remove([package_ahriman.base])
     # must remove via alpm wrapper
-    repo_remove_mock.assert_has_calls([
+    remove_mock.assert_has_calls([
         MockCall(package_ahriman.base, package_ahriman.packages[package_ahriman.base].filepath),
         MockCall(f"{package_ahriman.base}-debug", package_ahriman.packages[package_ahriman.base].filepath),
     ])
@@ -116,12 +295,12 @@ def test_process_remove_base_multiple(executor: Executor, package_python_schedul
     must run remove process for whole base with multiple packages
     """
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_python_schedule])
-    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
-    status_client_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove")
+    remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove")
+    status_client_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove_base")
 
     executor.process_remove([package_python_schedule.base])
     # must remove via alpm wrapper
-    repo_remove_mock.assert_has_calls([
+    remove_mock.assert_has_calls([
         MockCall(package, props.filepath)
         for package, props in package_python_schedule.packages.items()
     ], any_order=True)
@@ -135,45 +314,27 @@ def test_process_remove_base_single(executor: Executor, package_python_schedule:
     must run remove process for single package in base
     """
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_python_schedule])
-    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
-    status_client_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove")
+    remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove")
+    status_client_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove_base")
 
     executor.process_remove(["python2-schedule"])
     # must remove via alpm wrapper
-    repo_remove_mock.assert_called_once_with(
+    remove_mock.assert_called_once_with(
         "python2-schedule", package_python_schedule.packages["python2-schedule"].filepath)
     # must not update status
     status_client_mock.assert_not_called()
 
 
-def test_process_remove_failed(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must suppress tree clear errors during package base removal
-    """
-    mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove", side_effect=Exception)
-    executor.process_remove([package_ahriman.base])
-
-
-def test_process_remove_tree_clear_failed(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must suppress remove errors
-    """
-    mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    mocker.patch("ahriman.core.alpm.repo.Repo.remove", side_effect=Exception)
-    executor.process_remove([package_ahriman.base])
-
-
 def test_process_remove_nothing(executor: Executor, package_ahriman: Package, package_python_schedule: Package,
                                 mocker: MockerFixture) -> None:
     """
     must not remove anything if it was not requested
     """
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
+    remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove")
 
     executor.process_remove([package_python_schedule.base])
-    repo_remove_mock.assert_not_called()
+    remove_mock.assert_not_called()
 
 
 def test_process_remove_unknown(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
@@ -181,11 +342,11 @@ def test_process_remove_unknown(executor: Executor, package_ahriman: Package, mo
     must remove unknown package base
     """
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[])
-    repo_remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
-    status_client_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_remove")
+    remove_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove")
+    status_client_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_remove_base")
 
     executor.process_remove([package_ahriman.base])
-    repo_remove_mock.assert_not_called()
+    remove_mock.assert_not_called()
     status_client_mock.assert_called_once_with(package_ahriman.base)
 
 
@@ -195,9 +356,8 @@ def test_process_update(executor: Executor, package_ahriman: Package, user: User
     """
     mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_ahriman])
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    move_mock = mocker.patch("shutil.move")
-    repo_add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
-    sign_package_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process_sign_package", side_effect=lambda fn, _: [fn])
+    rename_mock = mocker.patch("ahriman.core.repository.executor.Executor._archive_rename")
+    update_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_update")
     status_client_mock = mocker.patch("ahriman.core.status.Client.set_success")
     remove_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_remove")
     packager_mock = mocker.patch("ahriman.core.repository.executor.Executor.packager", return_value=user)
@@ -206,12 +366,8 @@ def test_process_update(executor: Executor, package_ahriman: Package, user: User
     # must return complete
     assert executor.process_update([filepath], Packagers("packager"))
     packager_mock.assert_called_once_with(Packagers("packager"), "ahriman")
-    # must move files (once)
-    move_mock.assert_called_once_with(executor.paths.packages / filepath, executor.paths.repository / filepath)
-    # must sign package
-    sign_package_mock.assert_called_once_with(executor.paths.packages / filepath, user.key)
-    # must add package
-    repo_add_mock.assert_called_once_with(executor.paths.repository / filepath)
+    rename_mock.assert_called_once_with(package_ahriman.packages[package_ahriman.base], package_ahriman.base)
+    update_mock.assert_called_once_with(filepath.name, package_ahriman.base, user.key)
     # must update status
     status_client_mock.assert_called_once_with(package_ahriman)
     # must clear directory
@@ -226,58 +382,26 @@ def test_process_update_group(executor: Executor, package_python_schedule: Packa
     """
     must group single packages under one base
     """
-    mocker.patch("shutil.move")
     mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_python_schedule])
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_python_schedule])
-    repo_add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
+    update_mock = mocker.patch("ahriman.core.repository.executor.Executor._package_update")
     status_client_mock = mocker.patch("ahriman.core.status.Client.set_success")
     remove_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_remove")
 
     executor.process_update([package.filepath for package in package_python_schedule.packages.values()])
-    repo_add_mock.assert_has_calls([
-        MockCall(executor.paths.repository / package.filepath)
+    update_mock.assert_has_calls([
+        MockCall(package.filename, package_python_schedule.base, None)
         for package in package_python_schedule.packages.values()
     ], any_order=True)
     status_client_mock.assert_called_once_with(package_python_schedule)
     remove_mock.assert_called_once_with([])
 
 
-def test_process_update_unsafe(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must encode file name
-    """
-    path = "gconf-3.2.6+11+g07808097-10-x86_64.pkg.tar.zst"
-    safe_path = "gconf-3.2.6-11-g07808097-10-x86_64.pkg.tar.zst"
-    package_ahriman.packages[package_ahriman.base].filename = path
-
-    mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_ahriman])
-    mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    move_mock = mocker.patch("shutil.move")
-    repo_add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
-
-    executor.process_update([Path(path)])
-    move_mock.assert_has_calls([
-        MockCall(executor.paths.packages / path, executor.paths.packages / safe_path),
-        MockCall(executor.paths.packages / safe_path, executor.paths.repository / safe_path)
-    ])
-    repo_add_mock.assert_called_once_with(executor.paths.repository / safe_path)
-
-
-def test_process_empty_filename(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must skip update for package which does not have path
-    """
-    package_ahriman.packages[package_ahriman.base].filename = None
-    mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_ahriman])
-    mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    executor.process_update([package.filepath for package in package_ahriman.packages.values()])
-
-
 def test_process_update_failed(executor: Executor, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must process update for failed package
     """
-    mocker.patch("shutil.move", side_effect=Exception)
+    mocker.patch("ahriman.core.repository.executor.Executor._package_update", side_effect=Exception)
     mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_ahriman])
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
     status_client_mock = mocker.patch("ahriman.core.status.Client.set_failed")
@@ -294,8 +418,7 @@ def test_process_update_removed_package(executor: Executor, package_python_sched
     without_python2 = Package.from_json(package_python_schedule.view())
     del without_python2.packages["python2-schedule"]
 
-    mocker.patch("shutil.move")
-    mocker.patch("ahriman.core.alpm.repo.Repo.add")
+    mocker.patch("ahriman.core.repository.executor.Executor._package_update")
     mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[without_python2])
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_python_schedule])
     remove_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_remove")

tests/ahriman/core/support/test_keyring_trigger.py

@@ -7,13 +7,6 @@ from ahriman.core.sign.gpg import GPG
 from ahriman.core.support import KeyringTrigger
 
 
-def test_requires_repository() -> None:
-    """
-    must require repository identifier to be set to start
-    """
-    assert KeyringTrigger.REQUIRES_REPOSITORY
-
-
 def test_configuration_sections(configuration: Configuration) -> None:
     """
     must correctly parse target list

tests/ahriman/core/support/test_mirrorlist_trigger.py

@@ -4,13 +4,6 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.support import MirrorlistTrigger
 
 
-def test_requires_repository() -> None:
-    """
-    must require repository identifier to be set to start
-    """
-    assert MirrorlistTrigger.REQUIRES_REPOSITORY
-
-
 def test_configuration_sections(configuration: Configuration) -> None:
     """
     must correctly parse target list

tests/ahriman/core/test_utils.py

@@ -1,4 +1,5 @@
 import datetime
+import fcntl
 import logging
 import os
 import pytest
@@ -16,6 +17,18 @@ from ahriman.models.repository_id import RepositoryId
 from ahriman.models.repository_paths import RepositoryPaths
 
 
+def test_atomic_move(mocker: MockerFixture) -> None:
+    """
+    must move file with locking
+    """
+    filelock_mock = mocker.patch("ahriman.core.utils.filelock")
+    move_mock = mocker.patch("shutil.move")
+
+    atomic_move(Path("source"), Path("destination"))
+    filelock_mock.assert_called_once_with(Path("destination"))
+    move_mock.assert_called_once_with(Path("source"), Path("destination"))
+
+
 def test_check_output(mocker: MockerFixture) -> None:
     """
     must run command and log result
@@ -235,6 +248,53 @@ 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
@@ -470,6 +530,23 @@ def test_srcinfo_property_list() -> None:
     assert srcinfo_property_list("key", {"key_x86_64": ["overrides"]}, {}, architecture="x86_64") == ["overrides"]
 
 
+def test_symlink_relative(mocker: MockerFixture) -> None:
+    """
+    must create symlinks with relative paths
+    """
+    symlink_mock = mocker.patch("pathlib.Path.symlink_to")
+
+    symlink_relative(Path("a"), Path("b"))
+    symlink_relative(Path("root/a"), Path("root/c"))
+    symlink_relative(Path("root/sub/a"), Path("root/c"))
+
+    symlink_mock.assert_has_calls([
+        MockCall(Path("b")),
+        MockCall(Path("c")),
+        MockCall(Path("../c")),
+    ])
+
+
 def test_trim_package() -> None:
     """
     must trim package version

tests/ahriman/core/upload/test_upload_trigger.py

@@ -5,13 +5,6 @@ from ahriman.core.upload import UploadTrigger
 from ahriman.models.result import Result
 
 
-def test_requires_repository() -> None:
-    """
-    must require repository identifier to be set to start
-    """
-    assert UploadTrigger.REQUIRES_REPOSITORY
-
-
 def test_configuration_sections(configuration: Configuration) -> None:
     """
     must correctly parse target list

tests/ahriman/models/test_package.py

@@ -353,6 +353,15 @@ def test_build_status_pretty_print(package_ahriman: Package) -> None:
     assert isinstance(package_ahriman.pretty_print(), str)
 
 
+def test_vercmp(package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must call vercmp
+    """
+    vercmp_mock = mocker.patch("ahriman.models.package.vercmp")
+    package_ahriman.vercmp("version")
+    vercmp_mock.assert_called_once_with(package_ahriman.version, "version")
+
+
 def test_with_packages(package_ahriman: Package, package_python_schedule: Package, pacman: Pacman,
                        mocker: MockerFixture) -> None:
     """

tests/ahriman/models/test_repository_paths.py

@@ -185,6 +185,28 @@ def test_known_repositories_empty(repository_paths: RepositoryPaths, mocker: Moc
     iterdir_mock.assert_not_called()
 
 
+def test_archive_for(repository_paths: RepositoryPaths, package_ahriman: Package, mocker: MockerFixture) -> None:
+    """
+    must correctly define archive path
+    """
+    mocker.patch("pathlib.Path.is_dir", return_value=True)
+    path = repository_paths.archive_for(package_ahriman.base)
+    assert path == repository_paths.archive / "packages" / "a" / package_ahriman.base
+
+
+def test_archive_for_create_tree(repository_paths: RepositoryPaths, package_ahriman: Package,
+                                 mocker: MockerFixture) -> None:
+    """
+    must create archive directory if it doesn't exist
+    """
+    owner_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.preserve_owner")
+    mkdir_mock = mocker.patch("pathlib.Path.mkdir")
+
+    repository_paths.archive_for(package_ahriman.base)
+    owner_mock.assert_called_once_with()
+    mkdir_mock.assert_called_once_with(mode=0o755, parents=True)
+
+
 def test_cache_for(repository_paths: RepositoryPaths, package_ahriman: Package) -> None:
     """
     must return correct path for cache directory
@@ -248,8 +270,8 @@ def test_tree_clear(repository_paths: RepositoryPaths, package_ahriman: Package,
     must remove any package related files
     """
     paths = {
-        getattr(repository_paths, prop)(package_ahriman.base)
-        for prop in dir(repository_paths) if prop.endswith("_for")
+        repository_paths.cache_for(package_ahriman.base),
+        repository_paths.archive_for(package_ahriman.base),
     }
     rmtree_mock = mocker.patch("shutil.rmtree")
 
@@ -269,6 +291,7 @@ def test_tree_create(repository_paths: RepositoryPaths, mocker: MockerFixture) -
         for prop in dir(repository_paths)
         if not prop.startswith("_")
         and prop not in (
+            "archive_for",
             "build_root",
             "logger_name",
             "logger",

tests/ahriman/web/views/v1/service/test_view_v1_service_upload.py

@@ -109,7 +109,7 @@ async def test_post(client: TestClient, repository_paths: RepositoryPaths, mocke
     local = Path("local")
     save_mock = pytest.helpers.patch_view(client.app, "save_file",
                                           AsyncMock(return_value=("filename", local / ".filename")))
-    rename_mock = mocker.patch("pathlib.Path.rename")
+    rename_mock = mocker.patch("ahriman.web.views.v1.service.upload.atomic_move")
     # no content validation here because it has invalid schema
 
     data = FormData()
@@ -118,7 +118,7 @@ async def test_post(client: TestClient, repository_paths: RepositoryPaths, mocke
     response = await client.post("/api/v1/service/upload", data=data)
     assert response.ok
     save_mock.assert_called_once_with(pytest.helpers.anyvar(int), repository_paths.packages, max_body_size=None)
-    rename_mock.assert_called_once_with(local / "filename")
+    rename_mock.assert_called_once_with(local / ".filename", local / "filename")
 
 
 async def test_post_with_sig(client: TestClient, repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
@@ -131,7 +131,7 @@ async def test_post_with_sig(client: TestClient, repository_paths: RepositoryPat
                                               ("filename", local / ".filename"),
                                               ("filename.sig", local / ".filename.sig"),
                                           ]))
-    rename_mock = mocker.patch("pathlib.Path.rename")
+    rename_mock = mocker.patch("ahriman.web.views.v1.service.upload.atomic_move")
     # no content validation here because it has invalid schema
 
     data = FormData()
@@ -145,8 +145,8 @@ async def test_post_with_sig(client: TestClient, repository_paths: RepositoryPat
         MockCall(pytest.helpers.anyvar(int), repository_paths.packages, max_body_size=None),
     ])
     rename_mock.assert_has_calls([
-        MockCall(local / "filename"),
-        MockCall(local / "filename.sig"),
+        MockCall(local / ".filename", local / "filename"),
+        MockCall(local / ".filename.sig", local / "filename.sig"),
     ])
 
 

tests/testresources/core/ahriman.ini

@@ -10,6 +10,9 @@ root = /
 sync_files_database = no
 use_ahriman_cache = no
 
+[archive]
+keep_built_packages = 3
+
 [auth]
 client_id = client_id
 client_secret = client_secret