Merge a1281989f3 into 6fe77eb465

This reverts commit d18d146d79.

.bandit-test.yml

@@ -0,0 +1,6 @@
+skips:
+  - B101
+  - B104
+  - B105
+  - B106
+  - B404

.github/workflows/docker.yml

@@ -8,10 +8,6 @@ on:
       - '*'
       - '!*rc*'
 
-permissions:
-  contents: read
-  packages: write
-
 jobs:
   docker-image:
 
@@ -21,18 +17,18 @@ jobs:
       packages: write
 
     steps:
-      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-qemu-action@v2
 
-      - uses: docker/setup-buildx-action@v3
+      - uses: docker/setup-buildx-action@v2
 
       - name: Login to docker hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to github container registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -40,7 +36,7 @@ jobs:
 
       - name: Extract docker metadata
         id: meta
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v3
         with:
           images: |
             arcan1s/ahriman
@@ -50,8 +46,7 @@ jobs:
             type=edge
 
       - name: Build an image and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v4
         with:
-          file: docker/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/regress.yml

@@ -1,140 +0,0 @@
-name: Regress
-
-on:
-  schedule:
-    - cron: 1 0 * * 0
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  run-regress-tests:
-
-    runs-on: ubuntu-latest
-
-    services:
-      ahriman:
-        image: arcan1s/ahriman:edge
-        env:
-          AHRIMAN_PORT: 8080
-          AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-        options: --privileged --entrypoint entrypoint-web
-        ports:
-          - 8080
-        volumes:
-          - repo:/var/lib/ahriman
-
-    container:
-      image: arcan1s/ahriman:edge
-      env:
-        AHRIMAN_DEBUG: y
-        AHRIMAN_OUTPUT: console
-        AHRIMAN_PORT: 8080
-        AHRIMAN_UNIX_SOCKET: /var/lib/ahriman/ahriman/ahriman-web.sock
-      options: --privileged
-      volumes:
-        - repo:/var/lib/ahriman
-
-    steps:
-      - run: pacman -Sy
-
-      - name: Init repository
-        run: entrypoint help
-
-      - name: Print configuration
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            service-config
-
-      - name: Validate configuration
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            service-config-validate
-
-      - name: Create a user
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            user-add \
-              --packager "github actions <actions@github.com>" \
-              --password ahriman \
-              --role full \
-              ahriman
-
-      - name: Fetch users
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            user-list \
-              --exit-code
-          
-      - name: Add package
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-add \
-              --exit-code \
-              --now \
-              --refresh \
-              ahriman
-
-      - name: Update status of the package
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-status-update \
-              --status failed \
-              ahriman
-
-      - name: Request status of the package
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-status \
-              --exit-code \
-              --info \
-              --status failed \
-              ahriman
-          
-      - name: Update packages
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            repo-update \
-              --exit-code \
-          || true
-
-      - name: Add patch
-        run: |
-          echo '${pkgver%%.*}' | \
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            patch-add \
-              ahriman \
-              pkgrel
-          
-      - name: Retrieve patches
-        run: |
-          ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            patch-list \
-              --exit-code \
-              ahriman
-
-      - name: Rebuild packages
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            repo-rebuild \
-              --depends-on python \
-              --exit-code
-          
-      - name: Remove package
-        run: |
-          sudo -u ahriman ahriman \
-            --log-handler "$AHRIMAN_OUTPUT" \
-            package-remove \
-              ahriman

.github/workflows/release.yml

@@ -5,24 +5,13 @@ on:
     tags:
       - '*'
 
-permissions:
-  contents: write
-
 jobs:
   make-release:
 
     runs-on: ubuntu-latest
 
-    container:
-      image: archlinux:base
-      options: -w /build
-      volumes:
-        - ${{ github.workspace }}:/build
-
     steps:
-      - run: pacman --noconfirm -Syu base-devel git python-tox
-
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Extract version
         id: version
@@ -35,13 +24,18 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           filter: 'Release \d+\.\d+\.\d+'
 
+      - name: Install dependencies
+        uses: ConorMacBride/install-package@v1.1.0
+        with:
+          apt: tox
+
       - name: Create archive
         run: tox -e archive
         env:
           VERSION: ${{ steps.version.outputs.VERSION }}
 
       - name: Publish release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
         with:
           body: |
             ${{ steps.changelog.outputs.compareurl }}

.github/workflows/setup.sh

@@ -18,7 +18,7 @@ if [[ -z $MINIMAL_INSTALL ]]; then
     # web server
     pacman -S --noconfirm python-aioauth-client python-aiohttp python-aiohttp-apispec-git python-aiohttp-cors python-aiohttp-jinja2 python-aiohttp-security python-aiohttp-session python-cryptography python-jinja
     # additional features
-    pacman -S --noconfirm gnupg ipython python-boto3 python-cerberus python-matplotlib rsync
+    pacman -S --noconfirm gnupg python-boto3 python-cerberus python-matplotlib rsync
 fi
 # FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
 cp "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
@@ -26,16 +26,11 @@ cp "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
 # create fresh tarball
 tox -e archive
 # run makepkg
-PKGVER=$(python -c "from src.ahriman import __version__; print(__version__)")
-mv "dist/ahriman-$PKGVER.tar.gz" package/archlinux
+mv dist/ahriman-*.tar.gz package/archlinux
 chmod +777 package/archlinux  # because fuck you that's why
 cd package/archlinux
 sudo -u nobody -- makepkg -cf --skipchecksums --noconfirm
-sudo -u nobody -- makepkg --packagelist | grep "ahriman-core-$PKGVER" | pacman -U --noconfirm --nodeps -
-if [[ -z $MINIMAL_INSTALL ]]; then
-    sudo -u nobody -- makepkg --packagelist | grep "ahriman-triggers-$PKGVER" | pacman -U --noconfirm --nodeps -
-    sudo -u nobody -- makepkg --packagelist | grep "ahriman-web-$PKGVER" | pacman -U --noconfirm --nodeps -
-fi
+sudo -u nobody -- makepkg --packagelist | grep -v -- -debug- | pacman -U --noconfirm --nodeps -
 # create machine-id which is required by build tools
 systemd-machine-id-setup
 
@@ -46,12 +41,12 @@ pacman -Qdtq | pacman -Rscn --noconfirm -
 [[ -z $MINIMAL_INSTALL ]] && WEB_ARGS=("--web-port" "8080")
 ahriman -a x86_64 -r "github" service-setup --packager "ahriman bot <ahriman@example.com>" "${WEB_ARGS[@]}"
 # enable services
+systemctl enable ahriman-web
 systemctl enable ahriman@x86_64-github.timer
 if [[ -z $MINIMAL_INSTALL ]]; then
     # validate configuration
     ahriman service-config-validate --exit-code
     # run web service (detached)
-    systemctl enable ahriman-web
     sudo -u ahriman -- ahriman web &
     WEB_PID=$!
 fi

.github/workflows/setup.yml

@@ -7,10 +7,6 @@ on:
   pull_request:
     branches:
       - master
-  workflow_dispatch:
-
-permissions:
-  contents: read
 
 jobs:
   run-setup-minimal:
@@ -19,12 +15,12 @@ jobs:
 
     container:
       image: archlinux:base
-      options: --privileged -w /build
       volumes:
         - ${{ github.workspace }}:/build
+      options: --privileged -w /build
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup the minimal service in arch linux container
         run: .github/workflows/setup.sh minimal
@@ -40,7 +36,7 @@ jobs:
       options: --privileged -w /build
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
 
       - name: Setup the service in arch linux container
         run: .github/workflows/setup.sh

.github/workflows/tests.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# Install dependencies and run test in container
+
+set -ex
+
+# install dependencies
+pacman --noconfirm -Syyu base-devel python-tox
+
+# run test and check targets
+tox

.github/workflows/tests.yml

@@ -7,12 +7,6 @@ on:
   pull_request:
     branches:
       - master
-  schedule:
-    - cron: 1 0 * * *
-  workflow_dispatch:
-
-permissions:
-  contents: read
 
 jobs:
   run-tests:
@@ -21,21 +15,12 @@ jobs:
 
     container:
       image: archlinux:base
-      options: -w /build
       volumes:
         - ${{ github.workspace }}:/build
+      options: -w /build
 
     steps:
-      - run: pacman --noconfirm -Syu base-devel git python-tox
+      - uses: actions/checkout@v3
 
-      - run: git config --global --add safe.directory *
-
-      - uses: actions/checkout@v4
-
-      - name: Run check and tests
-        run: tox
-
-      - name: Generate documentation and check if there are untracked changes
-        run: |
-          tox -e docs
-          [ -z "$(git status --porcelain docs/*.rst)" ]
+      - name: Run check and tests in arch linux container
+        run: .github/workflows/tests.sh

.pylint.toml

@@ -1,45 +0,0 @@
-[tool.pylint.main]
-init-hook = "sys.path.append('tools')"
-load-plugins = [
-    "pylint.extensions.docparams",
-    "pylint.extensions.bad_builtin",
-    "pylint_plugins.definition_order",
-    "pylint_plugins.import_order",
-]
-
-[tool.pylint.classes]
-bad-functions = [
-    "print",
-]
-
-[tool.pylint.design]
-max-parents = 15
-
-[tool.pylint."messages control"]
-disable = [
-    "raw-checker-failed",
-    "bad-inline-option",
-    "locally-disabled",
-    "file-ignored",
-    "suppressed-message",
-    "useless-suppression",
-    "deprecated-pragma",
-    "use-symbolic-message-instead",
-    "use-implicit-booleaness-not-comparison-to-string",
-    "use-implicit-booleaness-not-comparison-to-zero",
-    "missing-module-docstring",
-    "line-too-long",
-    "no-name-in-module",
-    "import-outside-toplevel",
-    "invalid-name",
-    "raise-missing-from",
-    "wrong-import-order",
-    "too-few-public-methods",
-    "too-many-instance-attributes",
-    "broad-exception-caught",
-    "fixme",
-    "too-many-arguments",
-    "duplicate-code",
-    "cyclic-import",
-    "too-many-positional-arguments",
-]

.pylintrc

@@ -0,0 +1,651 @@
+[MAIN]
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Clear in-memory caches upon conclusion of linting. Useful if running pylint
+# in a server-like mode.
+clear-cache-post-run=no
+
+# Load and enable all available extensions. Use --list-extensions to see a list
+# all available extensions.
+#enable-all-extensions=
+
+# In error mode, messages with a category besides ERROR or FATAL are
+# suppressed, and no reports are done by default. Error mode is compatible with
+# disabling specific errors.
+#errors-only=
+
+# Always return a 0 (non-error) status code, even if lint errors are found.
+# This is primarily useful in continuous integration scripts.
+#exit-zero=
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code.
+extension-pkg-allow-list=
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code. (This is an alternative name to extension-pkg-allow-list
+# for backward compatibility.)
+extension-pkg-whitelist=
+
+# Return non-zero exit code if any of these messages/categories are detected,
+# even if score is above --fail-under value. Syntax same as enable. Messages
+# specified are enabled, while categories only check already-enabled messages.
+fail-on=
+
+# Specify a score threshold under which the program will exit with error.
+fail-under=10
+
+# Interpret the stdin as a python script, whose filename needs to be passed as
+# the module_or_package argument.
+#from-stdin=
+
+# Files or directories to be skipped. They should be base names, not paths.
+ignore=CVS
+
+# Add files or directories matching the regular expressions patterns to the
+# ignore-list. The regex matches against paths and can be in Posix or Windows
+# format. Because '\\' represents the directory delimiter on Windows systems,
+# it can't be used as an escape character.
+ignore-paths=
+
+# Files or directories matching the regular expression patterns are skipped.
+# The regex matches against base names, not paths. The default value ignores
+# Emacs file locks
+ignore-patterns=^\.#
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis). It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+init-hook='import sys; sys.path.append("pylint_plugins")'
+
+# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the
+# number of processors available to use, and will cap the count on Windows to
+# avoid hangs.
+jobs=1
+
+# Control the amount of potential inferred values when inferring a single
+# object. This can help the performance when dealing with large functions or
+# complex, nested conditions.
+limit-inference-results=100
+
+# List of plugins (as comma separated values of python module names) to load,
+# usually to register additional checkers.
+load-plugins=pylint.extensions.docparams,
+             pylint.extensions.bad_builtin,
+             definition_order,
+             import_order,
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Minimum Python version to use for version dependent checks. Will default to
+# the version used to run pylint.
+py-version=3.11
+
+# Discover python modules and packages in the file system subtree.
+recursive=no
+
+# Add paths to the list of the source roots. Supports globbing patterns. The
+# source root is an absolute path or a path relative to the current working
+# directory used to determine a package namespace for modules located under the
+# source root.
+source-roots=
+
+# When enabled, pylint would attempt to guess common misconfiguration and emit
+# user-friendly hints instead of false-positive error messages.
+suggestion-mode=yes
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+# In verbose mode, extra non-checker-related info will be displayed.
+#verbose=
+
+
+[BASIC]
+
+# Naming style matching correct argument names.
+argument-naming-style=snake_case
+
+# Regular expression matching correct argument names. Overrides argument-
+# naming-style. If left empty, argument names will be checked with the set
+# naming style.
+#argument-rgx=
+
+# Naming style matching correct attribute names.
+attr-naming-style=snake_case
+
+# Regular expression matching correct attribute names. Overrides attr-naming-
+# style. If left empty, attribute names will be checked with the set naming
+# style.
+#attr-rgx=
+
+bad-functions=print,
+
+# Bad variable names which should always be refused, separated by a comma.
+bad-names=foo,
+          bar,
+          baz,
+          toto,
+          tutu,
+          tata
+
+# Bad variable names regexes, separated by a comma. If names match any regex,
+# they will always be refused
+bad-names-rgxs=
+
+# Naming style matching correct class attribute names.
+class-attribute-naming-style=any
+
+# Regular expression matching correct class attribute names. Overrides class-
+# attribute-naming-style. If left empty, class attribute names will be checked
+# with the set naming style.
+#class-attribute-rgx=
+
+# Naming style matching correct class constant names.
+class-const-naming-style=UPPER_CASE
+
+# Regular expression matching correct class constant names. Overrides class-
+# const-naming-style. If left empty, class constant names will be checked with
+# the set naming style.
+#class-const-rgx=
+
+# Naming style matching correct class names.
+class-naming-style=PascalCase
+
+# Regular expression matching correct class names. Overrides class-naming-
+# style. If left empty, class names will be checked with the set naming style.
+#class-rgx=
+
+# Naming style matching correct constant names.
+const-naming-style=UPPER_CASE
+
+# Regular expression matching correct constant names. Overrides const-naming-
+# style. If left empty, constant names will be checked with the set naming
+# style.
+#const-rgx=
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming style matching correct function names.
+function-naming-style=snake_case
+
+# Regular expression matching correct function names. Overrides function-
+# naming-style. If left empty, function names will be checked with the set
+# naming style.
+#function-rgx=
+
+# Good variable names which should always be accepted, separated by a comma.
+good-names=i,
+           j,
+           k,
+           ex,
+           Run,
+           _
+
+# Good variable names regexes, separated by a comma. If names match any regex,
+# they will always be accepted
+good-names-rgxs=
+
+# Include a hint for the correct naming format with invalid-name.
+include-naming-hint=no
+
+# Naming style matching correct inline iteration names.
+inlinevar-naming-style=any
+
+# Regular expression matching correct inline iteration names. Overrides
+# inlinevar-naming-style. If left empty, inline iteration names will be checked
+# with the set naming style.
+#inlinevar-rgx=
+
+# Naming style matching correct method names.
+method-naming-style=snake_case
+
+# Regular expression matching correct method names. Overrides method-naming-
+# style. If left empty, method names will be checked with the set naming style.
+#method-rgx=
+
+# Naming style matching correct module names.
+module-naming-style=snake_case
+
+# Regular expression matching correct module names. Overrides module-naming-
+# style. If left empty, module names will be checked with the set naming style.
+#module-rgx=
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+# These decorators are taken in consideration only for invalid-name.
+property-classes=abc.abstractproperty
+
+# Regular expression matching correct type alias names. If left empty, type
+# alias names will be checked with the set naming style.
+#typealias-rgx=
+
+# Regular expression matching correct type variable names. If left empty, type
+# variable names will be checked with the set naming style.
+#typevar-rgx=
+
+# Naming style matching correct variable names.
+variable-naming-style=snake_case
+
+# Regular expression matching correct variable names. Overrides variable-
+# naming-style. If left empty, variable names will be checked with the set
+# naming style.
+#variable-rgx=
+
+
+[CLASSES]
+
+# Warn about protected attribute access inside special methods
+check-protected-access-in-special-methods=no
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,
+                      __new__,
+                      setUp,
+                      asyncSetUp,
+                      __post_init__
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make,os._exit
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[DESIGN]
+
+# List of regular expressions of class ancestor names to ignore when counting
+# public methods (see R0903)
+exclude-too-few-public-methods=
+
+# List of qualified class names to ignore when counting class parents (see
+# R0901)
+ignored-parents=
+
+# Maximum number of arguments for function / method.
+max-args=5
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in an if statement (see R0916).
+max-bool-expr=5
+
+# Maximum number of branch for function / method body.
+max-branches=12
+
+# Maximum number of locals for function / method body.
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+# Maximum number of return / yield for function / method body.
+max-returns=6
+
+# Maximum number of statements in function / method body.
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when caught.
+overgeneral-exceptions=builtins.BaseException,builtins.Exception
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module.
+max-module-lines=1000
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[IMPORTS]
+
+# List of modules that can be imported at any level, not just the top level
+# one.
+allow-any-import-level=
+
+# Allow explicit reexports by alias from a package __init__.
+allow-reexport-from-package=no
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Deprecated modules which should not be used, separated by a comma.
+deprecated-modules=
+
+# Output a graph (.gv or any supported image format) of external dependencies
+# to the given file (report RP0402 must not be disabled).
+ext-import-graph=
+
+# Output a graph (.gv or any supported image format) of all (i.e. internal and
+# external) dependencies to the given file (report RP0402 must not be
+# disabled).
+import-graph=
+
+# Output a graph (.gv or any supported image format) of internal dependencies
+# to the given file (report RP0402 must not be disabled).
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+# Couples of modules and preferred modules, separated by a comma.
+preferred-modules=
+
+
+[LOGGING]
+
+# The type of string formatting that logging methods do. `old` means using %
+# formatting, `new` is for `{}` formatting.
+logging-format-style=old
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format.
+logging-modules=logging
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, CONTROL_FLOW, INFERENCE, INFERENCE_FAILURE,
+# UNDEFINED.
+confidence=HIGH,
+           CONTROL_FLOW,
+           INFERENCE,
+           INFERENCE_FAILURE,
+           UNDEFINED
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once). You can also use "--disable=all" to
+# disable everything first and then re-enable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use "--disable=all --enable=classes
+# --disable=W".
+disable=raw-checker-failed,
+        bad-inline-option,
+        locally-disabled,
+        file-ignored,
+        suppressed-message,
+        useless-suppression,
+        deprecated-pragma,
+        use-symbolic-message-instead,
+        missing-module-docstring,
+        line-too-long,
+        no-name-in-module,
+        import-outside-toplevel,
+        invalid-name,
+        raise-missing-from,
+        wrong-import-order,
+        too-few-public-methods,
+        too-many-instance-attributes,
+        broad-except,
+        fixme,
+        too-many-arguments,
+        duplicate-code,
+        cyclic-import,
+        too-many-positional-arguments,
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=c-extension-no-member
+
+
+[METHOD_ARGS]
+
+# List of qualified names (i.e., library.method) which require a timeout
+# parameter e.g. 'requests.api.get,requests.api.post'
+timeout-methods=requests.api.delete,requests.api.get,requests.api.head,requests.api.options,requests.api.patch,requests.api.post,requests.api.put,requests.api.request
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,
+      XXX,
+      TODO
+
+# Regular expression of note tags to take in consideration.
+notes-rgx=
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+# Complete name of functions that never returns. When checking for
+# inconsistent-return-statements if a never returning function is called then
+# it will be considered as an explicit return statement and no message will be
+# printed.
+never-returning-functions=sys.exit,argparse.parse_error
+
+
+[REPORTS]
+
+# Python expression which should return a score less than or equal to 10. You
+# have access to the variables 'fatal', 'error', 'warning', 'refactor',
+# 'convention', and 'info' which contain the number of messages in each
+# category, as well as 'statement' which is the total number of statements
+# analyzed. This score is used by the global evaluation report (RP0004).
+evaluation=max(0, 0 if fatal else 10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10))
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details.
+msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio). You can also give a reporter class, e.g.
+# mypackage.mymodule.MyReporterClass.
+#output-format=
+
+# Tells whether to display a full report or only the messages.
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[SIMILARITIES]
+
+# Comments are removed from the similarity computation
+ignore-comments=yes
+
+# Docstrings are removed from the similarity computation
+ignore-docstrings=yes
+
+# Imports are removed from the similarity computation
+ignore-imports=yes
+
+# Signatures are removed from the similarity computation
+ignore-signatures=yes
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[SPELLING]
+
+# Limits count of emitted suggestions for spelling mistakes.
+max-spelling-suggestions=4
+
+# Spelling dictionary name. No available dictionaries : You need to install
+# both the python package and the system dependency for enchant to work..
+spelling-dict=
+
+# List of comma separated words that should be considered directives if they
+# appear at the beginning of a comment and should not be checked.
+spelling-ignore-comment-directives=fmt: on,fmt: off,noqa:,noqa,nosec,isort:skip,mypy:
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains the private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to the private dictionary (see the
+# --spelling-private-dict-file option) instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[STRING]
+
+# This flag controls whether inconsistent-quotes generates a warning when the
+# character used as a quote delimiter is used inconsistently within a module.
+check-quote-consistency=no
+
+# This flag controls whether the implicit-str-concat should generate a warning
+# on implicit string concatenation in sequences defined over several lines.
+check-str-concat-over-line-jumps=no
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether to warn about missing members when the owner of the attribute
+# is inferred to be None.
+ignore-none=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of symbolic message names to ignore for Mixin members.
+ignored-checks-for-mixins=no-member,
+                          not-async-context-manager,
+                          not-context-manager,
+                          attribute-defined-outside-init
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local,argparse.Namespace
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+# Regex pattern to define which classes are considered mixins.
+mixin-class-rgx=.*[Mm]ixin
+
+# List of decorators that change the signature of a decorated function.
+signature-mutators=
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid defining new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of names allowed to shadow builtins
+allowed-redefined-builtins=
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,
+          _cb
+
+# A regular expression matching the name of dummy variables (i.e. expected to
+# not be used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored.
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io

.pytest.ini

@@ -1,5 +0,0 @@
-[pytest]
-addopts = --cov=ahriman --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=100 --spec
-asyncio_default_fixture_loop_scope = function
-asyncio_mode = auto
-spec_test_format = {result} {docstring_summary}

.readthedocs.yml

@@ -9,7 +9,13 @@ build:
 
 python:
   install:
-    - requirements: docs/requirements.txt
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+        - s3
+        - validator
+        - web
 
 formats:
   - pdf

CONTRIBUTING.md

@@ -80,7 +80,7 @@ Again, the most checks can be performed by `tox` command, though some additional
                 >>> clazz = Clazz()
         """
   
-        CLAZZ_ATTRIBUTE: ClassVar[int] = 42
+        CLAZZ_ATTRIBUTE = 42
   
         def __init__(self, *args: Any, **kwargs: Any) -> None:
             """
@@ -96,7 +96,6 @@ Again, the most checks can be performed by `tox` command, though some additional
 * Type annotations are the must, even for local functions. For the function argument `self` (for instance methods) and `cls` (for class methods) should not be annotated.
 * For collection types built-in classes must be used if possible (e.g. `dict` instead of `typing.Dict`, `tuple` instead of `typing.Tuple`). In case if built-in type is not available, but `collections.abc` provides interface, it must be used (e.g. `collections.abc.Awaitable` instead of `typing.Awaitable`, `collections.abc.Iterable` instead of `typing.Iterable`). For union classes, the bar operator (`|`) must be used (e.g. `float | int` instead of `typing.Union[float, int]`), which also includes `typing.Optional` (e.g. `str | None` instead of `Optional[str]`).
 * `classmethod` should (almost) always return `Self`. In case of mypy warning (e.g. if there is a branch in which function doesn't return the instance of `cls`) consider using `staticmethod` instead.
-* Class attributes must be decorated as `ClassVar[...]`.
 * Recommended order of function definitions in class:
 
     ```python
@@ -176,10 +175,11 @@ Again, the most checks can be performed by `tox` command, though some additional
 * Web API methods must be documented by using `aiohttp_apispec` library. The schema testing mostly should be implemented in related view class tests. Recommended example for documentation (excluding comments):
 
     ```python
+    import aiohttp_apispec
+
     from marshmallow import Schema, fields  
-    
-    from ahriman.web.apispec.decorators import apidocs
-    from ahriman.web.schemas import PackageNameSchema, PaginationSchema
+
+    from ahriman.web.schemas import AuthSchema, ErrorSchema, PackageNameSchema, PaginationSchema
     from ahriman.web.views.base import BaseView
 
 
@@ -198,17 +198,25 @@ Again, the most checks can be performed by `tox` command, though some additional
         POST_PERMISSION = ...
         ROUTES = ...
 
-        @apidocs(
+        @aiohttp_apispec.docs(
             tags=["Tag"],
             summary="Do foo",
             description="Extended description of the method which does foo",
-            error_400_enabled=True,  # exception raised by this method
-            error_404_description="Repository is unknown",
-            schema=ResponseSchema,  # leave empty if no responses here
-            match_schema=PackageNameSchema,
-            query_schema=PaginationSchema,
-            body_schema=RequestSchema(many=True),
+            responses={
+                200: {"description": "Success response", "schema": ResponseSchema},
+                204: {"description": "Success response"},  # example without json schema response
+                400: {"description": "Bad data is supplied", "schema": ErrorSchema},  # exception raised by this method
+                401: {"description": "Authorization required", "schema": ErrorSchema},  # should be always presented
+                403: {"description": "Access is forbidden", "schema": ErrorSchema},  # should be always presented
+                404: {"description": "Repository is unknown", "schema": ErrorSchema},  # include if BaseView.service() method is called
+                500: {"description": "Internal server error", "schema": ErrorSchema},  # should be always presented
+            },
+            security=[{"token": [POST_PERMISSION]}],
         )
+        @aiohttp_apispec.cookies_schema(AuthSchema)  # should be always presented
+        @aiohttp_apispec.match_info_schema(PackageNameSchema)
+        @aiohttp_apispec.querystring_schema(PaginationSchema)
+        @aiohttp_apispec.json_schema(RequestSchema(many=True))
         async def post(self) -> None: ...
     ```
 

Dockerfile

@@ -1,78 +1,4 @@
-# build image
-FROM archlinux:base AS build
-
-# install environment
-## create build user
-RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build
-
-## extract container creation date and set mirror for this timestamp, set PKGEXT and refresh database next
-RUN echo "Server = https://archive.archlinux.org/repos/$(stat -c "%y" "/var/lib/pacman" | cut -d " " -f 1 | sed "s,-,/,g")/\$repo/os/\$arch" > "/etc/pacman.d/mirrorlist" && \
-    pacman -Sy
-## setup package cache
-RUN runuser -u build -- mkdir "/tmp/pkg" && \
-    echo "PKGDEST=/tmp/pkg" >> "/etc/makepkg.conf" && \
-    echo "[options]" >> "/etc/pacman.conf" && \
-    echo "CacheDir = /tmp/pkg/" >> "/etc/pacman.conf"
-
-## install anc configure sudo
-RUN pacman -S --noconfirm --asdeps sudo && \
-    echo "build ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/build"
-## copy install script
-COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
-## install package dependencies
-RUN pacman -S --noconfirm --asdeps \
-        devtools \
-        git \
-        pyalpm \
-        python-bcrypt  \
-        python-inflection \
-        python-pyelftools \
-        python-requests \
-        && \
-    pacman -S --noconfirm --asdeps \
-        base-devel \
-        python-build \
-        python-flit \
-        python-installer \
-        python-tox \
-        python-wheel \
-        && \
-    pacman -S --noconfirm --asdeps \
-        git \
-        python-aiohttp \
-        python-aiohttp-openmetrics \
-        python-boto3 \
-        python-cerberus \
-        python-cryptography \
-        python-jinja \
-        python-systemd \
-        rsync \
-        && \
-    runuser -u build -- install-aur-package \
-        python-aioauth-client \
-        python-sphinx-typlog-theme \
-        python-webargs \
-        python-aiohttp-apispec-git \
-        python-aiohttp-cors \
-        python-aiohttp-jinja2 \
-        python-aiohttp-session \
-        python-aiohttp-security \
-        python-requests-unixsocket2
-
-# install ahriman
-## copy tree
-COPY --chown=build . "/home/build/ahriman"
-## create package archive and install it
-RUN cd "/home/build/ahriman" && \
-    tox -e archive && \
-    cp ./dist/*.tar.gz "package/archlinux" && \
-    cd "package/archlinux" && \
-    runuser -u build -- makepkg --noconfirm --skipchecksums && \
-    cd / && rm -r "/home/build/ahriman"
-
-
-# main image
-FROM archlinux:base AS ahriman
+FROM archlinux:base
 
 # image configuration
 ENV AHRIMAN_ARCHITECTURE="x86_64"
@@ -97,46 +23,74 @@ ENV AHRIMAN_VALIDATE_CONFIGURATION="yes"
 ## update pacman.conf with multilib
 RUN echo "[multilib]" >> "/etc/pacman.conf" && \
     echo "Include = /etc/pacman.d/mirrorlist" >> "/etc/pacman.conf"
-## copy built packages from build image and setup repository
-COPY --from=build "/tmp/pkg" "/var/cache/pacman/pkg"
-RUN repo-add "/var/cache/pacman/pkg/core.db.tar.zst" "/var/cache/pacman/pkg/"*.pkg.tar.zst && \
-    repo-add "/var/cache/pacman/pkg/extra.db.tar.zst" && \
-    repo-add "/var/cache/pacman/pkg/multilib.db.tar.zst"
-## set local directory to use as repository and refresh database
-RUN cp "/etc/pacman.d/mirrorlist" "/etc/pacman.d/mirrorlist.orig" && \
-    echo "Server = file:///var/cache/pacman/pkg" > "/etc/pacman.d/mirrorlist" && \
-    cp "/etc/pacman.conf" "/etc/pacman.conf.orig" && \
-    sed -i "s/SigLevel *=.*/SigLevel = Optional/g" "/etc/pacman.conf" && \
-    pacman -Sy
-## install package and its optional dependencies
-RUN pacman -S --noconfirm ahriman
+## refresh packages, install sudo and install packages for building
+RUN pacman -Syu --noconfirm sudo && \
+    pacman -S --noconfirm --asdeps fakeroot python-tox
+## create build user
+RUN useradd -m -d "/home/build" -s "/usr/bin/nologin" build && \
+    echo "build ALL=(ALL) NOPASSWD: ALL" > "/etc/sudoers.d/build"
+COPY "docker/install-aur-package.sh" "/usr/local/bin/install-aur-package"
+## install package dependencies
 RUN pacman -S --noconfirm --asdeps \
-        python-aioauth-client \
-        python-aiohttp-apispec-git \
-        python-aiohttp-openmetrics \
-        python-aiohttp-security \
-        python-aiohttp-session \
+        devtools \
+        git \
+        pyalpm \
+        python-bcrypt  \
+        python-inflection \
+        python-pyelftools \
+        python-requests \
+        && \
+    pacman -S --noconfirm --asdeps \
+        base-devel \
+        python-build \
+        python-flit \
+        python-installer \
+        python-wheel \
+        && \
+    pacman -S --noconfirm --asdeps \
+        git \
+        python-aiohttp \
         python-boto3 \
         python-cerberus \
         python-cryptography \
+        python-jinja \
         python-systemd \
-        python-requests-unixsocket2 \
         rsync \
-        sudo
+        && \
+    runuser -u build -- install-aur-package \
+        python-aioauth-client \
+        python-sphinx-typlog-theme \
+        python-webargs \
+        python-aiohttp-apispec-git \
+        python-aiohttp-cors \
+        python-aiohttp-jinja2 \
+        python-aiohttp-session \
+        python-aiohttp-security \
+        python-requests-unixsocket2
 
-## clear cache and restore system
-RUN find "/var/cache/pacman/pkg" "/var/lib/pacman/sync" -type "f,l" -delete && \
-    cp "/etc/pacman.d/mirrorlist.orig" "/etc/pacman.d/mirrorlist" && \
-    cp "/etc/pacman.conf.orig" "/etc/pacman.conf"
+## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
+COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
+
+# install ahriman
+## copy tree
+COPY --chown=build . "/home/build/ahriman"
+## create package archive and install it
+RUN cd "/home/build/ahriman" && \
+    tox -e archive && \
+    cp ./dist/*.tar.gz "package/archlinux" && \
+    cd "package/archlinux" && \
+    runuser -u build -- makepkg --noconfirm --skipchecksums && \
+    runuser -u build -- makepkg --packagelist | grep -v -- -debug- | pacman -U --noconfirm --nodeps - && \
+    cd / && rm -r "/home/build/ahriman"
+
+# cleanup unused
+RUN find "/var/cache/pacman/pkg" -type f -delete
+RUN pacman -Qdtq | pacman -Rscn --noconfirm -
 
 VOLUME ["/var/lib/ahriman"]
 
 # minimal runtime ahriman setup
-## FIXME since 1.0.4 devtools requires dbus to be run, which doesn't work now in container
-COPY "docker/systemd-nspawn.sh" "/usr/local/bin/systemd-nspawn"
-## entrypoint setup
 COPY "docker/entrypoint.sh" "/usr/local/bin/entrypoint"
-COPY "docker/entrypoint-web.sh" "/usr/local/bin/entrypoint-web"
 ENTRYPOINT ["entrypoint"]
 # default command
 CMD ["repo-update", "--refresh"]

docker/entrypoint-web.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-# Special workaround for running web service in github actions, must not be usually used in real environment,
-# consider running web command explicitly instead
-
-exec entrypoint web "$@"

docker/entrypoint.sh

@@ -57,9 +57,6 @@ ahriman "${AHRIMAN_DEFAULT_ARGS[@]}" service-setup "${AHRIMAN_SETUP_ARGS[@]}"
 # create machine-id which is required by build tools
 systemd-machine-id-setup &> /dev/null
 
-# special workaround to emulate /bin/bash entrypoint if first argument starts with /
-[[ "$1" =~ ^/.* ]] && exec "$@"
-
 # if AHRIMAN_FORCE_ROOT is set or command is unsafe we can run without sudo
 # otherwise we prepend executable by sudo command
 if [ -n "$AHRIMAN_FORCE_ROOT" ]; then

docker/install-aur-package.sh

@@ -4,12 +4,8 @@ set -e
 
 for PACKAGE in "$@"; do
     BUILD_DIR="$(mktemp -d)"
-    # clone the remote source
     git clone https://aur.archlinux.org/"$PACKAGE".git "$BUILD_DIR"
     cd "$BUILD_DIR"
-    # checkout to the image date
-    git checkout "$(git rev-list -1 --before="$(stat -c "%y" "/var/lib/pacman" | cut -d " " -f 1)" master)"
-    # build and install the package
     makepkg --nocheck --noconfirm --install --rmdeps --syncdeps
     cd /
     rm -r "$BUILD_DIR"

docs/advanced-usage.rst

@@ -1,12 +1,6 @@
 Advanced usage
 ==============
 
-.. toctree::
-   :maxdepth: 2
-
-   handlers
-   views
-
 Depending on the goal the package can be used in different ways. Nevertheless, in the most cases you will need some basic classes
 
 .. code-block:: python

docs/advanced-usage/handlers.rst

@@ -1,51 +0,0 @@
-Writing own handler
-===================
-
-It is possible to extend the application by adding own custom commands. To do so it is required to implement class, which derives from ``ahriman.application.handlers.handler.Handler`` and put it to the ``ahriman.application.handlers`` package. The class later will be loaded automatically and included to each command run.
-
-Let's imagine, that the new class implements ``help-web``, which prints server information to the stdout. To do so, we need to implement base ``ahriman.application.handlers.handler.Handler.run`` method which is entry point for all subcommands:
-
-.. code-block:: python
-
-   from ahriman.application.application import Application
-   from ahriman.application.handlers.handler import Handler
-
-
-   class HelpWeb(Handler):
-
-      @classmethod
-      def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
-              report: bool) -> None:
-        # load application instance
-        # report is set to True to make sure that web client is loaded
-        application = Application(repository_id, configuration, report=True)
-        # extract web client
-        client = application.repository.reporter
-
-        # send request to the server
-        response = client.make_request("GET", f"{client.address}/api/v1/info")
-        result = response.json()
-        print(result)
-
-The main functionality of the class is already described, but command is still not available yet. To do so, it is required to set ``arguments`` property, which is the list of the functions, each of them which takes argument parser object, creates new subcommand and returns the modified parser, e.g.:
-
-.. code-block:: python
-
-   import argparse
-
-   from ahriman.application.handlers.handler import SubParserAction
-
-   ...
-
-       @staticmethod
-       def set_parser(root: SubParserAction) -> argparse.ArgumentParser:
-           parser = root.add_parser("help-web", help="get web server status",
-                                    description="request server info and print it to stdout")
-
-       arguments = set_parser
-
-In addition, ``ahriman.application.handlers.handler.Handler.ALLOW_MULTI_ARCHITECTURE_RUN`` can be set to ``False`` in order to disable multiprocess run (e.g. in case if there are conflicting operations, like writing to stdout).
-
-Save the file above as ``/usr/lib/python3.12/site-packages/ahriman/application/handlers/help_web.py`` (replace ``python3.12`` with actual python version) and you are set.
-
-For more examples and details, please check builtin handlers and classes documentations.

docs/advanced-usage/views.rst

@@ -1,41 +0,0 @@
-Writing own API endpoint
-========================
-
-The web service loads views dynamically, thus it is possible to add custom API endpoint or even web page. The view must be derived from ``ahriman.web.views.base.BaseView`` and should implement desired HTTP methods. The API specification will be also loaded automatically if available, but optional. The implementation must be saved into the ``ahriman.web.views`` package
-
-Let's consider example of API endpoint which always returns 204 with no response:
-
-.. code-block:: python
-
-   from aiohttp.web import Response, HTTPNoContent
-
-   from ahriman.web.views.base import BaseView
-
-   class PingView(BaseView):
-
-       async def get(self) -> Response:
-           # do nothing, just raise 204 response
-           # check public methods of the BaseView class for all available controls
-           raise HTTPNoContent
-
-The ``get()`` method can be decorated by ``aiohttp_apispec`` methods, but we will leave it for a self-study, please, consider to check examples of usages in the main package.
-
-In order to view to be added to the route list correctly, few more properties are required to be set. First of all, it is required to specify ``ROUTES`` (list of strings), which contains list of all available routes, e.g.:
-
-.. code-block:: python
-
-   ...
-
-       ROUTES = ["/api/v1/ping"]
-
-In addition, it is also recommended to specify permission level for using this endpoint. Since this endpoint neither does anything nor returns sensitive information, it can be set to ``UserAccess.Unauthorized``:
-
-.. code-block:: python
-
-   ...
-
-       GET_PERMISSION = UserAccess.Unauthorized
-
-That's all. Just save the file as ``/usr/lib/python3.12/site-packages/ahriman/web/views/ping.py`` (replace ``python3.12`` with actual python version) and restart web server.
-
-For more examples and details, please check builtin handlers and classes documentations.

docs/ahriman.application.handlers.rst

@@ -228,14 +228,6 @@ ahriman.application.handlers.triggers module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.application.handlers.triggers\_support module
------------------------------------------------------
-
-.. automodule:: ahriman.application.handlers.triggers_support
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.application.handlers.unsafe\_commands module
 ----------------------------------------------------
 

docs/ahriman.application.rst

@@ -29,14 +29,6 @@ ahriman.application.help\_formatter module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.application.interactive\_shell module
----------------------------------------------
-
-.. automodule:: ahriman.application.interactive_shell
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.application.lock module
 -------------------------------
 

docs/ahriman.core.database.migrations.rst

@@ -124,14 +124,6 @@ ahriman.core.database.migrations.m014\_auditlog module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.core.database.migrations.m015\_logs\_process\_id module
----------------------------------------------------------------
-
-.. automodule:: ahriman.core.database.migrations.m015_logs_process_id
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/ahriman.core.formatters.rst

@@ -92,14 +92,6 @@ ahriman.core.formatters.repository\_printer module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.core.formatters.repository\_stats\_printer module
----------------------------------------------------------
-
-.. automodule:: ahriman.core.formatters.repository_stats_printer
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.core.formatters.status\_printer module
 ----------------------------------------------
 

docs/ahriman.models.rst

@@ -100,14 +100,6 @@ ahriman.models.log\_handler module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.models.log\_record module
----------------------------------
-
-.. automodule:: ahriman.models.log_record
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.models.log\_record\_id module
 -------------------------------------
 
@@ -244,14 +236,6 @@ ahriman.models.repository\_paths module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.models.repository\_stats module
----------------------------------------
-
-.. automodule:: ahriman.models.repository_stats
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.models.result module
 ----------------------------
 
@@ -268,14 +252,6 @@ ahriman.models.scan\_paths module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.models.series\_statistics module
-----------------------------------------
-
-.. automodule:: ahriman.models.series_statistics
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.models.sign\_settings module
 ------------------------------------
 

docs/ahriman.web.apispec.rst

@@ -1,29 +0,0 @@
-ahriman.web.apispec package
-===========================
-
-Submodules
-----------
-
-ahriman.web.apispec.decorators module
--------------------------------------
-
-.. automodule:: ahriman.web.apispec.decorators
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-ahriman.web.apispec.info module
--------------------------------
-
-.. automodule:: ahriman.web.apispec.info
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
-Module contents
----------------
-
-.. automodule:: ahriman.web.apispec
-   :members:
-   :no-undoc-members:
-   :show-inheritance:

docs/ahriman.web.middlewares.rst

@@ -20,14 +20,6 @@ ahriman.web.middlewares.exception\_handler module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.web.middlewares.metrics\_handler module
------------------------------------------------
-
-.. automodule:: ahriman.web.middlewares.metrics_handler
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 Module contents
 ---------------
 

docs/ahriman.web.rst

@@ -7,7 +7,6 @@ Subpackages
 .. toctree::
    :maxdepth: 4
 
-   ahriman.web.apispec
    ahriman.web.middlewares
    ahriman.web.schemas
    ahriman.web.views
@@ -15,6 +14,14 @@ Subpackages
 Submodules
 ----------
 
+ahriman.web.apispec module
+--------------------------
+
+.. automodule:: ahriman.web.apispec
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.cors module
 -----------------------
 

docs/ahriman.web.schemas.rst

@@ -4,14 +4,6 @@ ahriman.web.schemas package
 Submodules
 ----------
 
-ahriman.web.schemas.any\_schema module
---------------------------------------
-
-.. automodule:: ahriman.web.schemas.any_schema
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.schemas.aur\_package\_schema module
 -----------------------------------------------
 
@@ -124,14 +116,6 @@ ahriman.web.schemas.login\_schema module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.web.schemas.logs\_rotate\_schema module
------------------------------------------------
-
-.. automodule:: ahriman.web.schemas.logs_rotate_schema
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.schemas.logs\_schema module
 ---------------------------------------
 
@@ -276,14 +260,6 @@ ahriman.web.schemas.repository\_id\_schema module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.web.schemas.repository\_stats\_schema module
-----------------------------------------------------
-
-.. automodule:: ahriman.web.schemas.repository_stats_schema
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.schemas.search\_schema module
 -----------------------------------------
 
@@ -308,6 +284,14 @@ ahriman.web.schemas.update\_flags\_schema module
    :no-undoc-members:
    :show-inheritance:
 
+ahriman.web.schemas.versioned\_log\_schema module
+-------------------------------------------------
+
+.. automodule:: ahriman.web.schemas.versioned_log_schema
+   :members:
+   :no-undoc-members:
+   :show-inheritance:
+
 ahriman.web.schemas.worker\_schema module
 -----------------------------------------
 

docs/ahriman.web.views.v1.service.rst

@@ -12,14 +12,6 @@ ahriman.web.views.v1.service.add module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.web.views.v1.service.logs module
-----------------------------------------
-
-.. automodule:: ahriman.web.views.v1.service.logs
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.views.v1.service.pgp module
 ---------------------------------------
 

docs/ahriman.web.views.v1.status.rst

@@ -12,14 +12,6 @@ ahriman.web.views.v1.status.info module
    :no-undoc-members:
    :show-inheritance:
 
-ahriman.web.views.v1.status.metrics module
-------------------------------------------
-
-.. automodule:: ahriman.web.views.v1.status.metrics
-   :members:
-   :no-undoc-members:
-   :show-inheritance:
-
 ahriman.web.views.v1.status.repositories module
 -----------------------------------------------
 

docs/architecture.rst

@@ -8,8 +8,7 @@ Packages have strict rules of importing:
 
 * ``ahriman.application`` package must not be used outside of this package.
 * ``ahriman.core`` and ``ahriman.models`` packages don't have any import restriction. Actually we would like to totally restrict importing of ``core`` package from ``models``, but it is impossible at the moment.
-* ``ahriman.web`` package is allowed to be imported from ``ahriman.application`` (web handler only, only ``ahriman.web.web`` methods).
-* The idea remains the same for all imports, if an package requires some specific dependencies, it must be imported locally to keep dependencies optional.
+* ``ahriman.web`` package is allowed to be imported from ``ahriman.application`` (web handler only, only ``ahriman.web.web`` methods). It also must not be imported globally, only local import is allowed. 
 
 Full dependency diagram:
 
@@ -19,7 +18,7 @@ Full dependency diagram:
 ``ahriman.application`` package
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-This package contains application (aka executable) related classes and everything for it. It also contains package called ``ahriman.application.handlers`` in which all available subcommands are described as separated classes derived from the base ``ahriman.application.handlers.handler.Handler`` class. Those classes are being loaded dynamically through the lookup of the ``ahriman.application.handlers`` package.
+This package contains application (aka executable) related classes and everything for it. It also contains package called ``ahriman.application.handlers`` in which all available subcommands are described as separated classes derived from the base ``ahriman.application.handlers.handler.Handler`` class.
 
 ``ahriman.application.application.Application`` (god class) is used for any interaction from parsers with repository. It is divided into multiple traits by functions (package related and repository related) in the same package.
 
@@ -33,9 +32,9 @@ This package contains application (aka executable) related classes and everythin
 This package contains everything required for the most of application actions and it is separated into several packages:
 
 * ``ahriman.core.alpm`` package controls pacman related functions. It provides wrappers for ``pyalpm`` library and safe calls for repository tools (``repo-add`` and ``repo-remove``). Also this package contains ``ahriman.core.alpm.remote`` package which provides wrapper for remote sources (e.g. AUR RPC and official repositories RPC) and some other helpers.
-* ``ahriman.core.auth`` package provides classes for authorization methods used by web mostly. Base class is ``ahriman.core.auth.Auth`` which must be instantiated by ``load`` method. This package is only required by the ``ahriman.web`` package.
+* ``ahriman.core.auth`` package provides classes for authorization methods used by web mostly. Base class is ``ahriman.core.auth.Auth`` which must be instantiated by ``load`` method.
 * ``ahriman.core.build_tools`` is a package which provides wrapper for ``devtools`` commands.
-* ``ahriman.core.configuration`` contains extensions for standard ``configparser`` module and some validation related classes.
+* ``ahriman.core.configuration`` contains extension for standard ``configparser`` library and some validation related classes.
 * ``ahriman.core.database`` is everything for database, including data and schema migrations.
 * ``ahriman.core.distributed`` package with triggers and helpers for distributed build system.
 * ``ahriman.core.formatters`` package provides ``Printer`` sub-classes for printing data (e.g. package properties) to stdout which are used by some handlers.
@@ -53,11 +52,8 @@ This package contains everything required for the most of application actions an
 This package also provides some generic functions and classes which may be used by other packages:
 
 * ``ahriman.core.exceptions`` provides custom exceptions.
-* ``ahriman.core.module_loader`` provides ``implementations`` method which can be used for dynamic classes load. In particular, this method is used for web views and application handlers loading.
 * ``ahriman.core.spawn.Spawn`` is a tool which can spawn another ``ahriman`` process. This feature is used by web application.
 * ``ahriman.core.tree`` is a dependency tree implementation.
-* ``ahriman.core.types`` are an additional global types for mypy checks.
-* ``ahriman.core.utils`` contains some useful functions which are not the part of any other class.
 
 ``ahriman.models`` package
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -71,7 +67,7 @@ Web application. It is important that this package is isolated from any other to
 
 * ``ahriman.web.middlewares`` provides middlewares for request handlers.
 * ``ahriman.web.schemas`` provides schemas (actually copy paste from dataclasses) used by swagger documentation.
-* ``ahriman.web.views`` contains web views derived from aiohttp view class. Those classes are loaded dynamically through the filesystem lookup.
+* ``ahriman.web.views`` contains web views derived from aiohttp view class.
 * ``ahriman.web.apispec`` provides generators for swagger documentation.
 * ``ahriman.web.cors`` contains helpers for cross origin resource sharing middlewares.
 * ``ahriman.web.routes`` creates routes for web application.
@@ -82,7 +78,7 @@ Application run
 
 #. Parse command line arguments, find subcommand and related handler which is set by the parser.
 #. Call ``Handler.execute`` method.
-#. Define list of architectures to run. In case if there is more than one architecture specified run several subprocesses or continue in current process otherwise. Class attribute ``ALLOW_MULTI_ARCHITECTURE_RUN`` controls whether the application can be run in multiple processes or not - this feature is required for some handlers (e.g. ``Config``, which utilizes stdout to print messages).
+#. Define list of architectures to run. In case if there is more than one architecture specified run several subprocesses or continue in current process otherwise. Class attribute ``ALLOW_MULTI_ARCHITECTURE_RUN`` controls whether the application can be run in multiple processes or not - this feature is required for some handlers (e.g. ``Web``, which should be able to spawn child process in daemon mode; it is impossible to do from daemonic processes).
 #. In each child process call lock functions.
 #. After success checks pass control to ``Handler.run`` method defined by specific handler class.
 #. Return result (success or failure) of each subprocess and exit from application.
@@ -177,28 +173,28 @@ Type conversions
 
 By default, it parses rows into python dictionary. In addition, the following pseudo-types are supported:
 
-* ``dict[str, Any]`` and ``list[Any]`` - for storing JSON data structures in database (technically there is no restriction on types for dictionary keys and values, but it is recommended to use only string keys). The type is stored as ``json`` data type and ``json.loads`` and ``json.dumps`` methods are used in order to read and write from/to database respectively.
+* ``dict[str, Any]``, ``list[Any]`` - for storing JSON data structures in database (technically there is no restriction on types for dictionary keys and values, but it is recommended to use only string keys). The type is stored as ``json`` data type and ``json.loads`` and ``json.dumps`` methods are used in order to read and write from/to database respectively.
 
 Basic flows
 -----------
 
 By default package build operations are performed with ``PACKAGER`` which is specified in ``makepkg.conf``, however, it is possible to override this variable from command line; in this case service performs lookup in the following way:
 
-* If packager is not set, it reads environment variables (e.g. ``DOAS_USER``, ``SUDO_USER`` and ``USER``), otherwise it uses value from command line.
+* If packager is not set, it reads environment variables (e.g. ``SUDO_USER`` and ``USER``), otherwise it uses value from command line.
 * It checks users for the specified username and tries to extract packager variable from it.
-* If packager value has been found, it will be passed as ``PACKAGER`` system variable (additional sudo configuration to pass environment variables might be required).
+* If packager value has been found, it will be passed as ``PACKAGER`` system variable (additional sudo configuration might be required).
 
 Add new packages or rebuild existing
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-The idea is to add package to a build queue from which it will be handled automatically during the next update run. Different variants are supported:
+Idea is to add package to a build queue from which it will be handled automatically during the next update run. Different variants are supported:
 
-* If supplied argument is file, then application moves the file to the directory with the built packages. Same rule is applied for directory, but in this case it copies every package-like file from the specified directory.
+* If supplied argument is file, then application moves the file to the directory with built packages. Same rule applies for directory, but in this case it copies every package-like file from the specified directory.
 * If supplied argument is directory and there is ``PKGBUILD`` file there, it will be treated as local package. In this case it will queue this package to build and copy source files (``PKGBUILD`` and ``.SRCINFO``) to caches.
-* If supplied argument looks like URL (i.e. it has scheme, which is neither ``data`` nor ``file``, e.g. ``http://``), it tries to download the package from the specified remote source.
-* If supplied argument is not file then application tries to lookup for the specified name in AUR and clones it into the temporary directory, from which it will be added into the build queue. This scenario can also handle package dependencies which are missing in repositories.
+* If supplied argument looks like URL (i.e. it has scheme - e.g. ``http://`` which is neither ``data`` nor ``file``), it tries to download the package from the specified remote source.
+* If supplied argument is not file then application tries to lookup for the specified name in AUR and clones it into the directory with manual updates. This scenario can also handle package dependencies which are missing in repositories.
 
-This logic can be overwritten by specifying the ``source`` parameter, which is partially useful if you would like to add package from AUR, but there is local directory cloned from AUR. Also the official repositories calls are hidden behind explicit source definition.
+This logic can be overwritten by specifying the ``source`` parameter, which is partially useful if you would like to add package from AUR, but there is local directory cloned from AUR. Also official repositories calls are hidden behind explicit source definition.
 
 Rebuild packages
 ^^^^^^^^^^^^^^^^
@@ -223,7 +219,7 @@ There are few ways for packages to be marked as out-of-date and hence requiring
 Update packages
 ^^^^^^^^^^^^^^^
 
-This feature is divided into the following stages: check AUR for updates and run rebuild for required packages. The package update flow is the following:
+This feature is divided into to the following stages: check AUR for updates and run rebuild for required packages. The package update flow is the following:
 
 #. Process every built package first. Those packages are usually added manually.
 #. Run sync and report methods.
@@ -257,17 +253,18 @@ The upload process is performed via special API endpoint, which is disabled by d
 
 After success upload, the update process must be called as usual in order to copy built packages to the main repository tree.
 
-On the other side, the delegation uses upload feature, but in addition it also calls external services in order to trigger build process. The packages are separated into the chunks based on the amount of the configured workers and their dependencies.
+On the other side, the delegation uses upload feature, but in addition it also calls external services in order to trigger build process. The packages are separated to chunks based on the amount of the configured workers and their dependencies.
 
 pkgrel bump rules
 ^^^^^^^^^^^^^^^^^
 
-The application is able to automatically bump package release (``pkgrel`` variable) during the build process if there is duplicated version in the repository. The version will be incremented as following:
+The application is able to automatically bump package release (``pkgrel``) during build process if there is duplicate version in repository. The version will be incremented as following:
 
 #. Get version of the remote package.
 #. Get version of the local package if available.
-#. If the local version is not set, proceed with the remote one.
-#. If the local version is set and the remote version is newer than local one, proceed with remote.
+#. If local version is not set, proceed with remote one.
+#. If local version is set and epoch or package version (``pkgver``) are different, proceed with remote version.
+#. If local version is set and remote version is newer than local one, proceed with remote.
 #. Extract ``pkgrel`` value.
 #. If it has ``major.minor`` notation (e.g. ``1.1``), then increment last part by 1, e.g. ``1.1 -> 1.2``, ``1.0.1 -> 1.0.2``.
 #. If ``pkgrel`` is a number (e.g. ``1``), then append 1 to the end of the string, e.g. ``1 -> 1.1``.
@@ -275,9 +272,9 @@ The application is able to automatically bump package release (``pkgrel`` variab
 Implicit dependencies resolution
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-In addition to the depends/optional/make/check depends lists the server also handles implicit dependencies. After success build, the application traverse through the build tree and finds:
+In addition to the depends/optional/make/check depends lists the server also handles implicit dependencies. After success build, the application traverse through the build tree and finds
 
-* Libraries to which the binaries (ELF-files) are linked. To do so, the ``NEEDED`` section of the ELF-files is read.
+* Libraries to which the binaries (ELF-files) are linked. To do so, the ``NEEDED`` section of the ELF-files are read.
 * Directories which contains files of the package, but do not belong to this package. This case covers, for example, python and ruby submodules.
 
 Having the initial dependencies tree, the application is looking for packages which contains those (both files and directories) paths and creates the initial packages list. After that, the packages list is reduced in the following way:
@@ -288,8 +285,6 @@ Having the initial dependencies tree, the application is looking for packages wh
 * After that, if there is a package which *optionally* depends on the another package in the remaining list, the package will be removed.
 * And finally, if there is any path, which is the child of the entry, and it contains the same package, the package from the smaller entry will be removed.
 
-Those paths are also filtered by regular expressions set in the configuration.
-
 All those implicit dependencies are stored in the database and extracted on each check. In case if any of the repository packages doesn't contain any entry anymore (e.g. so version has been changed or modules directory has been changed), the dependent package will be marked as out-of-dated.
 
 Core functions reference
@@ -329,7 +324,7 @@ Some packages provide different behaviour depending on configuration settings. I
 Authorization
 ^^^^^^^^^^^^^
 
-The package provides several authorization methods: disabled, based on configuration, PAM and OAuth2.
+The package provides several authorization methods: disabled, based on configuration and OAuth2. 
 
 Disabled (default) authorization provider just allows everything for everyone and does not have any specific configuration (it uses some default configuration parameters though). It also provides generic interface for derived classes.
 
@@ -338,7 +333,7 @@ Mapping (aka configuration) provider uses hashed passwords with optional salt fr
 * ``check_credentials`` - user password validation (authentication).
 * ``verify_access`` - user permission validation (authorization).
 
-Passwords must be stored in database as ``hash(password + salt)``, where ``password`` is user defined password (taken from user input), ``salt`` is random string (any length) defined globally in configuration and ``hash`` is a secure hash function. Thus, the following configuration
+Passwords must be stored in database as ``hash(password + salt)``, where ``password`` is user defined password (taken from user input), ``salt`` is random string (any length) defined globally in configuration and ``hash`` is secure hash function. Thus, the following configuration
 
 .. code-block::
 
@@ -351,7 +346,7 @@ OAuth provider uses library definitions (``aioauth-client``) in order *authentic
 
 OAuth's implementation also allows authenticating users via username + password (in the same way as mapping does) though it is not recommended for end-users and password must be left blank. In particular this feature can be used by service reporting (aka robots).
 
-In addition, web service checks the source socket used. In case if it belongs to ``socket.AF_UNIX`` family, it will skip any further checks considering the request to be performed in safe environment (e.g. on the same physical machine). This feature, in particular is being used by the reporter instances in case if socket address is set in configuration. Note, however, that this behaviour can be disabled by configuration.
+In addition, web service checks the source socket used. In case if it belongs to ``socket.AF_UNIX`` family, it will skip any further checks considering the request to be performed in safe environment (e.g. on the same physical machine). This feature, in particular is being used by the reporter instances in case if socket address is set in configuration.
 
 In order to configure users there are special subcommands.
 
@@ -386,7 +381,7 @@ The application provides a house-made shell parser ``ahriman.core.alpm.pkgbuild_
 
 #. During the parser process, firstly, it extract next token from the source file (basically, the word) and tries to match it to the variable assignment. If so, then just processes accordingly.
 #. If it is not an assignment, the parser checks if the token was quoted.
-#. If it wasn't quoted then the parser tries to match the array starts (two consecutive tokens like ``array=`` and ``(``) or it is function (``function``, ``()`` and ``{``).
+#. If it wasn't then the parser tries to match the array starts (two consecutive tokens like ``array=`` and ``(``) or it is function (``function``, ``()`` and ``{``).
 #. The arrays are processed until the next closing bracket ``)``. After extraction, the parser tries to expand an array according to bash rules (``prefix{first,second}suffix`` constructions).
 #. The functions are just read until the closing bracket ``}`` and then reread whole text from the input string without a tokenization.
 
@@ -394,7 +389,7 @@ All extracted fields are packed as ``ahriman.models.pkgbuild_patch.PkgbuildPatch
 
 The PKGBUILD class also provides some additional functions on top of that:
 
-* Ability to extract fields defined inside ``package*()`` functions, which are in particular used for the multi-packages.
+* Ability to extract fields defined inside ``package*()`` functions, which are in particular used for the multipackages.
 * Shell substitution, which supports constructions ``$var`` (including ``${var}``), ``${var#(#)pattern}``, ``${var%(%)pattern}`` and ``${var/(/)pattern/replacement}`` (including ``#pattern`` and ``%pattern``).
 
 Additional features
@@ -402,6 +397,7 @@ Additional features
 
 Some features require optional dependencies to be installed:
 
+* Version control executables (e.g. ``git``, ``svn``) for VCS packages.
 * ``gnupg`` application for package and repository sign feature.
 * ``rsync`` application for rsync based repository sync.
 * ``boto3`` python package for ``S3`` sync.
@@ -413,11 +409,10 @@ Web application
 Web application requires the following python packages to be installed:
 
 * Core part requires ``aiohttp`` (application itself), ``aiohttp_jinja2`` and ``Jinja2`` (HTML generation from templates).
-* Additional web features also require ``aiohttp-apispec`` (autogenerated documentation, optional), ``aiohttp_cors`` (CORS support, required by documentation).
+* Additional web features also require ``aiohttp-apispec`` (autogenerated documentation), ``aiohttp_cors`` (CORS support, required by documentation).
 * In addition, authorization feature requires ``aiohttp_security``, ``aiohttp_session`` and ``cryptography``.
 * In addition to base authorization dependencies, OAuth2 also requires ``aioauth-client`` library.
 * In addition if you would like to disable authorization for local access (recommended way in order to run the application itself with reporting support), the ``requests-unixsocket2`` library is required.
-* Application metrics will be automatically enabled after installing ``aiohttp-openmetrics`` package.
 
 Middlewares
 ^^^^^^^^^^^
@@ -441,9 +436,6 @@ REST API supports only JSON data.
 Different APIs are separated into different packages:
 
 * ``ahriman.web.views.api`` not a real API, but some views which provide OpenAPI support.
-* ``ahriman.web.views.*.auditlog`` provides event log API.
-* ``ahriman.web.views.*.distributed`` is an API for builders interaction for multi-node setup.
-* ``ahriman.web.views.*.packages`` contains views which provide information about existing packages.
 * ``ahriman.web.views.*.service`` provides views for application controls.
 * ``ahriman.web.views.*.status`` package provides REST API for application reporting.
 * ``ahriman.web.views.*.user`` package provides login and logout methods which can be called without authorization.
@@ -462,7 +454,7 @@ Service provides optional authorization which can be turned on in settings. In o
 
 If this feature is configured any request will be prohibited without authentication. In addition, configuration flag ``auth.allow_read_only`` can be used in order to allow read-only operations - reading index page and packages - without authorization.
 
-For authenticated users it uses encrypted session cookies to store tokens; encryption key is read from configuration or generated at the start of the application if not set. It also stores expiration time of the session inside.
+For authenticated users it uses encrypted session cookies to store tokens; encryption key is generated each time at the start of the application. It also stores expiration time of the session inside.
 
 External calls
 ^^^^^^^^^^^^^^

docs/conf.py

@@ -15,8 +15,9 @@ import sys
 
 from pathlib import Path
 
+from ahriman import __version__
+
 
-# support package imports
 basedir = Path(__file__).resolve().parent.parent / "src"
 sys.path.insert(0, str(basedir))
 
@@ -28,7 +29,6 @@ copyright = f"2021-{datetime.date.today().year}, ahriman team"
 author = "ahriman team"
 
 # The full version, including alpha/beta/rc tags
-from ahriman import __version__
 release = __version__
 
 
@@ -91,13 +91,7 @@ autoclass_content = "both"
 
 autodoc_member_order = "groupwise"
 
-autodoc_mock_imports = [
-    "aioauth_client",
-    "aiohttp_security",
-    "aiohttp_session",
-    "cryptography", 
-    "pyalpm",
-]
+autodoc_mock_imports = ["cryptography", "pyalpm"]
 
 autodoc_default_options = {
     "no-undoc-members": True,

docs/configuration.rst

@@ -81,7 +81,6 @@ Base configuration settings.
 * ``apply_migrations`` - perform database migrations on the application start, boolean, optional, default ``yes``. Useful if you are using git version. Note, however, that this option must be changed only if you know what to do and going to handle migrations manually.
 * ``database`` - path to the application SQLite database, string, required.
 * ``include`` - path to directory with configuration files overrides, string, optional. Files will be read in alphabetical order.
-* ``keep_last_logs`` - amount of build logs to be kept for each package, integer, optional ,default ``0``. Logs will be cleared at the end of each process.
 * ``logging`` - path to logging configuration, string, required. Check ``logging.ini`` for reference.
 
 ``alpm:*`` groups
@@ -218,7 +217,7 @@ Mirrorlist generator plugin
 ``remote-pull`` group
 ---------------------
 
-Remote git source synchronization settings. Unlike ``upload`` triggers those triggers are used for PKGBUILD synchronization - fetch from remote repository PKGBUILDs before updating process.
+Remote git source synchronization settings. Unlike ``Upload`` triggers those triggers are used for PKGBUILD synchronization - fetch from remote repository PKGBUILDs before updating process.
 
 It supports authorization; to do so you'd need to prefix the URL with authorization part, e.g. ``https://key:token@github.com/arcan1s/ahriman.git``. It is highly recommended to use application tokens instead of your user authorization details. Alternatively, you can use any other option supported by git, e.g.:
 

docs/faq/distributed.rst

@@ -311,12 +311,6 @@ Automatic worker nodes discovery
 
 Instead of setting ``${build:workers}`` option explicitly it is also possible to configure services to load worker list dynamically. To do so, the ``ahriman.core.distributed.WorkerLoaderTrigger`` and ``ahriman.core.distributed.WorkerTrigger`` must be used for **master** and **worker** nodes respectively. See recipes for more details.
 
-Those triggers have to be installed as a separate package:
-
-.. code-block:: shell
-
-   yay -S ahriman-triggers
-
 Known limitations
 """""""""""""""""
 

docs/faq/docker.rst

@@ -16,7 +16,7 @@ The default action (in case if no arguments provided) is ``repo-update``. Basica
 
    docker run --privileged -v /path/to/local/repo:/var/lib/ahriman arcan1s/ahriman:latest
 
-In order to make data available outside of container, you would need to mount local (parent) directory inside container by using ``-v /path/to/local/repo:/var/lib/ahriman`` argument, where ``/path/to/local/repo`` is a path to repository on local machine. In addition, you can pass own configuration overrides by using the same ``-v`` flag, e.g.:
+``--privileged`` flag is required to make mount possible inside container. In order to make data available outside of container, you would need to mount local (parent) directory inside container by using ``-v /path/to/local/repo:/var/lib/ahriman`` argument, where ``/path/to/local/repo`` is a path to repository on local machine. In addition, you can pass own configuration overrides by using the same ``-v`` flag, e.g.:
 
 .. code-block:: shell
 
@@ -30,28 +30,6 @@ The action can be specified during run, e.g.:
 
 For more details please refer to the docker FAQ.
 
-Privileged and non-privileged container
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Examples here suggest using ``--privileged`` flag which is required for the devtools and is involved in two types of operations: tmpfs mount and cgroup manipulation. Whereas it is the easiest way to operate, it might be not really secure. The other way to make devtools working is to grant required capabilities, which can be achieved by using flags:
-
-* ``--cap-add=SYS_ADMIN``, which grants permissions to operate with tmpfs for ``systemd-nspawn``.
-* ``-v /sys/fs/cgroup:/sys/fs/cgroup`` which allows access to cgroup manipulation.
-
-Thus, there are two possible ways to run the container:
-
-.. code-block:: shell
-
-   docker run --privileged arcan1s/ahriman:latest
-
-and
-
-.. code-block:: shell
-
-   docker run --cap-add=SYS_ADMIN -v /sys/fs/cgroup:/sys/fs/cgroup arcan1s/ahriman:latest
-
-but for the simplicity this FAQ will always use ``--privileged`` flag.
-
 Environment variables
 ^^^^^^^^^^^^^^^^^^^^^
 
@@ -119,7 +97,7 @@ Otherwise, you would need to pass ``AHRIMAN_PORT`` and mount container network t
 
 Simple server with authentication can be found in `examples <https://github.com/arcan1s/ahriman/tree/master/recipes/web>`__ too.
 
-Multi-repository web service
+Mutli-repository web service
 """"""""""""""""""""""""""""
 
 Idea is pretty same as to just run web service. However, it is required to run setup commands for each repository, except for one which is specified by ``AHRIMAN_REPOSITORY`` and ``AHRIMAN_ARCHITECTURE`` variables.

docs/faq/general.rst

@@ -13,7 +13,7 @@ TL;DR
 
 .. code-block:: shell
 
-   yay -S ahriman-core
+   yay -S ahriman
    ahriman -a x86_64 -r aur service-setup --packager "ahriman bot <ahriman@example.com>"
    systemctl enable --now ahriman@x86_64-aur.timer
 

docs/faq/maintenance-packages.rst

@@ -1,12 +1,6 @@
 Maintenance packages
 --------------------
 
-Those features require extensions package to be installed before, e.g.:
-
-.. code-block:: shell
-
-   yay -S ahriman-triggers
-
 Generate keyring package
 ^^^^^^^^^^^^^^^^^^^^^^^^
 

docs/faq/misc.rst

@@ -56,13 +56,6 @@ Though originally I've created ahriman by trying to improve the project, it stil
 
 It is automation tools for ``repoctl`` mentioned above. Except for using shell it looks pretty cool and also offers some additional features like patches, remote synchronization (isn't it?) and reporting.
 
-`AURCache <https://github.com/Lukas-Heiligenbrunner/AURCache>`__
-""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-
-That's really cool project if you are looking for simple service to build AUR packages. It provides very informative dashboard and easy to configure and use. However, it doesn't provide direct way to control build process (e.g. it is neither trivial to build packages for architectures which are not supported by default nor to change build flags).
-
-Also this application relies on docker setup (e.g. builders are only available as special docker containers). In addition, it uses ``paru`` to build packages instead of ``devtools``.
-
 How to check service logs
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 

docs/faq/web.rst

@@ -5,11 +5,11 @@ How to setup web service
 ^^^^^^^^^^^^^^^^^^^^^^^^
 
 #. 
-   Install web service:
+   Install dependencies:
 
    .. code-block:: shell
 
-      yay -S ahriman-web
+      yay -S --asdeps python-aiohttp python-aiohttp-jinja2 python-aiohttp-apispec>=3.0.0 python-aiohttp-cors
 
 #. 
    Configure service:

docs/index.rst

@@ -36,6 +36,6 @@ Contents
    faq/index
    migrations/index
    architecture
-   advanced-usage/index
+   advanced-usage
    triggers
    modules

docs/migrations/2.16.0.rst

@@ -3,7 +3,7 @@ To 2.16.0
 
 This release replaces ``passlib`` dependency with ``bcrypt``.
 
-The reason behind this change is that python developers have deprecated and scheduled for removal ``crypt`` module, which is used by ``passlib``. (By the way, they recommend to use ``passlib`` as a replacement.) Unfortunately, it appears that ``passlib`` is unmaintained (see `the issue <https://foss.heptapod.net/python-libs/passlib/-/issues/187>`__), so the only solution is to migrate to another library.
+The reason behind this change is that python developers have deprecated and scheduled for removal ``crypt`` module, which is used by ``passlib``. (By the way, they recommend to use ``passlib`` as a replacement.) Unfortunately, it appears that ``passlib`` is unmaintained (see `the issue <https://foss.heptapod.net/python-libs/passlib/-/issues/187>`__), so the only solution is to migrate to anoher library.
 
 Because passwords are stored as hashes, it is near to impossible to shadow change passwords in database, the manual intervention is required if:
 

docs/requirements.txt

@@ -1,128 +0,0 @@
-# This file was autogenerated by uv via the following command:
-#    uv pip compile --group pyproject.toml:docs --extra s3 --extra validator --extra web --output-file docs/requirements.txt pyproject.toml
-aiohappyeyeballs==2.6.1
-    # via aiohttp
-aiohttp==3.11.18
-    # via
-    #   ahriman (pyproject.toml)
-    #   aiohttp-cors
-    #   aiohttp-jinja2
-aiohttp-cors==0.8.1
-    # via ahriman (pyproject.toml)
-aiohttp-jinja2==1.6
-    # via ahriman (pyproject.toml)
-aiosignal==1.3.2
-    # via aiohttp
-alabaster==1.0.0
-    # via sphinx
-argparse-manpage==4.6
-    # via ahriman (pyproject.toml:docs)
-attrs==25.3.0
-    # via aiohttp
-babel==2.17.0
-    # via sphinx
-bcrypt==4.3.0
-    # via ahriman (pyproject.toml)
-boto3==1.38.11
-    # via ahriman (pyproject.toml)
-botocore==1.38.11
-    # via
-    #   boto3
-    #   s3transfer
-cerberus==1.3.7
-    # via ahriman (pyproject.toml)
-certifi==2025.4.26
-    # via requests
-charset-normalizer==3.4.2
-    # via requests
-docutils==0.21.2
-    # via
-    #   sphinx
-    #   sphinx-argparse
-    #   sphinx-rtd-theme
-frozenlist==1.6.0
-    # via
-    #   aiohttp
-    #   aiosignal
-idna==3.10
-    # via
-    #   requests
-    #   yarl
-imagesize==1.4.1
-    # via sphinx
-inflection==0.5.1
-    # via ahriman (pyproject.toml)
-jinja2==3.1.6
-    # via
-    #   aiohttp-jinja2
-    #   sphinx
-jmespath==1.0.1
-    # via
-    #   boto3
-    #   botocore
-markupsafe==3.0.2
-    # via jinja2
-multidict==6.4.3
-    # via
-    #   aiohttp
-    #   yarl
-packaging==25.0
-    # via sphinx
-propcache==0.3.1
-    # via
-    #   aiohttp
-    #   yarl
-pydeps==3.0.1
-    # via ahriman (pyproject.toml:docs)
-pyelftools==0.32
-    # via ahriman (pyproject.toml)
-pygments==2.19.1
-    # via sphinx
-python-dateutil==2.9.0.post0
-    # via botocore
-requests==2.32.3
-    # via
-    #   ahriman (pyproject.toml)
-    #   sphinx
-roman-numerals-py==3.1.0
-    # via sphinx
-s3transfer==0.12.0
-    # via boto3
-shtab==1.7.2
-    # via ahriman (pyproject.toml:docs)
-six==1.17.0
-    # via python-dateutil
-snowballstemmer==3.0.0.1
-    # via sphinx
-sphinx==8.2.3
-    # via
-    #   ahriman (pyproject.toml:docs)
-    #   sphinx-argparse
-    #   sphinx-rtd-theme
-    #   sphinxcontrib-jquery
-sphinx-argparse==0.5.2
-    # via ahriman (pyproject.toml:docs)
-sphinx-rtd-theme==3.0.2
-    # via ahriman (pyproject.toml:docs)
-sphinxcontrib-applehelp==2.0.0
-    # via sphinx
-sphinxcontrib-devhelp==2.0.0
-    # via sphinx
-sphinxcontrib-htmlhelp==2.1.0
-    # via sphinx
-sphinxcontrib-jquery==4.1
-    # via sphinx-rtd-theme
-sphinxcontrib-jsmath==1.0.1
-    # via sphinx
-sphinxcontrib-qthelp==2.0.0
-    # via sphinx
-sphinxcontrib-serializinghtml==2.0.0
-    # via sphinx
-stdlib-list==0.11.1
-    # via pydeps
-urllib3==2.4.0
-    # via
-    #   botocore
-    #   requests
-yarl==1.20.0
-    # via aiohttp

docs/setup.rst

@@ -2,7 +2,7 @@ Initial setup
 =============
 
 #. 
-   Install package(s) as usual. At least, ``ahriman-core`` package is required; other features can be installed separately. Alternatively, it is possible to install meta-package, which includes everything.
+   Install package as usual.
 #. 
    Change settings if required, see :doc:`configuration reference <configuration>` for more details.
 #.
@@ -12,22 +12,19 @@ Initial setup
 
       sudo ahriman -a x86_64 -r aur service-setup ...
 
-   .. admonition:: Details
-      :collapsible: closed
+   ``service-setup`` literally does the following steps:
 
-      ``service-setup`` literally does the following steps:
+   #.
+      Create ``/var/lib/ahriman/.makepkg.conf`` with ``makepkg.conf`` overrides if required (at least you might want to set ``PACKAGER``):
 
-      #.
-         Create ``/var/lib/ahriman/.makepkg.conf`` with ``makepkg.conf`` overrides if required (at least you might want to set ``PACKAGER``):
+      .. code-block:: shell
 
-         .. code-block:: shell
+          echo 'PACKAGER="ahriman bot <ahriman@example.com>"' | sudo -u ahriman tee -a /var/lib/ahriman/.makepkg.conf
 
-            echo 'PACKAGER="ahriman bot <ahriman@example.com>"' | sudo -u ahriman tee -a /var/lib/ahriman/.makepkg.conf
+   #.
+      Configure build tools (it is required for correct dependency management system):
 
-      #.
-         Configure build tools (it is required for correct dependency management system):
-
-      #.
+      #. 
          Create build command (you can choose any name for command, basically it should be ``{name}-{arch}-build``):
 
          .. code-block:: shell
@@ -70,7 +67,7 @@ Initial setup
             echo 'ahriman ALL=(ALL) NOPASSWD:SETENV: CARCHBUILD_CMD' | tee -a /etc/sudoers.d/ahriman
             chmod 400 /etc/sudoers.d/ahriman
 
-   This command supports several arguments, kindly refer to its help message.
+      This command supports several arguments, kindly refer to its help message.
 
 #. 
    Start and enable ``ahriman@.timer`` via ``systemctl``:

package/archlinux/PKGBUILD

@@ -1,8 +1,8 @@
 # Maintainer: Evgeniy Alekseev
 
 pkgbase='ahriman'
-pkgname=('ahriman' 'ahriman-core' 'ahriman-triggers' 'ahriman-web')
-pkgver=2.19.0
+pkgname=('ahriman' 'ahriman-triggers' 'ahriman-web')
+pkgver=2.15.2
 pkgrel=1
 pkgdesc="ArcH linux ReposItory MANager"
 arch=('any')
@@ -22,15 +22,8 @@ build() {
 
 package_ahriman() {
     pkgname='ahriman'
-    pkgdesc="ArcH linux ReposItory MANager (meta package)"
-    depends=("$pkgbase-core=$pkgver" "$pkgbase-triggers=$pkgver" "$pkgbase-web=$pkgver")
-}
-
-package_ahriman-core() {
-    pkgname='ahriman-core'
     optdepends=('ahriman-triggers: additional extensions for the application'
                 'ahriman-web: web server'
-                'ipython: an enhanced shell interpreter'
                 'python-boto3: sync to s3'
                 'python-cerberus: configuration validator'
                 'python-matplotlib: usage statistics chart'
@@ -38,7 +31,7 @@ package_ahriman-core() {
                 'python-jinja: html report generation'
                 'python-systemd: journal support'
                 'rsync: sync by using rsync')
-    install="$pkgbase.install"
+    install="$pkgname.install"
     backup=('etc/ahriman.ini'
             'etc/ahriman.ini.d/logging.ini')
 
@@ -58,7 +51,7 @@ package_ahriman-core() {
 package_ahriman-triggers() {
     pkgname='ahriman-triggers'
     pkgdesc="ArcH linux ReposItory MANager, additional extensions"
-    depends=("$pkgbase-core=$pkgver")
+    depends=("$pkgbase=$pkgver")
     backup=('etc/ahriman.ini.d/00-triggers.ini')
 
     cd "$pkgbase-$pkgver"
@@ -72,10 +65,8 @@ package_ahriman-triggers() {
 package_ahriman-web() {
     pkgname='ahriman-web'
     pkgdesc="ArcH linux ReposItory MANager, web server"
-    depends=("$pkgbase-core=$pkgver" 'python-aiohttp-cors' 'python-aiohttp-jinja2')
+    depends=("$pkgbase=$pkgver" 'python-aiohttp-apispec>=3.0.0' 'python-aiohttp-cors' 'python-aiohttp-jinja2')
     optdepends=('python-aioauth-client: OAuth2 authorization support'
-                'python-aiohttp-apispec>=3.0.0: autogenerated API documentation'
-                'python-aiohttp-openmetrics: HTTP metrics support'
                 'python-aiohttp-security: authorization support'
                 'python-aiohttp-session: authorization support'
                 'python-cryptography: authorization support')

package/archlinux/ahriman.install

@@ -2,7 +2,6 @@ post_upgrade() {
     local breakpoints=(
         2.9.0-1
         2.12.0-1
-        2.16.0-1
     )
 
     for v in "${breakpoints[@]}"; do

package/share/ahriman/settings/ahriman.ini

@@ -7,8 +7,6 @@ logging = ahriman.ini.d/logging.ini
 ;apply_migrations = yes
 ; Path to the application SQLite database.
 database = ${repository:root}/ahriman.db
-; Keep last build logs for each package
-keep_last_logs = 5
 
 [alpm]
 ; Path to pacman system database cache.

package/share/ahriman/templates/build-status.jinja2

@@ -15,12 +15,12 @@
 
         <div class="container">
             <nav class="navbar navbar-expand-lg">
-                <div class="navbar-brand"><a href="https://github.com/arcan1s/ahriman" title="logo"><img src="/static/logo.svg" width="30" height="30" alt=""></a></div>
-                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#repositories-navbar" aria-controls="repositories-navbar" aria-expanded="false" aria-label="Toggle navigation">
+                <div class="navbar-brand"><img src="/static/logo.svg" width="30" height="30" alt=""></div>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#repositories-navbar-supported-content" aria-controls="repositories-navbar-supported-content" aria-expanded="false" aria-label="Toggle navigation">
                     <span class="navbar-toggler-icon"></span>
                 </button>
 
-                <div id="repositories-navbar" class="collapse navbar-collapse">
+                <div id="repositories-navbar-supported-content" class="collapse navbar-collapse">
                     <ul id="repositories" class="nav nav-tabs">
                         {% for repository in repositories %}
                             <li class="nav-item">
@@ -36,9 +36,7 @@
 
         <div class="container">
             <div id="toolbar" class="dropdown">
-                <button id="dashboard-button" type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#dashboard-modal">
-                    <i class="bi bi-info-circle"></i>
-                </button>
+                <a id="badge-status" tabindex="0" role="button" class="btn btn-outline-secondary" data-bs-toggle="popover" data-bs-trigger="focus" data-bs-content="no run data"><i class="bi bi-info-circle"></i></a>
 
                 {% if not auth.enabled or auth.username is not none %}
                     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
@@ -55,11 +53,6 @@
                                 <i class="bi bi-play"></i> update
                             </button>
                         </li>
-                        <li>
-                            <button id="update-repositories-button" class="btn dropdown-item" onclick="refreshDatabases()">
-                                <i class="bi bi-arrow-down-circle"></i> update pacman databases
-                            </button>
-                        </li>
                         <li>
                             <button id="package-rebuild-button" class="btn dropdown-item" data-bs-toggle="modal" data-bs-target="#package-rebuild-modal">
                                 <i class="bi bi-arrow-clockwise"></i> rebuild
@@ -126,9 +119,7 @@
                     <li><a id="badge-version" class="nav-link" href="https://github.com/arcan1s/ahriman" title="sources"><i class="bi bi-github"></i> ahriman</a></li>
                     <li><a class="nav-link" href="https://github.com/arcan1s/ahriman/releases" title="releases list">releases</a></li>
                     <li><a class="nav-link" href="https://github.com/arcan1s/ahriman/issues" title="issues tracker">report a bug</a></li>
-                    {% if docs_enabled %}
-                        <li><a class="nav-link" href="/api-docs" title="API documentation">api</a></li>
-                    {% endif %}
+                    <li><a class="nav-link" href="/api-docs" title="API documentation">api</a></li>
                 </ul>
 
                 {% if index_url is not none %}
@@ -159,7 +150,6 @@
 
         {% include "build-status/alerts.jinja2" %}
 
-        {% include "build-status/dashboard.jinja2" %}
         {% include "build-status/package-add-modal.jinja2" %}
         {% include "build-status/package-rebuild-modal.jinja2" %}
         {% include "build-status/key-import-modal.jinja2" %}

package/share/ahriman/templates/build-status/dashboard.jinja2

@@ -1,76 +0,0 @@
-<div id="dashboard-modal" tabindex="-1" role="dialog" class="modal fade">
-    <div class="modal-dialog modal-xl" role="document">
-        <div class="modal-content">
-             <div id="dashboard-modal-header" class="modal-header">
-                <h4 class="modal-title">System health</h4>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="close"></button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group row mt-2">
-                    <div class="col-4 col-lg-2" style="text-align: right">Repository name</div>
-                    <div id="dashboard-name" class="col-8 col-lg-3"></div>
-                    <div class="col-4 col-lg-2" style="text-align: right">Repository architecture</div>
-                    <div id="dashboard-architecture" class="col-8 col-lg-3"></div>
-                </div>
-
-                <div class="form-group row mt-2">
-                    <div class="col-4 col-lg-2" style="text-align: right">Current status</div>
-                    <div id="dashboard-status" class="col-8 col-lg-3"></div>
-                    <div class="col-4 col-lg-2" style="text-align: right">Updated at</div>
-                    <div id="dashboard-status-timestamp" class="col-8 col-lg-3"></div>
-                </div>
-
-                <div id="dashboard-canvas" class="form-group row mt-2">
-                    <div class="col-8 col-lg-6">
-                        <canvas id="dashboard-packages-count-chart"></canvas>
-                    </div>
-                    <div class="col-8 col-lg-6">
-                        <canvas id="dashboard-packages-statuses-chart"></canvas>
-                    </div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><i class="bi bi-x"></i><span class="d-none d-sm-inline"> close</span></button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script>
-    const dashboardModal = document.getElementById("dashboard-modal");
-    const dashboardModalHeader = document.getElementById("dashboard-modal-header");
-
-    const dashboardName = document.getElementById("dashboard-name");
-    const dashboardArchitecture = document.getElementById("dashboard-architecture");
-    const dashboardStatus = document.getElementById("dashboard-status");
-    const dashboardStatusTimestamp = document.getElementById("dashboard-status-timestamp");
-
-    const dashboardCanvas = document.getElementById("dashboard-canvas");
-    const dashboardPackagesStatusesChartCanvas = document.getElementById("dashboard-packages-statuses-chart");
-    let dashboardPackagesStatusesChart = null;
-    const dashboardPackagesCountChartCanvas = document.getElementById("dashboard-packages-count-chart");
-    let dashboardPackagesCountChart = null;
-
-    ready(_ => {
-        dashboardPackagesStatusesChart = new Chart(dashboardPackagesStatusesChartCanvas, {
-            type: "pie",
-            data: {},
-            options: {
-                responsive: true,
-            },
-        });
-        dashboardPackagesCountChart = new Chart(dashboardPackagesCountChartCanvas, {
-            type: "bar",
-            data: {},
-            options: {
-                maintainAspectRatio: false,
-                responsive: true,
-                scales: {
-                    x: {
-                        stacked: true,
-                    },
-                },
-            },
-        });
-    });
-</script>

package/share/ahriman/templates/build-status/package-add-modal.jinja2

@@ -24,13 +24,6 @@
                             <datalist id="package-add-known-packages-dlist"></datalist>
                         </div>
                     </div>
-                    <div class="form-group row">
-                        <label class="col-3 col-form-label"></label>
-                        <div class="col-9">
-                            <input id="package-add-refresh-input" type="checkbox" class="form-check-input" value="" checked>
-                            <label for="package-add-refresh-input" class="form-check-label">update pacman databases</label>
-                        </div>
-                    </div>
                     <div class="form-group row">
                         <div class="col-12">
                             <button id="package-add-variable-button" type="button" class="form-control btn btn-light rounded" onclick="packageAddVariableInputCreate()"><i class="bi bi-plus"></i> add environment variable </button>
@@ -57,8 +50,6 @@
 
     const packageAddVariablesDiv = document.getElementById("package-add-variables-div");
 
-    const packageAddRefreshInput = document.getElementById("package-add-refresh-input");
-
     function packageAddVariableInputCreate() {
         const variableInput = document.createElement("div");
         variableInput.classList.add("input-group");
@@ -108,18 +99,16 @@
         return {patches: patches};
     }
 
-    function packagesAdd(packages, patches, repository, data) {
+    function packagesAdd(packages, patches, repository) {
         packages = packages ?? packageAddInput.value;
         patches = patches ?? patchesParse();
         repository = repository ?? getRepositorySelector(packageAddRepositoryInput);
-        data = data ?? {refresh: packageAddRefreshInput.checked};
 
         if (packages) {
             bootstrap.Modal.getOrCreateInstance(packageAddModal).hide();
             const onSuccess = update => `Packages ${update} have been added`;
             const onFailure = error => `Package addition failed: ${error}`;
-            const parameters = Object.assign({}, data, patches);
-            doPackageAction("/api/v1/service/add", [packages], repository, onSuccess, onFailure, parameters);
+            doPackageAction("/api/v1/service/add", [packages], repository, onSuccess, onFailure, patches);
         }
     }
 

package/share/ahriman/templates/build-status/package-info-modal.jinja2

@@ -59,17 +59,7 @@
                 </nav>
                 <div class="tab-content" id="nav-tabContent">
                     <div id="package-info-logs" class="tab-pane fade show active" role="tabpanel" aria-labelledby="package-info-logs-button" tabindex="0">
-                        <div class="row">
-                            <div class="col-1 dropend">
-                                <button id="package-info-logs-dropdown" class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                    <i class="bi bi-list"></i>
-                                </button>
-                                <nav id="package-info-logs-versions" class="dropdown-menu" aria-labelledby="package-info-logs-dropdown"></nav>
-                            </div>
-                            <div class="col-11">
-                                <pre class="language-console"><code id="package-info-logs-input" class="pre-scrollable language-console"></code><button id="package-info-logs-copy-button" type="button" class="btn language-console" onclick="copyLogs()"><i class="bi bi-clipboard"></i> copy</button></pre>
-                            </div>
-                        </div>
+                        <pre class="language-console"><code id="package-info-logs-input" class="pre-scrollable language-console"></code><button id="package-info-logs-copy-button" type="button" class="btn language-console" onclick="copyLogs()"><i class="bi bi-clipboard"></i> copy</button></pre>
                     </div>
                     <div id="package-info-changes" class="tab-pane fade" role="tabpanel" aria-labelledby="package-info-changes-button" tabindex="0">
                         <pre class="language-diff"><code id="package-info-changes-input" class="pre-scrollable language-diff"></code><button id="package-info-changes-copy-button" type="button" class="btn language-diff" onclick="copyChanges()"><i class="bi bi-clipboard"></i> copy</button></pre>
@@ -95,9 +85,6 @@
             </div>
             <div class="modal-footer">
                 {% if not auth.enabled or auth.username is not none %}
-                    <input id="package-info-refresh-input" type="checkbox" class="form-check-input" value="" checked>
-                    <label for="package-info-refresh-input" class="form-check-label">update pacman databases</label>
-
                     <button id="package-info-update-button" type="submit" class="btn btn-success" onclick="packageInfoUpdate()" data-bs-dismiss="modal"><i class="bi bi-play"></i><span class="d-none d-sm-inline"> update</span></button>
                     <button id="package-info-remove-button" type="submit" class="btn btn-danger" onclick="packageInfoRemove()" data-bs-dismiss="modal"><i class="bi bi-trash"></i><span class="d-none d-sm-inline"> remove</span></button>
                 {% endif %}
@@ -113,7 +100,6 @@
     const packageInfoModalHeader = document.getElementById("package-info-modal-header");
     const packageInfo = document.getElementById("package-info");
 
-    const packageInfoLogsVersions = document.getElementById("package-info-logs-versions");
     const packageInfoLogsInput = document.getElementById("package-info-logs-input");
     const packageInfoLogsCopyButton = document.getElementById("package-info-logs-copy-button");
 
@@ -138,8 +124,6 @@
     const packageInfoVariablesBlock = document.getElementById("package-info-variables-block");
     const packageInfoVariablesDiv = document.getElementById("package-info-variables-div");
 
-    const packageInfoRefreshInput = document.getElementById("package-info-refresh-input");
-
     function clearChart() {
         packageInfoEventsUpdateChartCanvas.hidden = true;
         if (packageInfoEventsUpdateChart) {
@@ -179,7 +163,7 @@
         const variableValueInput = document.createElement("input");
         variableValueInput.classList.add("form-control");
         variableValueInput.readOnly = true;
-        variableValueInput.value = JSON.stringify(variable.value);
+        variableValueInput.value = variable.value;
 
         const variableButtonRemove = document.createElement("button");
         variableButtonRemove.type = "button";
@@ -301,51 +285,25 @@
                 convert: response => response.json(),
             },
             data => {
-                const selectors = Object
-                    .values(
-                        data.reduce((acc, log_record) => {
-                            const id = `${log_record.version}-${log_record.process_id}`;
-                            if (acc[id])
-                                acc[id].created = Math.min(log_record.created, acc[id].created);
-                            else
-                                acc[id] = log_record;
-                            return acc;
-                        }, {})
-                    )
-                    .sort(({created: left}, {created: right}) =>
-                        right - left
-                    )
-                    .map(version => {
-                        const link = document.createElement("a");
-                        link.classList.add("dropdown-item");
-
-                        link.textContent = new Date(1000 * version.created).toISOStringShort();
-                        link.href = "#";
-                        link.onclick = _ => {
-                            const logs = data
-                                .filter(log_record => log_record.version === version.version && log_record.process_id === version.process_id)
-                                .map(log_record => `[${new Date(1000 * log_record.created).toISOString()}] ${log_record.message}`);
-
-                            packageInfoLogsInput.textContent = logs.join("\n");
-                            highlight(packageInfoLogsInput);
-
-                            Array.from(packageInfoLogsVersions.children).forEach(el => el.classList.remove("active"));
-                            link.classList.add("active");
-
-                            return false;
-                        };
-
-                        return link;
-                    });
-
-                packageInfoLogsVersions.replaceChildren(...selectors);
-                selectors.find(Boolean)?.click();
+                const logs = data.map(log_record => {
+                    return `[${new Date(1000 * log_record.created).toISOString()}] ${log_record.message}`;
+                });
+                packageInfoLogsInput.textContent = logs.join("\n");
+                highlight(packageInfoLogsInput);
             },
             onFailure,
         );
     }
 
     function loadPackage(packageBase, onFailure) {
+        const headerClass = status => {
+            if (status === "pending") return ["bg-warning"];
+            if (status === "building") return ["bg-warning"];
+            if (status === "failed") return ["bg-danger", "text-white"];
+            if (status === "success") return ["bg-success", "text-white"];
+            return ["bg-secondary", "text-white"];
+        };
+
         makeRequest(
             `/api/v1/packages/${packageBase}`,
             {
@@ -409,7 +367,7 @@
 
     function packageInfoUpdate() {
         const packageBase = packageInfoModal.package;
-        packagesAdd(packageBase, [], repository, {refresh: packageInfoRefreshInput.checked});
+        packagesAdd(packageBase, [], repository);
     }
 
     function showPackageInfo(packageBase) {

package/share/ahriman/templates/build-status/table.jinja2

@@ -7,7 +7,7 @@
     // so far bootstrap-table only operates with jquery elements
     const table = $(document.getElementById("packages"));
 
-    const dashboardButton = document.getElementById("dashboard-button");
+    const statusBadge = document.getElementById("badge-status");
     const versionBadge = document.getElementById("badge-version");
 
     function doPackageAction(uri, packages, repository, successText, failureText, data) {
@@ -73,19 +73,6 @@
         doPackageAction(url, currentSelection, repository, onSuccess, onFailure);
     }
 
-    function refreshDatabases() {
-        const onSuccess = _ => "Pacman database update has been requested";
-        const onFailure = error => `Could not update pacman databases: ${error}`;
-        const parameters = {
-            refresh: true,
-            aur: false,
-            local: false,
-            manual: false,
-        };
-
-        doPackageAction("/api/v1/service/update", [], repository, onSuccess, onFailure, parameters);
-    }
-
     function reload() {
         table.bootstrapTable("showLoading");
 
@@ -154,62 +141,14 @@
             data => {
                 versionBadge.innerHTML = `<i class="bi bi-github"></i> ahriman ${safe(data.version)}`;
 
-                dashboardButton.classList.remove(...dashboardButton.classList);
-                dashboardButton.classList.add("btn");
-                dashboardButton.classList.add(badgeClass(data.status.status));
+                statusBadge.classList.remove(...statusBadge.classList);
+                statusBadge.classList.add("btn");
+                statusBadge.classList.add(badgeClass(data.status.status));
 
-                dashboardModalHeader.classList.remove(...dashboardModalHeader.classList);
-                dashboardModalHeader.classList.add("modal-header");
-                headerClass(data.status.status).forEach(clz => dashboardModalHeader.classList.add(clz));
-
-                dashboardName.textContent = data.repository;
-                dashboardArchitecture.textContent = data.architecture;
-                dashboardStatus.textContent = data.status.status;
-                dashboardStatusTimestamp.textContent = new Date(1000 * data.status.timestamp).toISOStringShort();
-
-                if (dashboardPackagesStatusesChart) {
-                    const labels = [
-                        "unknown",
-                        "pending",
-                        "building",
-                        "failed",
-                        "success",
-                    ];
-                    dashboardPackagesStatusesChart.config.data = {
-                        labels: labels,
-                        datasets: [{
-                            label: "packages in status",
-                            data: labels.map(label => data.packages[label]),
-                            backgroundColor: [
-                                "rgb(55, 58, 60)",
-                                "rgb(255, 117, 24)",
-                                "rgb(255, 117, 24)",
-                                "rgb(255, 0, 57)",
-                                "rgb(63, 182, 24)",  // copy-paste from current style
-                            ],
-                        }],
-                    };
-                    dashboardPackagesStatusesChart.update();
-                }
-
-                if (dashboardPackagesCountChart) {
-                    dashboardPackagesCountChart.config.data = {
-                        labels: ["packages"],
-                        datasets: [
-                            {
-                                label: "archives",
-                                data: [data.stats.packages],
-                            },
-                            {
-                                label: "bases",
-                                data: [data.stats.bases],
-                            },
-                        ],
-                    };
-                    dashboardPackagesCountChart.update();
-                }
-
-                dashboardCanvas.hidden = data.status.total > 0;
+                const popover = bootstrap.Popover.getOrCreateInstance(statusBadge);
+                popover.dispose();
+                statusBadge.dataset.bsContent = `${data.status.status} at ${new Date(1000 * data.status.timestamp).toISOStringShort()}`;
+                bootstrap.Popover.getOrCreateInstance(statusBadge);
             },
         );
     }
@@ -288,6 +227,7 @@
             });
         });
 
+        bootstrap.Popover.getOrCreateInstance(statusBadge);
         selectRepository();
     });
 </script>

package/share/ahriman/templates/utils/bootstrap-scripts.jinja2

@@ -58,14 +58,6 @@
         return value.includes(dataList[index].toLowerCase());
     }
 
-    function headerClass(status) {
-        if (status === "pending") return ["bg-warning"];
-        if (status === "building") return ["bg-warning"];
-        if (status === "failed") return ["bg-danger", "text-white"];
-        if (status === "success") return ["bg-success", "text-white"];
-        return ["bg-secondary", "text-white"];
-    }
-
     function listToTable(data) {
         return Array.from(new Set(data))
             .sort()

package/share/bash-completion/completions/_ahriman

@@ -1,117 +1,115 @@
 # AUTOMATICALLY GENERATED by `shtab`
 
-_shtab_ahriman_subparsers=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-changes' 'package-changes-remove' 'package-copy' 'package-remove' 'package-status' 'package-status-remove' 'package-status-update' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web')
+_shtab_ahriman_subparsers=('aur-search' 'search' 'help-commands-unsafe' 'help' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-changes' 'package-changes-remove' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-repositories' 'service-run' 'run' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'service-tree-migrate' 'user-add' 'user-list' 'user-remove' 'web')
 
 _shtab_ahriman_option_strings=('-h' '--help' '-a' '--architecture' '-c' '--configuration' '--force' '-l' '--lock' '--log-handler' '-q' '--quiet' '--report' '--no-report' '-r' '--repository' '--unsafe' '-V' '--version' '--wait-timeout')
-_shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
 _shtab_ahriman_aur_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
-_shtab_ahriman_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
-_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
-_shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
-_shtab_ahriman_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
-_shtab_ahriman_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_help_option_strings=('-h' '--help')
+_shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
 _shtab_ahriman_help_commands_unsafe_option_strings=('-h' '--help')
+_shtab_ahriman_help_option_strings=('-h' '--help')
 _shtab_ahriman_help_updates_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_help_version_option_strings=('-h' '--help')
-_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_version_option_strings=('-h' '--help')
 _shtab_ahriman_package_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
+_shtab_ahriman_add_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
+_shtab_ahriman_package_update_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
 _shtab_ahriman_package_changes_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_package_changes_remove_option_strings=('-h' '--help')
-_shtab_ahriman_package_copy_option_strings=('-h' '--help' '-e' '--exit-code' '--remove')
 _shtab_ahriman_package_remove_option_strings=('-h' '--help')
+_shtab_ahriman_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
+_shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
 _shtab_ahriman_package_status_remove_option_strings=('-h' '--help')
 _shtab_ahriman_package_status_update_option_strings=('-h' '--help' '-s' '--status')
-_shtab_ahriman_package_update_option_strings=('-h' '--help' '--changes' '--no-changes' '--dependencies' '--no-dependencies' '-e' '--exit-code' '--increment' '--no-increment' '-n' '--now' '-y' '--refresh' '-s' '--source' '-u' '--username' '-v' '--variable')
+_shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')
 _shtab_ahriman_patch_add_option_strings=('-h' '--help')
 _shtab_ahriman_patch_list_option_strings=('-h' '--help' '-e' '--exit-code' '-v' '--variable')
 _shtab_ahriman_patch_remove_option_strings=('-h' '--help' '-v' '--variable')
 _shtab_ahriman_patch_set_add_option_strings=('-h' '--help' '-t' '--track')
-_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
-_shtab_ahriman_remove_option_strings=('-h' '--help')
-_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
 _shtab_ahriman_repo_backup_option_strings=('-h' '--help')
 _shtab_ahriman_repo_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
-_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
-_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_check_option_strings=('-h' '--help' '--changes' '--no-changes' '--check-files' '--no-check-files' '-e' '--exit-code' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_repo_create_keyring_option_strings=('-h' '--help')
 _shtab_ahriman_repo_create_mirrorlist_option_strings=('-h' '--help')
 _shtab_ahriman_repo_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_daemon_option_strings=('-h' '--help' '-i' '--interval' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '--partitions' '--no-partitions' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_repo_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
+_shtab_ahriman_rebuild_option_strings=('-h' '--help' '--depends-on' '--dry-run' '--from-database' '--increment' '--no-increment' '-e' '--exit-code' '-s' '--status' '-u' '--username')
 _shtab_ahriman_repo_remove_unknown_option_strings=('-h' '--help' '--dry-run')
+_shtab_ahriman_remove_unknown_option_strings=('-h' '--help' '--dry-run')
 _shtab_ahriman_repo_report_option_strings=('-h' '--help')
+_shtab_ahriman_report_option_strings=('-h' '--help')
 _shtab_ahriman_repo_restore_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
 _shtab_ahriman_repo_sign_option_strings=('-h' '--help')
+_shtab_ahriman_sign_option_strings=('-h' '--help')
 _shtab_ahriman_repo_statistics_option_strings=('-h' '--help' '--chart' '-e' '--event' '--from-date' '--limit' '--offset' '--to-date')
 _shtab_ahriman_repo_status_update_option_strings=('-h' '--help' '-s' '--status')
 _shtab_ahriman_repo_sync_option_strings=('-h' '--help')
+_shtab_ahriman_sync_option_strings=('-h' '--help')
 _shtab_ahriman_repo_tree_option_strings=('-h' '--help' '-p' '--partitions')
 _shtab_ahriman_repo_triggers_option_strings=('-h' '--help')
 _shtab_ahriman_repo_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
-_shtab_ahriman_report_option_strings=('-h' '--help')
-_shtab_ahriman_run_option_strings=('-h' '--help')
-_shtab_ahriman_search_option_strings=('-h' '--help' '-e' '--exit-code' '--info' '--no-info' '--sort-by')
+_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
 _shtab_ahriman_service_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
+_shtab_ahriman_repo_clean_option_strings=('-h' '--help' '--cache' '--no-cache' '--chroot' '--no-chroot' '--manual' '--no-manual' '--packages' '--no-packages' '--pacman' '--no-pacman')
 _shtab_ahriman_service_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
+_shtab_ahriman_repo_config_option_strings=('-h' '--help' '--info' '--no-info' '--secure' '--no-secure')
 _shtab_ahriman_service_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
+_shtab_ahriman_repo_config_validate_option_strings=('-h' '--help' '-e' '--exit-code')
 _shtab_ahriman_service_key_import_option_strings=('-h' '--help' '--key-server')
+_shtab_ahriman_key_import_option_strings=('-h' '--help' '--key-server')
 _shtab_ahriman_service_repositories_option_strings=('-h' '--help' '--id-only' '--no-id-only')
 _shtab_ahriman_service_run_option_strings=('-h' '--help')
+_shtab_ahriman_run_option_strings=('-h' '--help')
 _shtab_ahriman_service_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_service_shell_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
+_shtab_ahriman_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_init_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
+_shtab_ahriman_repo_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
 _shtab_ahriman_setup_option_strings=('-h' '--help' '--build-as-user' '--from-configuration' '--generate-salt' '--no-generate-salt' '--makeflags-jobs' '--no-makeflags-jobs' '--mirror' '--multilib' '--no-multilib' '--packager' '--server' '--sign-key' '--sign-target' '--web-port' '--web-unix-socket')
-_shtab_ahriman_shell_option_strings=('-h' '--help' '-o' '--output')
-_shtab_ahriman_sign_option_strings=('-h' '--help')
-_shtab_ahriman_status_option_strings=('-h' '--help' '--ahriman' '-e' '--exit-code' '--info' '--no-info' '-s' '--status')
-_shtab_ahriman_status_update_option_strings=('-h' '--help' '-s' '--status')
-_shtab_ahriman_sync_option_strings=('-h' '--help')
-_shtab_ahriman_update_option_strings=('-h' '--help' '--aur' '--no-aur' '--changes' '--no-changes' '--check-files' '--no-check-files' '--dependencies' '--no-dependencies' '--dry-run' '-e' '--exit-code' '--increment' '--no-increment' '--local' '--no-local' '--manual' '--no-manual' '-u' '--username' '--vcs' '--no-vcs' '-y' '--refresh')
+_shtab_ahriman_service_shell_option_strings=('-h' '--help')
+_shtab_ahriman_shell_option_strings=('-h' '--help')
+_shtab_ahriman_service_tree_migrate_option_strings=('-h' '--help')
 _shtab_ahriman_user_add_option_strings=('-h' '--help' '--key' '--packager' '-p' '--password' '-R' '--role')
 _shtab_ahriman_user_list_option_strings=('-h' '--help' '-e' '--exit-code' '-R' '--role')
 _shtab_ahriman_user_remove_option_strings=('-h' '--help')
-_shtab_ahriman_version_option_strings=('-h' '--help')
 _shtab_ahriman_web_option_strings=('-h' '--help')
 
 
 
-_shtab_ahriman_pos_0_choices=('add' 'aur-search' 'check' 'clean' 'config' 'config-validate' 'copy' 'daemon' 'help' 'help-commands-unsafe' 'help-updates' 'help-version' 'init' 'key-import' 'package-add' 'package-changes' 'package-changes-remove' 'package-copy' 'package-remove' 'package-status' 'package-status-remove' 'package-status-update' 'package-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'rebuild' 'remove' 'remove-unknown' 'repo-backup' 'repo-check' 'repo-clean' 'repo-config' 'repo-config-validate' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'repo-init' 'repo-rebuild' 'repo-remove-unknown' 'repo-report' 'repo-restore' 'repo-setup' 'repo-sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'repo-tree' 'repo-triggers' 'repo-update' 'report' 'run' 'search' 'service-clean' 'service-config' 'service-config-validate' 'service-key-import' 'service-repositories' 'service-run' 'service-setup' 'service-shell' 'service-tree-migrate' 'setup' 'shell' 'sign' 'status' 'status-update' 'sync' 'update' 'user-add' 'user-list' 'user-remove' 'version' 'web')
+_shtab_ahriman_pos_0_choices=('aur-search' 'search' 'help-commands-unsafe' 'help' 'help-updates' 'help-version' 'version' 'package-add' 'add' 'package-update' 'package-changes' 'package-changes-remove' 'package-remove' 'remove' 'package-status' 'status' 'package-status-remove' 'package-status-update' 'status-update' 'patch-add' 'patch-list' 'patch-remove' 'patch-set-add' 'repo-backup' 'repo-check' 'check' 'repo-create-keyring' 'repo-create-mirrorlist' 'repo-daemon' 'daemon' 'repo-rebuild' 'rebuild' 'repo-remove-unknown' 'remove-unknown' 'repo-report' 'report' 'repo-restore' 'repo-sign' 'sign' 'repo-statistics' 'repo-status-update' 'repo-sync' 'sync' 'repo-tree' 'repo-triggers' 'repo-update' 'update' 'service-clean' 'clean' 'repo-clean' 'service-config' 'config' 'repo-config' 'service-config-validate' 'config-validate' 'repo-config-validate' 'service-key-import' 'key-import' 'service-repositories' 'service-run' 'run' 'service-setup' 'init' 'repo-init' 'repo-setup' 'setup' 'service-shell' 'shell' 'service-tree-migrate' 'user-add' 'user-list' 'user-remove' 'web')
 _shtab_ahriman___log_handler_choices=('console' 'syslog' 'journald')
-_shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_aur_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
-_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
 _shtab_ahriman_package_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_package_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_add__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
+_shtab_ahriman_add___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_package_update__s_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
 _shtab_ahriman_package_update___source_choices=('auto' 'archive' 'aur' 'directory' 'local' 'remote' 'repository')
-_shtab_ahriman_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_package_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_package_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_rebuild__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
+_shtab_ahriman_rebuild___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_statistics__e_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
 _shtab_ahriman_repo_statistics___event_choices=('package-outdated' 'package-removed' 'package-update-failed' 'package-updated')
 _shtab_ahriman_repo_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_repo_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_search___sort_by_choices=('description' 'first_submitted' 'id' 'last_modified' 'maintainer' 'name' 'num_votes' 'out_of_date' 'package_base' 'package_base_id' 'popularity' 'repository' 'submitter' 'url' 'url_path' 'version')
 _shtab_ahriman_service_setup___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_init___sign_target_choices=('disabled' 'packages' 'repository')
+_shtab_ahriman_repo_setup___sign_target_choices=('disabled' 'packages' 'repository')
 _shtab_ahriman_setup___sign_target_choices=('disabled' 'packages' 'repository')
-_shtab_ahriman_status__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_status___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_status_update__s_choices=('unknown' 'pending' 'building' 'failed' 'success')
-_shtab_ahriman_status_update___status_choices=('unknown' 'pending' 'building' 'failed' 'success')
 _shtab_ahriman_user_add__R_choices=('unauthorized' 'read' 'reporter' 'full')
 _shtab_ahriman_user_add___role_choices=('unauthorized' 'read' 'reporter' 'full')
 _shtab_ahriman_user_list__R_choices=('unauthorized' 'read' 'reporter' 'full')
@@ -128,21 +126,6 @@ _shtab_ahriman___no_report_nargs=0
 _shtab_ahriman___unsafe_nargs=0
 _shtab_ahriman__V_nargs=0
 _shtab_ahriman___version_nargs=0
-_shtab_ahriman_add_pos_0_nargs=+
-_shtab_ahriman_add__h_nargs=0
-_shtab_ahriman_add___help_nargs=0
-_shtab_ahriman_add___changes_nargs=0
-_shtab_ahriman_add___no_changes_nargs=0
-_shtab_ahriman_add___dependencies_nargs=0
-_shtab_ahriman_add___no_dependencies_nargs=0
-_shtab_ahriman_add__e_nargs=0
-_shtab_ahriman_add___exit_code_nargs=0
-_shtab_ahriman_add___increment_nargs=0
-_shtab_ahriman_add___no_increment_nargs=0
-_shtab_ahriman_add__n_nargs=0
-_shtab_ahriman_add___now_nargs=0
-_shtab_ahriman_add__y_nargs=0
-_shtab_ahriman_add___refresh_nargs=0
 _shtab_ahriman_aur_search_pos_0_nargs=+
 _shtab_ahriman_aur_search__h_nargs=0
 _shtab_ahriman_aur_search___help_nargs=0
@@ -150,91 +133,26 @@ _shtab_ahriman_aur_search__e_nargs=0
 _shtab_ahriman_aur_search___exit_code_nargs=0
 _shtab_ahriman_aur_search___info_nargs=0
 _shtab_ahriman_aur_search___no_info_nargs=0
-_shtab_ahriman_check_pos_0_nargs=*
-_shtab_ahriman_check__h_nargs=0
-_shtab_ahriman_check___help_nargs=0
-_shtab_ahriman_check___changes_nargs=0
-_shtab_ahriman_check___no_changes_nargs=0
-_shtab_ahriman_check___check_files_nargs=0
-_shtab_ahriman_check___no_check_files_nargs=0
-_shtab_ahriman_check__e_nargs=0
-_shtab_ahriman_check___exit_code_nargs=0
-_shtab_ahriman_check___vcs_nargs=0
-_shtab_ahriman_check___no_vcs_nargs=0
-_shtab_ahriman_check__y_nargs=0
-_shtab_ahriman_check___refresh_nargs=0
-_shtab_ahriman_clean__h_nargs=0
-_shtab_ahriman_clean___help_nargs=0
-_shtab_ahriman_clean___cache_nargs=0
-_shtab_ahriman_clean___no_cache_nargs=0
-_shtab_ahriman_clean___chroot_nargs=0
-_shtab_ahriman_clean___no_chroot_nargs=0
-_shtab_ahriman_clean___manual_nargs=0
-_shtab_ahriman_clean___no_manual_nargs=0
-_shtab_ahriman_clean___packages_nargs=0
-_shtab_ahriman_clean___no_packages_nargs=0
-_shtab_ahriman_clean___pacman_nargs=0
-_shtab_ahriman_clean___no_pacman_nargs=0
-_shtab_ahriman_config__h_nargs=0
-_shtab_ahriman_config___help_nargs=0
-_shtab_ahriman_config___info_nargs=0
-_shtab_ahriman_config___no_info_nargs=0
-_shtab_ahriman_config___secure_nargs=0
-_shtab_ahriman_config___no_secure_nargs=0
-_shtab_ahriman_config_validate__h_nargs=0
-_shtab_ahriman_config_validate___help_nargs=0
-_shtab_ahriman_config_validate__e_nargs=0
-_shtab_ahriman_config_validate___exit_code_nargs=0
-_shtab_ahriman_copy_pos_1_nargs=+
-_shtab_ahriman_copy__h_nargs=0
-_shtab_ahriman_copy___help_nargs=0
-_shtab_ahriman_copy__e_nargs=0
-_shtab_ahriman_copy___exit_code_nargs=0
-_shtab_ahriman_copy___remove_nargs=0
-_shtab_ahriman_daemon__h_nargs=0
-_shtab_ahriman_daemon___help_nargs=0
-_shtab_ahriman_daemon___aur_nargs=0
-_shtab_ahriman_daemon___no_aur_nargs=0
-_shtab_ahriman_daemon___changes_nargs=0
-_shtab_ahriman_daemon___no_changes_nargs=0
-_shtab_ahriman_daemon___check_files_nargs=0
-_shtab_ahriman_daemon___no_check_files_nargs=0
-_shtab_ahriman_daemon___dependencies_nargs=0
-_shtab_ahriman_daemon___no_dependencies_nargs=0
-_shtab_ahriman_daemon___dry_run_nargs=0
-_shtab_ahriman_daemon___increment_nargs=0
-_shtab_ahriman_daemon___no_increment_nargs=0
-_shtab_ahriman_daemon___local_nargs=0
-_shtab_ahriman_daemon___no_local_nargs=0
-_shtab_ahriman_daemon___manual_nargs=0
-_shtab_ahriman_daemon___no_manual_nargs=0
-_shtab_ahriman_daemon___partitions_nargs=0
-_shtab_ahriman_daemon___no_partitions_nargs=0
-_shtab_ahriman_daemon___vcs_nargs=0
-_shtab_ahriman_daemon___no_vcs_nargs=0
-_shtab_ahriman_daemon__y_nargs=0
-_shtab_ahriman_daemon___refresh_nargs=0
-_shtab_ahriman_help__h_nargs=0
-_shtab_ahriman_help___help_nargs=0
+_shtab_ahriman_search_pos_0_nargs=+
+_shtab_ahriman_search__h_nargs=0
+_shtab_ahriman_search___help_nargs=0
+_shtab_ahriman_search__e_nargs=0
+_shtab_ahriman_search___exit_code_nargs=0
+_shtab_ahriman_search___info_nargs=0
+_shtab_ahriman_search___no_info_nargs=0
 _shtab_ahriman_help_commands_unsafe_pos_0_nargs=*
 _shtab_ahriman_help_commands_unsafe__h_nargs=0
 _shtab_ahriman_help_commands_unsafe___help_nargs=0
+_shtab_ahriman_help__h_nargs=0
+_shtab_ahriman_help___help_nargs=0
 _shtab_ahriman_help_updates__h_nargs=0
 _shtab_ahriman_help_updates___help_nargs=0
 _shtab_ahriman_help_updates__e_nargs=0
 _shtab_ahriman_help_updates___exit_code_nargs=0
 _shtab_ahriman_help_version__h_nargs=0
 _shtab_ahriman_help_version___help_nargs=0
-_shtab_ahriman_init__h_nargs=0
-_shtab_ahriman_init___help_nargs=0
-_shtab_ahriman_init___generate_salt_nargs=0
-_shtab_ahriman_init___no_generate_salt_nargs=0
-_shtab_ahriman_init___makeflags_jobs_nargs=0
-_shtab_ahriman_init___no_makeflags_jobs_nargs=0
-_shtab_ahriman_init___multilib_nargs=0
-_shtab_ahriman_init___no_multilib_nargs=0
-_shtab_ahriman_key_import__h_nargs=0
-_shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_version__h_nargs=0
+_shtab_ahriman_version___help_nargs=0
 _shtab_ahriman_package_add_pos_0_nargs=+
 _shtab_ahriman_package_add__h_nargs=0
 _shtab_ahriman_package_add___help_nargs=0
@@ -250,35 +168,21 @@ _shtab_ahriman_package_add__n_nargs=0
 _shtab_ahriman_package_add___now_nargs=0
 _shtab_ahriman_package_add__y_nargs=0
 _shtab_ahriman_package_add___refresh_nargs=0
-_shtab_ahriman_package_changes__h_nargs=0
-_shtab_ahriman_package_changes___help_nargs=0
-_shtab_ahriman_package_changes__e_nargs=0
-_shtab_ahriman_package_changes___exit_code_nargs=0
-_shtab_ahriman_package_changes_remove__h_nargs=0
-_shtab_ahriman_package_changes_remove___help_nargs=0
-_shtab_ahriman_package_copy_pos_1_nargs=+
-_shtab_ahriman_package_copy__h_nargs=0
-_shtab_ahriman_package_copy___help_nargs=0
-_shtab_ahriman_package_copy__e_nargs=0
-_shtab_ahriman_package_copy___exit_code_nargs=0
-_shtab_ahriman_package_copy___remove_nargs=0
-_shtab_ahriman_package_remove_pos_0_nargs=+
-_shtab_ahriman_package_remove__h_nargs=0
-_shtab_ahriman_package_remove___help_nargs=0
-_shtab_ahriman_package_status_pos_0_nargs=*
-_shtab_ahriman_package_status__h_nargs=0
-_shtab_ahriman_package_status___help_nargs=0
-_shtab_ahriman_package_status___ahriman_nargs=0
-_shtab_ahriman_package_status__e_nargs=0
-_shtab_ahriman_package_status___exit_code_nargs=0
-_shtab_ahriman_package_status___info_nargs=0
-_shtab_ahriman_package_status___no_info_nargs=0
-_shtab_ahriman_package_status_remove_pos_0_nargs=+
-_shtab_ahriman_package_status_remove__h_nargs=0
-_shtab_ahriman_package_status_remove___help_nargs=0
-_shtab_ahriman_package_status_update_pos_0_nargs=*
-_shtab_ahriman_package_status_update__h_nargs=0
-_shtab_ahriman_package_status_update___help_nargs=0
+_shtab_ahriman_add_pos_0_nargs=+
+_shtab_ahriman_add__h_nargs=0
+_shtab_ahriman_add___help_nargs=0
+_shtab_ahriman_add___changes_nargs=0
+_shtab_ahriman_add___no_changes_nargs=0
+_shtab_ahriman_add___dependencies_nargs=0
+_shtab_ahriman_add___no_dependencies_nargs=0
+_shtab_ahriman_add__e_nargs=0
+_shtab_ahriman_add___exit_code_nargs=0
+_shtab_ahriman_add___increment_nargs=0
+_shtab_ahriman_add___no_increment_nargs=0
+_shtab_ahriman_add__n_nargs=0
+_shtab_ahriman_add___now_nargs=0
+_shtab_ahriman_add__y_nargs=0
+_shtab_ahriman_add___refresh_nargs=0
 _shtab_ahriman_package_update_pos_0_nargs=+
 _shtab_ahriman_package_update__h_nargs=0
 _shtab_ahriman_package_update___help_nargs=0
@@ -294,6 +198,43 @@ _shtab_ahriman_package_update__n_nargs=0
 _shtab_ahriman_package_update___now_nargs=0
 _shtab_ahriman_package_update__y_nargs=0
 _shtab_ahriman_package_update___refresh_nargs=0
+_shtab_ahriman_package_changes__h_nargs=0
+_shtab_ahriman_package_changes___help_nargs=0
+_shtab_ahriman_package_changes__e_nargs=0
+_shtab_ahriman_package_changes___exit_code_nargs=0
+_shtab_ahriman_package_changes_remove__h_nargs=0
+_shtab_ahriman_package_changes_remove___help_nargs=0
+_shtab_ahriman_package_remove_pos_0_nargs=+
+_shtab_ahriman_package_remove__h_nargs=0
+_shtab_ahriman_package_remove___help_nargs=0
+_shtab_ahriman_remove_pos_0_nargs=+
+_shtab_ahriman_remove__h_nargs=0
+_shtab_ahriman_remove___help_nargs=0
+_shtab_ahriman_package_status_pos_0_nargs=*
+_shtab_ahriman_package_status__h_nargs=0
+_shtab_ahriman_package_status___help_nargs=0
+_shtab_ahriman_package_status___ahriman_nargs=0
+_shtab_ahriman_package_status__e_nargs=0
+_shtab_ahriman_package_status___exit_code_nargs=0
+_shtab_ahriman_package_status___info_nargs=0
+_shtab_ahriman_package_status___no_info_nargs=0
+_shtab_ahriman_status_pos_0_nargs=*
+_shtab_ahriman_status__h_nargs=0
+_shtab_ahriman_status___help_nargs=0
+_shtab_ahriman_status___ahriman_nargs=0
+_shtab_ahriman_status__e_nargs=0
+_shtab_ahriman_status___exit_code_nargs=0
+_shtab_ahriman_status___info_nargs=0
+_shtab_ahriman_status___no_info_nargs=0
+_shtab_ahriman_package_status_remove_pos_0_nargs=+
+_shtab_ahriman_package_status_remove__h_nargs=0
+_shtab_ahriman_package_status_remove___help_nargs=0
+_shtab_ahriman_package_status_update_pos_0_nargs=*
+_shtab_ahriman_package_status_update__h_nargs=0
+_shtab_ahriman_package_status_update___help_nargs=0
+_shtab_ahriman_status_update_pos_0_nargs=*
+_shtab_ahriman_status_update__h_nargs=0
+_shtab_ahriman_status_update___help_nargs=0
 _shtab_ahriman_patch_add__h_nargs=0
 _shtab_ahriman_patch_add___help_nargs=0
 _shtab_ahriman_patch_list__h_nargs=0
@@ -304,20 +245,6 @@ _shtab_ahriman_patch_remove__h_nargs=0
 _shtab_ahriman_patch_remove___help_nargs=0
 _shtab_ahriman_patch_set_add__h_nargs=0
 _shtab_ahriman_patch_set_add___help_nargs=0
-_shtab_ahriman_rebuild__h_nargs=0
-_shtab_ahriman_rebuild___help_nargs=0
-_shtab_ahriman_rebuild___dry_run_nargs=0
-_shtab_ahriman_rebuild___from_database_nargs=0
-_shtab_ahriman_rebuild___increment_nargs=0
-_shtab_ahriman_rebuild___no_increment_nargs=0
-_shtab_ahriman_rebuild__e_nargs=0
-_shtab_ahriman_rebuild___exit_code_nargs=0
-_shtab_ahriman_remove_pos_0_nargs=+
-_shtab_ahriman_remove__h_nargs=0
-_shtab_ahriman_remove___help_nargs=0
-_shtab_ahriman_remove_unknown__h_nargs=0
-_shtab_ahriman_remove_unknown___help_nargs=0
-_shtab_ahriman_remove_unknown___dry_run_nargs=0
 _shtab_ahriman_repo_backup__h_nargs=0
 _shtab_ahriman_repo_backup___help_nargs=0
 _shtab_ahriman_repo_check_pos_0_nargs=*
@@ -333,28 +260,19 @@ _shtab_ahriman_repo_check___vcs_nargs=0
 _shtab_ahriman_repo_check___no_vcs_nargs=0
 _shtab_ahriman_repo_check__y_nargs=0
 _shtab_ahriman_repo_check___refresh_nargs=0
-_shtab_ahriman_repo_clean__h_nargs=0
-_shtab_ahriman_repo_clean___help_nargs=0
-_shtab_ahriman_repo_clean___cache_nargs=0
-_shtab_ahriman_repo_clean___no_cache_nargs=0
-_shtab_ahriman_repo_clean___chroot_nargs=0
-_shtab_ahriman_repo_clean___no_chroot_nargs=0
-_shtab_ahriman_repo_clean___manual_nargs=0
-_shtab_ahriman_repo_clean___no_manual_nargs=0
-_shtab_ahriman_repo_clean___packages_nargs=0
-_shtab_ahriman_repo_clean___no_packages_nargs=0
-_shtab_ahriman_repo_clean___pacman_nargs=0
-_shtab_ahriman_repo_clean___no_pacman_nargs=0
-_shtab_ahriman_repo_config__h_nargs=0
-_shtab_ahriman_repo_config___help_nargs=0
-_shtab_ahriman_repo_config___info_nargs=0
-_shtab_ahriman_repo_config___no_info_nargs=0
-_shtab_ahriman_repo_config___secure_nargs=0
-_shtab_ahriman_repo_config___no_secure_nargs=0
-_shtab_ahriman_repo_config_validate__h_nargs=0
-_shtab_ahriman_repo_config_validate___help_nargs=0
-_shtab_ahriman_repo_config_validate__e_nargs=0
-_shtab_ahriman_repo_config_validate___exit_code_nargs=0
+_shtab_ahriman_check_pos_0_nargs=*
+_shtab_ahriman_check__h_nargs=0
+_shtab_ahriman_check___help_nargs=0
+_shtab_ahriman_check___changes_nargs=0
+_shtab_ahriman_check___no_changes_nargs=0
+_shtab_ahriman_check___check_files_nargs=0
+_shtab_ahriman_check___no_check_files_nargs=0
+_shtab_ahriman_check__e_nargs=0
+_shtab_ahriman_check___exit_code_nargs=0
+_shtab_ahriman_check___vcs_nargs=0
+_shtab_ahriman_check___no_vcs_nargs=0
+_shtab_ahriman_check__y_nargs=0
+_shtab_ahriman_check___refresh_nargs=0
 _shtab_ahriman_repo_create_keyring__h_nargs=0
 _shtab_ahriman_repo_create_keyring___help_nargs=0
 _shtab_ahriman_repo_create_mirrorlist__h_nargs=0
@@ -382,14 +300,29 @@ _shtab_ahriman_repo_daemon___vcs_nargs=0
 _shtab_ahriman_repo_daemon___no_vcs_nargs=0
 _shtab_ahriman_repo_daemon__y_nargs=0
 _shtab_ahriman_repo_daemon___refresh_nargs=0
-_shtab_ahriman_repo_init__h_nargs=0
-_shtab_ahriman_repo_init___help_nargs=0
-_shtab_ahriman_repo_init___generate_salt_nargs=0
-_shtab_ahriman_repo_init___no_generate_salt_nargs=0
-_shtab_ahriman_repo_init___makeflags_jobs_nargs=0
-_shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0
-_shtab_ahriman_repo_init___multilib_nargs=0
-_shtab_ahriman_repo_init___no_multilib_nargs=0
+_shtab_ahriman_daemon__h_nargs=0
+_shtab_ahriman_daemon___help_nargs=0
+_shtab_ahriman_daemon___aur_nargs=0
+_shtab_ahriman_daemon___no_aur_nargs=0
+_shtab_ahriman_daemon___changes_nargs=0
+_shtab_ahriman_daemon___no_changes_nargs=0
+_shtab_ahriman_daemon___check_files_nargs=0
+_shtab_ahriman_daemon___no_check_files_nargs=0
+_shtab_ahriman_daemon___dependencies_nargs=0
+_shtab_ahriman_daemon___no_dependencies_nargs=0
+_shtab_ahriman_daemon___dry_run_nargs=0
+_shtab_ahriman_daemon___increment_nargs=0
+_shtab_ahriman_daemon___no_increment_nargs=0
+_shtab_ahriman_daemon___local_nargs=0
+_shtab_ahriman_daemon___no_local_nargs=0
+_shtab_ahriman_daemon___manual_nargs=0
+_shtab_ahriman_daemon___no_manual_nargs=0
+_shtab_ahriman_daemon___partitions_nargs=0
+_shtab_ahriman_daemon___no_partitions_nargs=0
+_shtab_ahriman_daemon___vcs_nargs=0
+_shtab_ahriman_daemon___no_vcs_nargs=0
+_shtab_ahriman_daemon__y_nargs=0
+_shtab_ahriman_daemon___refresh_nargs=0
 _shtab_ahriman_repo_rebuild__h_nargs=0
 _shtab_ahriman_repo_rebuild___help_nargs=0
 _shtab_ahriman_repo_rebuild___dry_run_nargs=0
@@ -398,30 +331,40 @@ _shtab_ahriman_repo_rebuild___increment_nargs=0
 _shtab_ahriman_repo_rebuild___no_increment_nargs=0
 _shtab_ahriman_repo_rebuild__e_nargs=0
 _shtab_ahriman_repo_rebuild___exit_code_nargs=0
+_shtab_ahriman_rebuild__h_nargs=0
+_shtab_ahriman_rebuild___help_nargs=0
+_shtab_ahriman_rebuild___dry_run_nargs=0
+_shtab_ahriman_rebuild___from_database_nargs=0
+_shtab_ahriman_rebuild___increment_nargs=0
+_shtab_ahriman_rebuild___no_increment_nargs=0
+_shtab_ahriman_rebuild__e_nargs=0
+_shtab_ahriman_rebuild___exit_code_nargs=0
 _shtab_ahriman_repo_remove_unknown__h_nargs=0
 _shtab_ahriman_repo_remove_unknown___help_nargs=0
 _shtab_ahriman_repo_remove_unknown___dry_run_nargs=0
+_shtab_ahriman_remove_unknown__h_nargs=0
+_shtab_ahriman_remove_unknown___help_nargs=0
+_shtab_ahriman_remove_unknown___dry_run_nargs=0
 _shtab_ahriman_repo_report__h_nargs=0
 _shtab_ahriman_repo_report___help_nargs=0
+_shtab_ahriman_report__h_nargs=0
+_shtab_ahriman_report___help_nargs=0
 _shtab_ahriman_repo_restore__h_nargs=0
 _shtab_ahriman_repo_restore___help_nargs=0
-_shtab_ahriman_repo_setup__h_nargs=0
-_shtab_ahriman_repo_setup___help_nargs=0
-_shtab_ahriman_repo_setup___generate_salt_nargs=0
-_shtab_ahriman_repo_setup___no_generate_salt_nargs=0
-_shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
-_shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
-_shtab_ahriman_repo_setup___multilib_nargs=0
-_shtab_ahriman_repo_setup___no_multilib_nargs=0
 _shtab_ahriman_repo_sign_pos_0_nargs=*
 _shtab_ahriman_repo_sign__h_nargs=0
 _shtab_ahriman_repo_sign___help_nargs=0
+_shtab_ahriman_sign_pos_0_nargs=*
+_shtab_ahriman_sign__h_nargs=0
+_shtab_ahriman_sign___help_nargs=0
 _shtab_ahriman_repo_statistics__h_nargs=0
 _shtab_ahriman_repo_statistics___help_nargs=0
 _shtab_ahriman_repo_status_update__h_nargs=0
 _shtab_ahriman_repo_status_update___help_nargs=0
 _shtab_ahriman_repo_sync__h_nargs=0
 _shtab_ahriman_repo_sync___help_nargs=0
+_shtab_ahriman_sync__h_nargs=0
+_shtab_ahriman_sync___help_nargs=0
 _shtab_ahriman_repo_tree__h_nargs=0
 _shtab_ahriman_repo_tree___help_nargs=0
 _shtab_ahriman_repo_triggers_pos_0_nargs=*
@@ -451,91 +394,6 @@ _shtab_ahriman_repo_update___vcs_nargs=0
 _shtab_ahriman_repo_update___no_vcs_nargs=0
 _shtab_ahriman_repo_update__y_nargs=0
 _shtab_ahriman_repo_update___refresh_nargs=0
-_shtab_ahriman_report__h_nargs=0
-_shtab_ahriman_report___help_nargs=0
-_shtab_ahriman_run_pos_0_nargs=+
-_shtab_ahriman_run__h_nargs=0
-_shtab_ahriman_run___help_nargs=0
-_shtab_ahriman_search_pos_0_nargs=+
-_shtab_ahriman_search__h_nargs=0
-_shtab_ahriman_search___help_nargs=0
-_shtab_ahriman_search__e_nargs=0
-_shtab_ahriman_search___exit_code_nargs=0
-_shtab_ahriman_search___info_nargs=0
-_shtab_ahriman_search___no_info_nargs=0
-_shtab_ahriman_service_clean__h_nargs=0
-_shtab_ahriman_service_clean___help_nargs=0
-_shtab_ahriman_service_clean___cache_nargs=0
-_shtab_ahriman_service_clean___no_cache_nargs=0
-_shtab_ahriman_service_clean___chroot_nargs=0
-_shtab_ahriman_service_clean___no_chroot_nargs=0
-_shtab_ahriman_service_clean___manual_nargs=0
-_shtab_ahriman_service_clean___no_manual_nargs=0
-_shtab_ahriman_service_clean___packages_nargs=0
-_shtab_ahriman_service_clean___no_packages_nargs=0
-_shtab_ahriman_service_clean___pacman_nargs=0
-_shtab_ahriman_service_clean___no_pacman_nargs=0
-_shtab_ahriman_service_config__h_nargs=0
-_shtab_ahriman_service_config___help_nargs=0
-_shtab_ahriman_service_config___info_nargs=0
-_shtab_ahriman_service_config___no_info_nargs=0
-_shtab_ahriman_service_config___secure_nargs=0
-_shtab_ahriman_service_config___no_secure_nargs=0
-_shtab_ahriman_service_config_validate__h_nargs=0
-_shtab_ahriman_service_config_validate___help_nargs=0
-_shtab_ahriman_service_config_validate__e_nargs=0
-_shtab_ahriman_service_config_validate___exit_code_nargs=0
-_shtab_ahriman_service_key_import__h_nargs=0
-_shtab_ahriman_service_key_import___help_nargs=0
-_shtab_ahriman_service_repositories__h_nargs=0
-_shtab_ahriman_service_repositories___help_nargs=0
-_shtab_ahriman_service_repositories___id_only_nargs=0
-_shtab_ahriman_service_repositories___no_id_only_nargs=0
-_shtab_ahriman_service_run_pos_0_nargs=+
-_shtab_ahriman_service_run__h_nargs=0
-_shtab_ahriman_service_run___help_nargs=0
-_shtab_ahriman_service_setup__h_nargs=0
-_shtab_ahriman_service_setup___help_nargs=0
-_shtab_ahriman_service_setup___generate_salt_nargs=0
-_shtab_ahriman_service_setup___no_generate_salt_nargs=0
-_shtab_ahriman_service_setup___makeflags_jobs_nargs=0
-_shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0
-_shtab_ahriman_service_setup___multilib_nargs=0
-_shtab_ahriman_service_setup___no_multilib_nargs=0
-_shtab_ahriman_service_shell__h_nargs=0
-_shtab_ahriman_service_shell___help_nargs=0
-_shtab_ahriman_service_shell__v_nargs=0
-_shtab_ahriman_service_shell___verbose_nargs=0
-_shtab_ahriman_service_tree_migrate__h_nargs=0
-_shtab_ahriman_service_tree_migrate___help_nargs=0
-_shtab_ahriman_setup__h_nargs=0
-_shtab_ahriman_setup___help_nargs=0
-_shtab_ahriman_setup___generate_salt_nargs=0
-_shtab_ahriman_setup___no_generate_salt_nargs=0
-_shtab_ahriman_setup___makeflags_jobs_nargs=0
-_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
-_shtab_ahriman_setup___multilib_nargs=0
-_shtab_ahriman_setup___no_multilib_nargs=0
-_shtab_ahriman_shell__h_nargs=0
-_shtab_ahriman_shell___help_nargs=0
-_shtab_ahriman_shell__v_nargs=0
-_shtab_ahriman_shell___verbose_nargs=0
-_shtab_ahriman_sign_pos_0_nargs=*
-_shtab_ahriman_sign__h_nargs=0
-_shtab_ahriman_sign___help_nargs=0
-_shtab_ahriman_status_pos_0_nargs=*
-_shtab_ahriman_status__h_nargs=0
-_shtab_ahriman_status___help_nargs=0
-_shtab_ahriman_status___ahriman_nargs=0
-_shtab_ahriman_status__e_nargs=0
-_shtab_ahriman_status___exit_code_nargs=0
-_shtab_ahriman_status___info_nargs=0
-_shtab_ahriman_status___no_info_nargs=0
-_shtab_ahriman_status_update_pos_0_nargs=*
-_shtab_ahriman_status_update__h_nargs=0
-_shtab_ahriman_status_update___help_nargs=0
-_shtab_ahriman_sync__h_nargs=0
-_shtab_ahriman_sync___help_nargs=0
 _shtab_ahriman_update_pos_0_nargs=*
 _shtab_ahriman_update__h_nargs=0
 _shtab_ahriman_update___help_nargs=0
@@ -560,6 +418,136 @@ _shtab_ahriman_update___vcs_nargs=0
 _shtab_ahriman_update___no_vcs_nargs=0
 _shtab_ahriman_update__y_nargs=0
 _shtab_ahriman_update___refresh_nargs=0
+_shtab_ahriman_service_clean__h_nargs=0
+_shtab_ahriman_service_clean___help_nargs=0
+_shtab_ahriman_service_clean___cache_nargs=0
+_shtab_ahriman_service_clean___no_cache_nargs=0
+_shtab_ahriman_service_clean___chroot_nargs=0
+_shtab_ahriman_service_clean___no_chroot_nargs=0
+_shtab_ahriman_service_clean___manual_nargs=0
+_shtab_ahriman_service_clean___no_manual_nargs=0
+_shtab_ahriman_service_clean___packages_nargs=0
+_shtab_ahriman_service_clean___no_packages_nargs=0
+_shtab_ahriman_service_clean___pacman_nargs=0
+_shtab_ahriman_service_clean___no_pacman_nargs=0
+_shtab_ahriman_clean__h_nargs=0
+_shtab_ahriman_clean___help_nargs=0
+_shtab_ahriman_clean___cache_nargs=0
+_shtab_ahriman_clean___no_cache_nargs=0
+_shtab_ahriman_clean___chroot_nargs=0
+_shtab_ahriman_clean___no_chroot_nargs=0
+_shtab_ahriman_clean___manual_nargs=0
+_shtab_ahriman_clean___no_manual_nargs=0
+_shtab_ahriman_clean___packages_nargs=0
+_shtab_ahriman_clean___no_packages_nargs=0
+_shtab_ahriman_clean___pacman_nargs=0
+_shtab_ahriman_clean___no_pacman_nargs=0
+_shtab_ahriman_repo_clean__h_nargs=0
+_shtab_ahriman_repo_clean___help_nargs=0
+_shtab_ahriman_repo_clean___cache_nargs=0
+_shtab_ahriman_repo_clean___no_cache_nargs=0
+_shtab_ahriman_repo_clean___chroot_nargs=0
+_shtab_ahriman_repo_clean___no_chroot_nargs=0
+_shtab_ahriman_repo_clean___manual_nargs=0
+_shtab_ahriman_repo_clean___no_manual_nargs=0
+_shtab_ahriman_repo_clean___packages_nargs=0
+_shtab_ahriman_repo_clean___no_packages_nargs=0
+_shtab_ahriman_repo_clean___pacman_nargs=0
+_shtab_ahriman_repo_clean___no_pacman_nargs=0
+_shtab_ahriman_service_config__h_nargs=0
+_shtab_ahriman_service_config___help_nargs=0
+_shtab_ahriman_service_config___info_nargs=0
+_shtab_ahriman_service_config___no_info_nargs=0
+_shtab_ahriman_service_config___secure_nargs=0
+_shtab_ahriman_service_config___no_secure_nargs=0
+_shtab_ahriman_config__h_nargs=0
+_shtab_ahriman_config___help_nargs=0
+_shtab_ahriman_config___info_nargs=0
+_shtab_ahriman_config___no_info_nargs=0
+_shtab_ahriman_config___secure_nargs=0
+_shtab_ahriman_config___no_secure_nargs=0
+_shtab_ahriman_repo_config__h_nargs=0
+_shtab_ahriman_repo_config___help_nargs=0
+_shtab_ahriman_repo_config___info_nargs=0
+_shtab_ahriman_repo_config___no_info_nargs=0
+_shtab_ahriman_repo_config___secure_nargs=0
+_shtab_ahriman_repo_config___no_secure_nargs=0
+_shtab_ahriman_service_config_validate__h_nargs=0
+_shtab_ahriman_service_config_validate___help_nargs=0
+_shtab_ahriman_service_config_validate__e_nargs=0
+_shtab_ahriman_service_config_validate___exit_code_nargs=0
+_shtab_ahriman_config_validate__h_nargs=0
+_shtab_ahriman_config_validate___help_nargs=0
+_shtab_ahriman_config_validate__e_nargs=0
+_shtab_ahriman_config_validate___exit_code_nargs=0
+_shtab_ahriman_repo_config_validate__h_nargs=0
+_shtab_ahriman_repo_config_validate___help_nargs=0
+_shtab_ahriman_repo_config_validate__e_nargs=0
+_shtab_ahriman_repo_config_validate___exit_code_nargs=0
+_shtab_ahriman_service_key_import__h_nargs=0
+_shtab_ahriman_service_key_import___help_nargs=0
+_shtab_ahriman_key_import__h_nargs=0
+_shtab_ahriman_key_import___help_nargs=0
+_shtab_ahriman_service_repositories__h_nargs=0
+_shtab_ahriman_service_repositories___help_nargs=0
+_shtab_ahriman_service_repositories___id_only_nargs=0
+_shtab_ahriman_service_repositories___no_id_only_nargs=0
+_shtab_ahriman_service_run_pos_0_nargs=+
+_shtab_ahriman_service_run__h_nargs=0
+_shtab_ahriman_service_run___help_nargs=0
+_shtab_ahriman_run_pos_0_nargs=+
+_shtab_ahriman_run__h_nargs=0
+_shtab_ahriman_run___help_nargs=0
+_shtab_ahriman_service_setup__h_nargs=0
+_shtab_ahriman_service_setup___help_nargs=0
+_shtab_ahriman_service_setup___generate_salt_nargs=0
+_shtab_ahriman_service_setup___no_generate_salt_nargs=0
+_shtab_ahriman_service_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_service_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_service_setup___multilib_nargs=0
+_shtab_ahriman_service_setup___no_multilib_nargs=0
+_shtab_ahriman_init__h_nargs=0
+_shtab_ahriman_init___help_nargs=0
+_shtab_ahriman_init___generate_salt_nargs=0
+_shtab_ahriman_init___no_generate_salt_nargs=0
+_shtab_ahriman_init___makeflags_jobs_nargs=0
+_shtab_ahriman_init___no_makeflags_jobs_nargs=0
+_shtab_ahriman_init___multilib_nargs=0
+_shtab_ahriman_init___no_multilib_nargs=0
+_shtab_ahriman_repo_init__h_nargs=0
+_shtab_ahriman_repo_init___help_nargs=0
+_shtab_ahriman_repo_init___generate_salt_nargs=0
+_shtab_ahriman_repo_init___no_generate_salt_nargs=0
+_shtab_ahriman_repo_init___makeflags_jobs_nargs=0
+_shtab_ahriman_repo_init___no_makeflags_jobs_nargs=0
+_shtab_ahriman_repo_init___multilib_nargs=0
+_shtab_ahriman_repo_init___no_multilib_nargs=0
+_shtab_ahriman_repo_setup__h_nargs=0
+_shtab_ahriman_repo_setup___help_nargs=0
+_shtab_ahriman_repo_setup___generate_salt_nargs=0
+_shtab_ahriman_repo_setup___no_generate_salt_nargs=0
+_shtab_ahriman_repo_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_repo_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_repo_setup___multilib_nargs=0
+_shtab_ahriman_repo_setup___no_multilib_nargs=0
+_shtab_ahriman_setup__h_nargs=0
+_shtab_ahriman_setup___help_nargs=0
+_shtab_ahriman_setup___generate_salt_nargs=0
+_shtab_ahriman_setup___no_generate_salt_nargs=0
+_shtab_ahriman_setup___makeflags_jobs_nargs=0
+_shtab_ahriman_setup___no_makeflags_jobs_nargs=0
+_shtab_ahriman_setup___multilib_nargs=0
+_shtab_ahriman_setup___no_multilib_nargs=0
+_shtab_ahriman_service_shell__h_nargs=0
+_shtab_ahriman_service_shell___help_nargs=0
+_shtab_ahriman_service_shell__v_nargs=0
+_shtab_ahriman_service_shell___verbose_nargs=0
+_shtab_ahriman_shell__h_nargs=0
+_shtab_ahriman_shell___help_nargs=0
+_shtab_ahriman_shell__v_nargs=0
+_shtab_ahriman_shell___verbose_nargs=0
+_shtab_ahriman_service_tree_migrate__h_nargs=0
+_shtab_ahriman_service_tree_migrate___help_nargs=0
 _shtab_ahriman_user_add__h_nargs=0
 _shtab_ahriman_user_add___help_nargs=0
 _shtab_ahriman_user_list__h_nargs=0
@@ -568,8 +556,6 @@ _shtab_ahriman_user_list__e_nargs=0
 _shtab_ahriman_user_list___exit_code_nargs=0
 _shtab_ahriman_user_remove__h_nargs=0
 _shtab_ahriman_user_remove___help_nargs=0
-_shtab_ahriman_version__h_nargs=0
-_shtab_ahriman_version___help_nargs=0
 _shtab_ahriman_web__h_nargs=0
 _shtab_ahriman_web___help_nargs=0
 
@@ -635,7 +621,6 @@ _set_new_action() {
 #     ${!x} -> ${hello} -> "world"
 _shtab_ahriman() {
   local completing_word="${COMP_WORDS[COMP_CWORD]}"
-  local previous_word="${COMP_WORDS[COMP_CWORD-1]}"
   local completed_positional_actions
   local current_action
   local current_action_args_start_index
@@ -692,10 +677,6 @@ _shtab_ahriman() {
   if [[ $pos_only = 0 && "${completing_word}" == -* ]]; then
     # optional argument started: use option strings
     COMPREPLY=( $(compgen -W "${current_option_strings[*]}" -- "${completing_word}") )
-  elif [[ "${previous_word}" == ">" || "${previous_word}" == ">>" ||
-          "${previous_word}" =~ ^[12]">" || "${previous_word}" =~ ^[12]">>" ]]; then
-    # handle redirection operators
-    COMPREPLY=( $(compgen -f -- "${completing_word}") )
   else
     # use choices & compgen
     local IFS=$'\n' # items may contain spaces, so delimit using newline

package/share/man/man1/ahriman.1

@@ -1,9 +1,9 @@
-.TH AHRIMAN "1" "2025\-06\-29" "ahriman 2.19.0" "ArcH linux ReposItory MANager"
+.TH AHRIMAN "1" "2024\-09\-26" "ahriman" "Generated Python Manual"
 .SH NAME
-ahriman \- ArcH linux ReposItory MANager
+ahriman
 .SH SYNOPSIS
 .B ahriman
-[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [-V] [--wait-timeout WAIT_TIMEOUT] {add,aur-search,check,clean,config,config-validate,copy,daemon,help,help-commands-unsafe,help-updates,help-version,init,key-import,package-add,package-changes,package-changes-remove,package-copy,package-remove,package-status,package-status-remove,package-status-update,package-update,patch-add,patch-list,patch-remove,patch-set-add,rebuild,remove,remove-unknown,repo-backup,repo-check,repo-clean,repo-config,repo-config-validate,repo-create-keyring,repo-create-mirrorlist,repo-daemon,repo-init,repo-rebuild,repo-remove-unknown,repo-report,repo-restore,repo-setup,repo-sign,repo-statistics,repo-status-update,repo-sync,repo-tree,repo-triggers,repo-update,report,run,search,service-clean,service-config,service-config-validate,service-key-import,service-repositories,service-run,service-setup,service-shell,service-tree-migrate,setup,shell,sign,status,status-update,sync,update,user-add,user-list,user-remove,version,web} ...
+[-h] [-a ARCHITECTURE] [-c CONFIGURATION] [--force] [-l LOCK] [--log-handler {console,syslog,journald}] [-q] [--report | --no-report] [-r REPOSITORY] [--unsafe] [-V] [--wait-timeout WAIT_TIMEOUT] {aur-search,search,help-commands-unsafe,help,help-updates,help-version,version,package-add,add,package-update,package-changes,package-changes-remove,package-remove,remove,package-status,status,package-status-remove,package-status-update,status-update,patch-add,patch-list,patch-remove,patch-set-add,repo-backup,repo-check,check,repo-create-keyring,repo-create-mirrorlist,repo-daemon,daemon,repo-rebuild,rebuild,repo-remove-unknown,remove-unknown,repo-report,report,repo-restore,repo-sign,sign,repo-statistics,repo-status-update,repo-sync,sync,repo-tree,repo-triggers,repo-update,update,service-clean,clean,repo-clean,service-config,config,repo-config,service-config-validate,config-validate,repo-config-validate,service-key-import,key-import,service-repositories,service-run,run,service-setup,init,repo-init,repo-setup,setup,service-shell,shell,service-tree-migrate,user-add,user-list,user-remove,web} ...
 .SH DESCRIPTION
 ArcH linux ReposItory MANager
 
@@ -59,12 +59,12 @@ COMMAND
 \fBahriman\fR \fI\,aur\-search\/\fR
 search for package
 .TP
-\fBahriman\fR \fI\,help\/\fR
-show help message
-.TP
 \fBahriman\fR \fI\,help\-commands\-unsafe\/\fR
 list unsafe commands
 .TP
+\fBahriman\fR \fI\,help\/\fR
+show help message
+.TP
 \fBahriman\fR \fI\,help\-updates\/\fR
 check for service updates
 .TP
@@ -80,9 +80,6 @@ get package changes
 \fBahriman\fR \fI\,package\-changes\-remove\/\fR
 remove package changes
 .TP
-\fBahriman\fR \fI\,package\-copy\/\fR
-copy package from another repository
-.TP
 \fBahriman\fR \fI\,package\-remove\/\fR
 remove package
 .TP
@@ -219,15 +216,6 @@ show additional package information
 sort field by this field. In case if two packages have the same value of the specified field, they will be always sorted
 by name
 
-.SH COMMAND \fI\,'ahriman help'\/\fR
-usage: ahriman help [\-h] [subcommand]
-
-show help message for application or command and exit
-
-.TP
-\fBsubcommand\fR
-show help message for specific command
-
 .SH COMMAND \fI\,'ahriman help\-commands\-unsafe'\/\fR
 usage: ahriman help\-commands\-unsafe [\-h] [subcommand ...]
 
@@ -238,6 +226,15 @@ list unsafe commands as defined in default args
 instead of showing commands, just test command line for unsafe subcommand and return 0 in case if command is safe and 1
 otherwise
 
+.SH COMMAND \fI\,'ahriman help'\/\fR
+usage: ahriman help [\-h] [subcommand]
+
+show help message for application or command and exit
+
+.TP
+\fBsubcommand\fR
+show help message for specific command
+
 .SH COMMAND \fI\,'ahriman help\-updates'\/\fR
 usage: ahriman help\-updates [\-h] [\-e]
 
@@ -325,28 +322,6 @@ remove the package changes stored remotely
 \fBpackage\fR
 package base
 
-.SH COMMAND \fI\,'ahriman package\-copy'\/\fR
-usage: ahriman package\-copy [\-h] [\-e] [\-\-remove] source package [package ...]
-
-copy package and its metadata from another repository
-
-.TP
-\fBsource\fR
-source repository name
-
-.TP
-\fBpackage\fR
-package base
-
-.SH OPTIONS \fI\,'ahriman package\-copy'\/\fR
-.TP
-\fB\-e\fR, \fB\-\-exit\-code\fR
-return non\-zero exit status if result is empty
-
-.TP
-\fB\-\-remove\fR
-remove package from the source repository after
-
 .SH COMMAND \fI\,'ahriman package\-remove'\/\fR
 usage: ahriman package\-remove [\-h] package [package ...]
 
@@ -940,7 +915,7 @@ port of the web service
 path to unix socket used for interprocess communications
 
 .SH COMMAND \fI\,'ahriman service\-shell'\/\fR
-usage: ahriman service\-shell [\-h] [\-o OUTPUT] [code]
+usage: ahriman service\-shell [\-h] [code]
 
 drop into python shell
 
@@ -948,11 +923,6 @@ drop into python shell
 \fBcode\fR
 instead of dropping into shell, just execute the specified code
 
-.SH OPTIONS \fI\,'ahriman service\-shell'\/\fR
-.TP
-\fB\-o\fR \fI\,OUTPUT\/\fR, \fB\-\-output\fR \fI\,OUTPUT\/\fR
-output commands and result to the file
-
 .SH COMMAND \fI\,'ahriman service\-tree\-migrate'\/\fR
 usage: ahriman service\-tree\-migrate [\-h]
 

package/share/zsh/site-functions/_ahriman

@@ -11,7 +11,6 @@ _shtab_ahriman_commands() {
     "clean:remove local caches"
     "config:dump configuration for the specified architecture"
     "config-validate:validate configuration and print found errors"
-    "copy:copy package and its metadata from another repository"
     "daemon:start process which periodically will run update process"
     "help:show help message for application or command and exit"
     "help-commands-unsafe:list unsafe commands as defined in default args"
@@ -22,7 +21,6 @@ _shtab_ahriman_commands() {
     "package-add:add existing or new package to the build queue"
     "package-changes:retrieve package changes stored in database"
     "package-changes-remove:remove the package changes stored remotely"
-    "package-copy:copy package and its metadata from another repository"
     "package-remove:remove package from the repository"
     "package-status:request status of the package"
     "package-status-remove:remove the package from the status page"
@@ -153,14 +151,6 @@ _shtab_ahriman_config_validate_options=(
   {-e,--exit-code}"[return non-zero exit status if configuration is invalid (default\: False)]"
 )
 
-_shtab_ahriman_copy_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  "--remove[remove package from the source repository after (default\: False)]"
-  ":source repository name:"
-  "(*):package base:"
-)
-
 _shtab_ahriman_daemon_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   {-i,--interval}"[interval between runs in seconds (default\: 43200)]:interval:"
@@ -244,14 +234,6 @@ _shtab_ahriman_package_changes_remove_options=(
   ":package base:"
 )
 
-_shtab_ahriman_package_copy_options=(
-  "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-e,--exit-code}"[return non-zero exit status if result is empty (default\: False)]"
-  "--remove[remove package from the source repository after (default\: False)]"
-  ":source repository name:"
-  "(*):package base:"
-)
-
 _shtab_ahriman_package_remove_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
   "(*):package name or base:"
@@ -583,7 +565,6 @@ _shtab_ahriman_service_setup_options=(
 
 _shtab_ahriman_service_shell_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-o,--output}"[output commands and result to the file (default\: None)]:output:"
   ":instead of dropping into shell, just execute the specified code (default\: None):"
 )
 
@@ -609,7 +590,6 @@ _shtab_ahriman_setup_options=(
 
 _shtab_ahriman_shell_options=(
   "(- : *)"{-h,--help}"[show this help message and exit]"
-  {-o,--output}"[output commands and result to the file (default\: None)]:output:"
   ":instead of dropping into shell, just execute the specified code (default\: None):"
 )
 
@@ -704,7 +684,6 @@ _shtab_ahriman() {
         clean) _arguments -C -s $_shtab_ahriman_clean_options ;;
         config) _arguments -C -s $_shtab_ahriman_config_options ;;
         config-validate) _arguments -C -s $_shtab_ahriman_config_validate_options ;;
-        copy) _arguments -C -s $_shtab_ahriman_copy_options ;;
         daemon) _arguments -C -s $_shtab_ahriman_daemon_options ;;
         help) _arguments -C -s $_shtab_ahriman_help_options ;;
         help-commands-unsafe) _arguments -C -s $_shtab_ahriman_help_commands_unsafe_options ;;
@@ -715,7 +694,6 @@ _shtab_ahriman() {
         package-add) _arguments -C -s $_shtab_ahriman_package_add_options ;;
         package-changes) _arguments -C -s $_shtab_ahriman_package_changes_options ;;
         package-changes-remove) _arguments -C -s $_shtab_ahriman_package_changes_remove_options ;;
-        package-copy) _arguments -C -s $_shtab_ahriman_package_copy_options ;;
         package-remove) _arguments -C -s $_shtab_ahriman_package_remove_options ;;
         package-status) _arguments -C -s $_shtab_ahriman_package_status_options ;;
         package-status-remove) _arguments -C -s $_shtab_ahriman_package_status_remove_options ;;

pylint_plugins/definition_order.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

pylint_plugins/import_order.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2023 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

pyproject.toml

@@ -25,68 +25,15 @@ dependencies = [
 
 dynamic = ["version"]
 
-[project.optional-dependencies]
-journald = [
-    "systemd-python",
-]
-# FIXME technically this dependency is required, but in some cases we do not have access to
-# the libalpm which is required in order to install the package. Thus in case if we do not
-# really need to run the application we can move it to "optional" dependencies
-pacman = [
-    "pyalpm",
-]
-reports = [
-    "Jinja2",
-]
-s3 = [
-    "boto3",
-]
-shell = [
-    "IPython"
-]
-stats = [
-    "matplotlib",
-]
-unixsocket = [
-    "requests-unixsocket2",  # required by unix socket support
-]
-validator = [
-    "cerberus",
-]
-web = [
-    "aiohttp",
-    "aiohttp_cors",
-    "aiohttp_jinja2",
-]
-web-auth = [
-    "ahriman[web]",
-    "aiohttp_session",
-    "aiohttp_security",
-    "cryptography",
-]
-web-docs = [
-    "ahriman[web]",
-    "aiohttp-apispec",
-    "setuptools",  # required by aiohttp-apispec
-]
-web-metrics = [
-    "ahriman[web]",
-    "aiohttp-openmetrics",
-]
-web-oauth2 = [
-    "ahriman[web-auth]",
-    "aioauth-client",
-]
-
-[project.scripts]
-ahriman = "ahriman.application.ahriman:run"
-
 [project.urls]
 Documentation = "https://ahriman.readthedocs.io/"
 Repository = "https://github.com/arcan1s/ahriman"
 Changelog = "https://github.com/arcan1s/ahriman/releases"
 
-[dependency-groups]
+[project.scripts]
+ahriman = "ahriman.application.ahriman:run"
+
+[project.optional-dependencies]
 check = [
     "autopep8",
     "bandit",
@@ -100,6 +47,21 @@ docs = [
      "shtab",
      "sphinx-argparse",
      "sphinx-rtd-theme>=1.1.1",  # https://stackoverflow.com/a/74355734
+ ]
+journald = [
+    "systemd-python",
+]
+# FIXME technically this dependency is required, but in some cases we do not have access to
+# the libalpm which is required in order to install the package. Thus in case if we do not
+# really need to run the application we can move it to "optional" dependencies
+pacman = [
+    "pyalpm",
+]
+s3 = [
+    "boto3",
+]
+stats = [
+    "matplotlib",
 ]
 tests = [
     "pytest",
@@ -110,6 +72,22 @@ tests = [
     "pytest-resource-path",
     "pytest-spec",
 ]
+validator = [
+    "cerberus",
+]
+web = [
+    "Jinja2",
+    "aioauth-client",
+    "aiohttp",
+    "aiohttp-apispec",
+    "aiohttp_cors",
+    "aiohttp_jinja2",
+    "aiohttp_session",
+    "aiohttp_security",
+    "cryptography",
+    "requests-unixsocket2",  # required by unix socket support
+    "setuptools",  # required by aiohttp-apispec
+]
 
 [tool.flit.sdist]
 include = [

src/ahriman/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-__version__ = "2.19.0"
+__version__ = "2.15.2"

src/ahriman/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/ahriman.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -95,11 +95,6 @@ Start web service (requires additional configuration):
             subparser.formatter_class = _HelpFormatter
             subparser.set_defaults(handler=handler, parser=_parser)
 
-    # sort actions alphabetically in both choices and help message
-    # pylint: disable=protected-access
-    subparsers._choices_actions = sorted(subparsers._choices_actions, key=lambda action: action.dest)
-    subparsers.choices = dict(sorted(subparsers.choices.items()))
-
     return parser
 
 

src/ahriman/application/application/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -117,7 +117,7 @@ class Application(ApplicationPackages, ApplicationRepository):
 
         Args:
             packages(list[Package]): list of source packages of which dependencies have to be processed
-            process_dependencies(bool): if set to ``False``, dependencies will not be processed
+            process_dependencies(bool): if no set, dependencies will not be processed
 
         Returns:
             list[Package]: updated packages list. Packager for dependencies will be copied from the original package
@@ -130,47 +130,37 @@ class Application(ApplicationPackages, ApplicationRepository):
                 >>> packages = application.with_dependencies(packages, process_dependencies=True)
                 >>> application.print_updates(packages, log_fn=print)
         """
-        if not process_dependencies or not packages:
-            return packages
-
-        def missing_dependencies(sources: Iterable[Package]) -> dict[str, str | None]:
+        def missing_dependencies(source: Iterable[Package]) -> dict[str, str | None]:
             # append list of known packages with packages which are in current sources
             satisfied_packages = known_packages | {
                 single
-                for source in sources
-                for single in source.packages_full
+                for package in source
+                for single in package.packages_full
             }
 
             return {
-                dependency: source.packager
-                for source in sources
-                for dependency in source.depends_build
+                dependency: package.packager
+                for package in source
+                for dependency in package.depends_build
                 if dependency not in satisfied_packages
             }
 
-        def new_packages(root: Package) -> dict[str, Package]:
-            portion = {root.base: root}
-            while missing := missing_dependencies(portion.values()):
-                for package_name, packager in missing.items():
-                    if (source_dir := self.repository.paths.cache_for(package_name)).is_dir():
-                        # there is local cache, load package from it
-                        leaf = Package.from_build(source_dir, self.repository.architecture, packager)
-                    else:
-                        leaf = Package.from_aur(package_name, packager, include_provides=True)
-                    portion[leaf.base] = leaf
-
-                    # register package in the database
-                    self.repository.reporter.set_unknown(leaf)
-
-            return portion
+        if not process_dependencies or not packages:
+            return packages
 
         known_packages = self._known_packages()
-        with_dependencies: dict[str, Package] = {}
-        for package in packages:
-            with self.in_package_context(package.base, package.version):  # use the same context for the logger
-                try:
-                    with_dependencies |= new_packages(package)
-                except Exception:
-                    self.logger.exception("could not process dependencies of %s, skip the package", package.base)
+        with_dependencies = {package.base: package for package in packages}
+
+        while missing := missing_dependencies(with_dependencies.values()):
+            for package_name, username in missing.items():
+                if (source_dir := self.repository.paths.cache_for(package_name)).is_dir():
+                    # there is local cache, load package from it
+                    package = Package.from_build(source_dir, self.repository.architecture, username)
+                else:
+                    package = Package.from_aur(package_name, username)
+                with_dependencies[package.base] = package
+
+                # register package in the database
+                self.repository.reporter.set_unknown(package)
 
         return list(with_dependencies.values())

src/ahriman/application/application/application_packages.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application_properties.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/application_repository.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/updates_iterator.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/local_updater.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/remote_updater.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/application/workers/updater.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/__init__.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/add.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/backup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/change.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/clean.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/copy.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/daemon.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/dump.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/handler.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -22,7 +22,7 @@ import logging
 
 from collections.abc import Callable, Iterable
 from multiprocessing import Pool
-from typing import ClassVar, TypeVar
+from typing import TypeVar
 
 from ahriman.application.lock import Lock
 from ahriman.core.configuration import Configuration
@@ -53,13 +53,13 @@ class Handler:
         Wrapper for all command line actions, though each derived class implements :func:`run()` method, it usually
         must not be called directly. The recommended way is to call :func:`execute()` class method, e.g.::
 
-            >>> from ahriman.application.handlers.add import Add
+            >>> from ahriman.application.handlers import Add
             >>>
             >>> Add.execute(args)
     """
 
-    ALLOW_MULTI_ARCHITECTURE_RUN: ClassVar[bool] = True
-    arguments: ClassVar[list[Callable[[SubParserAction], argparse.ArgumentParser]]]
+    ALLOW_MULTI_ARCHITECTURE_RUN = True
+    arguments: list[Callable[[SubParserAction], argparse.ArgumentParser]]
 
     @classmethod
     def call(cls, args: argparse.Namespace, repository_id: RepositoryId) -> bool:

src/ahriman/application/handlers/help.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/key_import.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/patch.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -198,7 +198,8 @@ class Patch(Handler):
         else:
             patch = patch_path.read_text(encoding="utf8")
         # remove spaces around the patch and parse to correct type
-        return PkgbuildPatch.parse(variable, patch.strip())
+        parsed = PkgbuildPatch.parse(patch.strip())
+        return PkgbuildPatch(variable, parsed)
 
     @staticmethod
     def patch_set_create(application: Application, package_base: str, patch: PkgbuildPatch) -> None:

src/ahriman/application/handlers/rebuild.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/remove.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/remove_unknown.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/repositories.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/restore.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/run.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/search.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,7 +21,6 @@ import argparse
 
 from collections.abc import Callable, Iterable
 from dataclasses import fields
-from typing import ClassVar
 
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.alpm.remote import AUR, Official
@@ -41,7 +40,7 @@ class Search(Handler):
     """
 
     ALLOW_MULTI_ARCHITECTURE_RUN = False  # system-wide action
-    SORT_FIELDS: ClassVar[set[str]] = {
+    SORT_FIELDS = {
         field.name
         for field in fields(AURPackage)
         if field.default_factory is not list

src/ahriman/application/handlers/service_updates.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/setup.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -21,8 +21,7 @@ import argparse
 
 from pathlib import Path
 from pwd import getpwuid
-from typing import ClassVar
-from urllib.parse import quote_plus as url_encode
+from urllib.parse import quote_plus as urlencode
 
 from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler, SubParserAction
@@ -47,9 +46,9 @@ class Setup(Handler):
 
     ALLOW_MULTI_ARCHITECTURE_RUN = False  # conflicting io
 
-    ARCHBUILD_COMMAND_PATH: ClassVar[Path] = Path("/") / "usr" / "bin" / "archbuild"
-    MIRRORLIST_PATH: ClassVar[Path] = Path("/") / "etc" / "pacman.d" / "mirrorlist"
-    SUDOERS_DIR_PATH: ClassVar[Path] = Path("/") / "etc" / "sudoers.d"
+    ARCHBUILD_COMMAND_PATH = Path("/") / "usr" / "bin" / "archbuild"
+    MIRRORLIST_PATH = Path("/") / "etc" / "pacman.d" / "mirrorlist"
+    SUDOERS_DIR_PATH = Path("/") / "etc" / "sudoers.d"
 
     @classmethod
     def run(cls, args: argparse.Namespace, repository_id: RepositoryId, configuration: Configuration, *,
@@ -175,7 +174,7 @@ class Setup(Handler):
         if args.web_unix_socket is not None:
             unix_socket = str(args.web_unix_socket)
             configuration.set_option("web", "unix_socket", unix_socket)
-            configuration.set_option("status", "address", f"http+unix://{url_encode(unix_socket)}")
+            configuration.set_option("status", "address", f"http+unix://{urlencode(unix_socket)}")
 
         if args.generate_salt:
             configuration.set_option("auth", "salt", User.generate_password(20))

src/ahriman/application/handlers/shell.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -18,12 +18,12 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 import argparse
+import code
 import sys
 
 from pathlib import Path
 
 from ahriman.application.handlers.handler import Handler, SubParserAction
-from ahriman.application.interactive_shell import InteractiveShell
 from ahriman.core.configuration import Configuration
 from ahriman.core.formatters import StringPrinter
 from ahriman.models.repository_id import RepositoryId
@@ -58,13 +58,11 @@ class Shell(Handler):
             "configuration": configuration,
             "repository_id": repository_id,
         }
-        console = InteractiveShell(locals=local_variables)
 
-        match args.code:
-            case None:
-                console.interact()
-            case snippet:
-                console.runcode(snippet)
+        if args.code is None:
+            code.interact(local=local_variables)
+        else:
+            code.InteractiveConsole(locals=local_variables).runcode(args.code)
 
     @staticmethod
     def _set_service_shell_parser(root: SubParserAction) -> argparse.ArgumentParser:
@@ -81,7 +79,6 @@ class Shell(Handler):
                                  description="drop into python shell")
         parser.add_argument("code", help="instead of dropping into shell, just execute the specified code", nargs="?")
         parser.add_argument("-v", "--verbose", help=argparse.SUPPRESS, action="store_true")
-        parser.add_argument("-o", "--output", help="output commands and result to the file", type=Path)
         parser.set_defaults(lock=None, report=False)
         return parser
 

src/ahriman/application/handlers/sign.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/statistics.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -27,7 +27,7 @@ from pathlib import Path
 from ahriman.application.application import Application
 from ahriman.application.handlers.handler import Handler, SubParserAction
 from ahriman.core.configuration import Configuration
-from ahriman.core.formatters import EventStatsPrinter, PackageStatsPrinter, RepositoryStatsPrinter
+from ahriman.core.formatters import EventStatsPrinter, PackageStatsPrinter
 from ahriman.core.utils import enum_values, pretty_datetime
 from ahriman.models.event import Event, EventType
 from ahriman.models.repository_id import RepositoryId
@@ -64,7 +64,6 @@ class Statistics(Handler):
 
         match args.package:
             case None:
-                RepositoryStatsPrinter(repository_id, application.reporter.statistics())(verbose=True)
                 Statistics.stats_per_package(args.event, events, args.chart)
             case _:
                 Statistics.stats_for_package(args.event, events, args.chart)

src/ahriman/application/handlers/status.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).

src/ahriman/application/handlers/status_update.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).
@@ -54,7 +54,7 @@ class StatusUpdate(Handler):
             case Action.Update if args.package:
                 # update packages statuses
                 for package in args.package:
-                    client.package_status_update(package, args.status)
+                    client.package_update(package, args.status)
             case Action.Update:
                 # update service status
                 client.status_update(args.status)

src/ahriman/application/handlers/structure.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021-2025 ahriman team.
+# Copyright (c) 2021-2024 ahriman team.
 #
 # This file is part of ahriman
 # (see https://github.com/arcan1s/ahriman).