web server support

CONFIGURING.md

@@ -60,14 +60,22 @@ Remote synchronization settings:
 
 * `target` - list of synchronizations to be used, space separated list of strings, optional. Allowed values are `rsync`, `s3`.
 
+### `rsync_*` group
+
+Group name must refer to architecture, e.g. it should be `rsync_x86_64` for x86_64 architecture. Requires `rsync` package to be installed. Do not forget to configure ssh for user `ahriman`.
+
+* `remote` - remote server to rsync (e.g. `1.2.3.4:5678:path/to/sync`), string, required.
+
 ### `s3_*` group
 
 Group name must refer to architecture, e.g. it should be `s3_x86_64` for x86_64 architecture. Requires `aws-cli` package to be installed. Do not forget to configure it for user `ahriman`.
 
 * `bucket` - bucket name (e.g. `s3://bucket/path`), string, required.
 
-### `rsync_*` group
+## `web` group
 
-Group name must refer to architecture, e.g. it should be `rsync_x86_64` for x86_64 architecture. Requires `rsync` package to be installed. Do not forget to configure ssh for user `ahriman`.
+Web server settings. If any of `host`/`port` is not set, web intergration will be disabled.
 
-* `remote` - remote server to rsync (e.g. `1.2.3.4:5678:path/to/sync`), string, required.
+* `host` - host to bind, string, optional.
+* `port` - port to bind, int, optional.
+* `templates` - path to templates directory, string, required.

package/archlinux/PKGBUILD

@@ -14,14 +14,17 @@ optdepends=('aws-cli: sync to s3'
             'darcs: -darcs packages support'
             'gnupg: package and repository sign'
             'mercurial: -hg packages support'
+            'python-aiohttp: web server'
+            'python-aiohttp-jinja2: web server'
             'python-jinja: html report generation'
+            'python-requests: web server'
             'rsync: sync by using rsync'
             'subversion: -svn packages support')
 source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
         'ahriman.sudoers'
         'ahriman.sysusers'
         'ahriman.tmpfiles')
-sha512sums=('82a8208554956f009db0334b0cb20891889d96617b4c9b9d2af7a007d668f6cbc6d46d0be8b5ee11ffb2b69d124b5d5d6db1a6f7d5a0a2c719c0d8e07dca24d8'
+sha512sums=('bc4880fc2f4196dc959f14a199135bbf09c75fbaad722709c1ca7c1fdae0475b3cfcdff5bf33bc9bcdf4f17a0e29b42bd26de7b3d551356dd63a705ec496e111'
             '8c9b5b63ac3f7b4d9debaf801a1e9c060877c33d3ecafe18010fcca778e5fa2f2e46909d3d0ff1b229ff8aa978445d8243fd36e1fc104117ed678d5e21901167'
             '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075'
             '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4')

package/etc/ahriman.ini

@@ -27,13 +27,18 @@ target =
 path =
 homepage =
 link_path =
-template_path = /usr/share/ahriman/index.jinja2
+template_path = /usr/share/ahriman/repo-index.jinja2
 
 [upload]
 target =
 
+[rsync_x86_64]
+remote =
+
 [s3_x86_64]
 bucket =
 
-[rsync_x86_64]
-remote =
+[web]
+host =
+port =
+templates = /usr/share/ahriman

package/etc/ahriman.ini.d/logging.ini

@@ -1,8 +1,8 @@
 [loggers]
-keys = root,builder,build_details
+keys = root,builder,build_details,http
 
 [handlers]
-keys = console_handler,build_file_handler,file_handler
+keys = console_handler,build_file_handler,file_handler,http_handler
 
 [formatters]
 keys = generic_format
@@ -25,6 +25,12 @@ level = DEBUG
 formatter = generic_format
 args = ('/var/log/ahriman/build.log', 'a', 20971520, 20)
 
+[handler_http_handler]
+class = logging.handlers.RotatingFileHandler
+level = DEBUG
+formatter = generic_format
+args = ('/var/log/ahriman/http.log', 'a', 20971520, 20)
+
 [formatter_generic_format]
 format = %(asctime)s : %(levelname)s : %(funcName)s : %(message)s
 datefmt =
@@ -45,3 +51,9 @@ level = DEBUG
 handlers = build_file_handler
 qualname = build_details
 propagate = 0
+
+[logger_http]
+level = DEBUG
+handlers = http_handler
+qualname = http
+propagate = 0

package/lib/systemd/system/ahriman-web.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=ArcHlinux ReposItory MANager web server
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/ahriman --architecture x86_64 web
+User=ahriman
+Group=ahriman
+
+[Install]
+WantedBy=multi-user.target

package/share/ahriman/index.jinja2

@@ -2,30 +2,83 @@
 <html lang="en">
     <head>
         <title>{{ repository|e }}</title>
+
+        <style>
+            :root {
+                --color-building: 250, 255, 146;
+                --color-failed: 255, 94, 94;
+                --color-pending: 250, 255, 146;
+                --color-success: 121, 255, 94;
+                --color-unknown: 197, 197, 197;
+            }
+
+            @keyframes blink-building {
+                0% { background-color: rgba(var(--color-building), 1.0); }
+                10% { background-color: rgba(var(--color-building), 0.9); }
+                20% { background-color: rgba(var(--color-building), 0.8); }
+                30% { background-color: rgba(var(--color-building), 0.7); }
+                40% { background-color: rgba(var(--color-building), 0.6); }
+                50% { background-color: rgba(var(--color-building), 0.5); }
+                60% { background-color: rgba(var(--color-building), 0.4); }
+                70% { background-color: rgba(var(--color-building), 0.3); }
+                80% { background-color: rgba(var(--color-building), 0.2); }
+                90% { background-color: rgba(var(--color-building), 0.1); }
+                100% { background-color: rgba(var(--color-building), 0.0); }
+            }
+
+            table, th, td {
+                padding: 5px;
+            }
+            td.package {
+                font-weight: bolder;
+            }
+            td.package-unknown {
+                background-color: rgba(var(--color-unknown), 1.0);
+            }
+            td.package-pending {
+                background-color: rgba(var(--color-pending), 1.0);
+            }
+            td.package-building {
+                background-color: rgba(var(--color-building), 1.0);
+                animation-name: blink-building;
+                animation-duration: 1s;
+                animation-timing-function: linear;
+                animation-iteration-count: infinite;
+                animation-direction: alternate;
+            }
+            td.package-failed {
+                background-color: rgba(var(--color-failed), 1.0);
+            }
+            td.package-success {
+                background-color: rgba(var(--color-success), 1.0);
+            }
+        </style>
+
+        <script src="https://www.kryogenix.org/code/browser/sorttable/sorttable.js"></script>
     </head>
 
     <body>
-        <h1>{{ repository|e }} ArchLinux custom repository</h1>
+        <table class="sortable" id="builds">
+            <tr>
+                <th>package base</th>
+                <th>packages</th>
+                <th>version</th>
+                <th>architecture</th>
+                <th>timestamp</th>
+                <th>status</th>
+            </tr>
 
-        {% if pgp_key is not none %}
-            <p>All packages are signed with <a href="http://keys.gnupg.net/pks/lookup?search=0x{{ pgp_key|e }}" title="key search">{{ pgp_key|e }}</a>.</p>
-        {% endif %}
-
-        <code>
-            $ cat /etc/pacman.conf<br>
-            [{{ repository|e }}]<br>
-            Server = {{ link_path|e }}
-        </code>
-
-        <p>Packages:</p>
-        <ul>
-            {% for package, package_url in packages.items() %}
-                <li><a href="{{ package_url|e }}" title="{{ package|e }}">{{ package|e }}</a></li>
+            {% for package in packages %}
+                <tr>
+                    <td class="package"><a href="{{ package.web_url|e }}" title="{{ package.base|e }}">{{ package.base|e }}</a></td>
+                    <td>{{ package.packages|join("<br>"|safe) }}</td>
+                    <td>{{ package.version|e }}</td>
+                    <td>{{ architecture|e }}</td>
+                    <td>{{ package.timestamp|e }}</td>
+                    <td class="package-{{ package.status|e }}">{{ package.status|e }}</td>
+                </tr>
             {% endfor %}
-        </ul>
-
-        {% if homepage is not none %}
-            <footer><a href="{{ homepage|e }}" title="homepage">Homepage</a></footer>
-        {% endif %}
+        </table>
     </body>
+
 </html>

package/share/ahriman/repo-index.jinja2

@@ -0,0 +1,31 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <title>{{ repository|e }}</title>
+    </head>
+
+    <body>
+        <h1>{{ repository|e }} ArchLinux custom repository</h1>
+
+        {% if pgp_key is not none %}
+            <p>All packages are signed with <a href="http://keys.gnupg.net/pks/lookup?search=0x{{ pgp_key|e }}" title="key search">{{ pgp_key|e }}</a>.</p>
+        {% endif %}
+
+        <code>
+            $ cat /etc/pacman.conf<br>
+            [{{ repository|e }}]<br>
+            Server = {{ link_path|e }}
+        </code>
+
+        <p>Packages:</p>
+        <ul>
+            {% for package, package_url in packages.items() %}
+                <li><a href="{{ package_url|e }}" title="{{ package|e }}">{{ package|e }}</a></li>
+            {% endfor %}
+        </ul>
+
+        {% if homepage is not none %}
+            <footer><a href="{{ homepage|e }}" title="homepage">Homepage</a></footer>
+        {% endif %}
+    </body>
+</html>

setup.py

@@ -42,17 +42,26 @@ setup(
         'package/bin/ahriman',
     ],
     data_files=[
-        ('/etc', ['package/etc/ahriman.ini']),
-        ('/etc/ahriman.ini.d', ['package/etc/ahriman.ini.d/logging.ini']),
+        ('/etc', [
+            'package/etc/ahriman.ini',
+        ]),
+        ('/etc/ahriman.ini.d', [
+            'package/etc/ahriman.ini.d/logging.ini',
+        ]),
         ('lib/systemd/system', [
             'package/lib/systemd/system/ahriman.service',
-            'package/lib/systemd/system/ahriman.timer'
+            'package/lib/systemd/system/ahriman.timer',
+            'package/lib/systemd/system/ahriman-web.service',
+        ]),
+        ('share/ahriman', [
+            'package/share/ahriman/index.jinja2',
+            'package/share/ahriman/repo-index.jinja2',
         ]),
-        ('share/ahriman', ['package/share/ahriman/index.jinja2']),
     ],
 
     extras_require={
         'html-templates': ['Jinja2'],
         'test': ['coverage', 'pytest'],
+        'web': ['Jinja2', 'aiohttp', 'aiohttp_jinja2', 'requests'],
     },
 )

src/ahriman/application/ahriman.py

@@ -74,6 +74,13 @@ def update(args: argparse.Namespace) -> None:
     app.update(packages)
 
 
+def web(args: argparse.Namespace) -> None:
+    from ahriman.web.web import run_server, setup_service
+    config = _get_config(args.config)
+    app = setup_service(args.architecture, config)
+    run_server(app)
+
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(prog='ahriman', description='ArcHlinux ReposItory MANager')
     parser.add_argument('-a', '--architecture', help='target architecture', required=True)
@@ -112,6 +119,9 @@ if __name__ == '__main__':
     update_parser.add_argument('--no-vcs', help='do not check VCS packages', action='store_true')
     update_parser.set_defaults(fn=update)
 
+    web_parser = subparsers.add_parser('web', description='start web server')
+    web_parser.set_defaults(fn=web, lock='/tmp/ahriman-web.lock')
+
     args = parser.parse_args()
 
     if args.force:

src/ahriman/application/application.py

@@ -58,7 +58,7 @@ class Application:
     def add(self, names: List[str]) -> None:
         def add_manual(name: str) -> None:
             package = Package.load(name, self.config.get('aur', 'url'))
-            Task.fetch(os.path.join(self.repository.paths.manual, package.base), package.url)
+            Task.fetch(os.path.join(self.repository.paths.manual, package.base), package.git_url)
 
         def add_archive(src: str) -> None:
             dst = os.path.join(self.repository.paths.packages, os.path.basename(src))

src/ahriman/core/build_tools/task.py

@@ -73,4 +73,4 @@ class Task:
 
     def clone(self, path: Optional[str] = None) -> None:
         git_path = path or self.git_path
-        return Task.fetch(git_path, self.package.url)
+        return Task.fetch(git_path, self.package.git_url)

src/ahriman/core/exceptions.py

@@ -25,6 +25,11 @@ class BuildFailed(Exception):
         Exception.__init__(self, f'Package {package} build failed, check logs for details')
 
 
+class InitializeException(Exception):
+    def __init__(self) -> None:
+        Exception.__init__(self, 'Could not load service')
+
+
 class InvalidOptionException(Exception):
     def __init__(self, value: Any) -> None:
         Exception.__init__(self, f'Invalid or unknown option value `{value}`')

src/ahriman/core/repository.py

@@ -30,6 +30,8 @@ from ahriman.core.report.report import Report
 from ahriman.core.sign.gpg_wrapper import GPGWrapper
 from ahriman.core.upload.uploader import Uploader
 from ahriman.core.util import package_like
+from ahriman.core.watcher.client import Client
+from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.package import Package
 from ahriman.models.repository_paths import RepositoryPaths
 
@@ -50,6 +52,8 @@ class Repository:
         self.sign = GPGWrapper(config)
         self.wrapper = RepoWrapper(self.name, self.paths, self.sign.repository_sign_args)
 
+        self.web_report = Client.load(config)
+
     def _clear_build(self) -> None:
         for package in os.listdir(self.paths.sources):
             shutil.rmtree(os.path.join(self.paths.sources, package))
@@ -78,6 +82,7 @@ class Repository:
 
     def process_build(self, updates: List[Package]) -> List[str]:
         def build_single(package: Package) -> None:
+            self.web_report.update(package.base, BuildStatusEnum.Building)
             task = Task(package, self.architecture, self.config, self.paths)
             task.clone()
             built = task.build()
@@ -89,6 +94,7 @@ class Repository:
             try:
                 build_single(package)
             except Exception:
+                self.web_report.update(package.base, BuildStatusEnum.Failed)
                 self.logger.exception(f'{package.base} ({self.architecture}) build exception', exc_info=True)
                 continue
         self._clear_build()
@@ -112,6 +118,7 @@ class Repository:
                 to_remove = local.packages.intersection(packages)
             else:
                 to_remove = set()
+            self.web_report.remove(local.base, to_remove)
             for package in to_remove:
                 remove_single(package)
 
@@ -131,12 +138,18 @@ class Repository:
 
     def process_update(self, packages: List[str]) -> str:
         for package in packages:
-            files = self.sign.sign_package(package)
-            for src in files:
-                dst = os.path.join(self.paths.repository, os.path.basename(src))
-                shutil.move(src, dst)
-            package_fn = os.path.join(self.paths.repository, os.path.basename(package))
-            self.wrapper.add(package_fn)
+            local = Package.load(package, self.aur_url)  # we will use it for status reports
+            try:
+                files = self.sign.sign_package(package)
+                for src in files:
+                    dst = os.path.join(self.paths.repository, os.path.basename(src))
+                    shutil.move(src, dst)
+                package_fn = os.path.join(self.paths.repository, os.path.basename(package))
+                self.wrapper.add(package_fn)
+                self.web_report.add(local, BuildStatusEnum.Success)
+            except Exception:
+                self.logger.exception(f'could not process {package}', exc_info=True)
+                self.web_report.update(local.base, BuildStatusEnum.Failed)
         self._clear_packages()
 
         return self.wrapper.repo_path
@@ -156,7 +169,9 @@ class Repository:
                 remote = Package.load(local.base, self.aur_url)
                 if local.is_outdated(remote):
                     result.append(remote)
+                    self.web_report.update(local.base, BuildStatusEnum.Pending)
             except Exception:
+                self.web_report.update(local.base, BuildStatusEnum.Failed)
                 self.logger.exception(f'could not load remote package {local.base}', exc_info=True)
                 continue
 
@@ -166,8 +181,12 @@ class Repository:
         result: List[Package] = []
 
         for fn in os.listdir(self.paths.manual):
-            local = Package.load(os.path.join(self.paths.manual, fn), self.aur_url)
-            result.append(local)
+            try:
+                local = Package.load(os.path.join(self.paths.manual, fn), self.aur_url)
+                result.append(local)
+                self.web_report.add(local, BuildStatusEnum.Unknown)
+            except Exception:
+                self.logger.exception(f'could not add package from {fn}', exc_info=True)
         self._clear_manual()
 
         return result

src/ahriman/core/watcher/__init__.py

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

src/ahriman/core/watcher/client.py

@@ -0,0 +1,98 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from __future__ import annotations
+
+import logging
+
+from typing import Any, Dict, Set
+
+from ahriman.core.configuration import Configuration
+from ahriman.models.build_status import BuildStatusEnum
+from ahriman.models.package import Package
+
+
+class Client:
+
+    def add(self, package: Package, status: BuildStatusEnum) -> None:
+        pass
+
+    def remove(self, base: str, packages: Set[str]) -> None:
+        pass
+
+    def update(self, base: str, status: BuildStatusEnum) -> None:
+        pass
+
+    @staticmethod
+    def load(config: Configuration) -> Client:
+        host = config.get('web', 'host', fallback=None)
+        port = config.getint('web', 'port', fallback=None)
+        if host is None or port is None:
+            return Client()
+        return WebClient(host, port)
+
+
+class WebClient(Client):
+
+    def __init__(self, host: str, port: int) -> None:
+        self.logger = logging.getLogger('http')
+        self.host = host
+        self.port = port
+
+    def _url(self, base: str) -> str:
+        return f'http://{self.host}:{self.port}/api/v1/packages/{base}'
+
+    def add(self, package: Package, status: BuildStatusEnum) -> None:
+        import requests
+
+        payload: Dict[str, Any] = {
+            'status': status.value,
+            'base': package.base,
+            'packages': [p for p in package.packages],
+            'version': package.version,
+            'url': package.web_url
+        }
+
+        try:
+            response = requests.post(self._url(package.base), json=payload)
+            response.raise_for_status()
+        except:
+            self.logger.exception(f'could not add {package.base}', exc_info=True)
+
+    def remove(self, base: str, packages: Set[str]) -> None:
+        if not packages:
+            return
+        import requests
+
+        try:
+            response = requests.delete(self._url(base))
+            response.raise_for_status()
+        except:
+            self.logger.exception(f'could not delete {base}', exc_info=True)
+
+    def update(self, base: str, status: BuildStatusEnum) -> None:
+        import requests
+
+        payload: Dict[str, Any] = {'status': status.value}
+
+        try:
+            response = requests.post(self._url(base), json=payload)
+            response.raise_for_status()
+        except:
+            self.logger.exception(f'could not update {base}', exc_info=True)

src/ahriman/core/watcher/watcher.py

@@ -0,0 +1,57 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from typing import Dict, List, Optional, Tuple
+
+from ahriman.core.configuration import Configuration
+from ahriman.core.repository import Repository
+from ahriman.models.build_status import BuildStatus, BuildStatusEnum
+from ahriman.models.package import Package
+
+
+class Watcher:
+
+    def __init__(self, architecture: str, config: Configuration) -> None:
+        self.architecture = architecture
+        self.repository = Repository(architecture, config)
+
+        self.known: Dict[str, Tuple[Package, BuildStatus]] = {}
+
+    @property
+    def packages(self) -> List[Tuple[Package, BuildStatus]]:
+        return [pair for pair in self.known.values()]
+
+    def load(self) -> None:
+        for package in self.repository.packages():
+            # get status of build or assign unknown
+            current = self.known.get(package.base)
+            if current is None:
+                status = BuildStatus()
+            else:
+                _, status = current
+            self.known[package.base] = (package, status)
+
+    def remove(self, base: str) -> None:
+        self.known.pop(base, None)
+
+    def update(self, base: str, status: BuildStatusEnum, package: Optional[Package]) -> None:
+        if package is None:
+            package, _ = self.known[base]
+        full_status = BuildStatus(status)
+        self.known[base] = (package, full_status)

src/ahriman/models/build_status.py

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import datetime
+
+from enum import Enum
+from typing import Optional, Union
+
+
+class BuildStatusEnum(Enum):
+    Unknown = 'unknown'
+    Pending = 'pending'
+    Building = 'building'
+    Failed = 'failed'
+    Success = 'success'
+
+
+class BuildStatus:
+
+    def __init__(self, status: Union[BuildStatusEnum, str, None] = None,
+                 timestamp: Optional[datetime.datetime] = None) -> None:
+        self.status = BuildStatusEnum(status) if status else BuildStatusEnum.Unknown
+        self._timestamp = timestamp or datetime.datetime.utcnow()
+
+    @property
+    def timestamp(self) -> str:
+        return self._timestamp.strftime('%Y-%m-%d %H:%M:%S')

src/ahriman/models/package.py

@@ -25,7 +25,6 @@ import aur
 import os
 import tempfile
 
-from configparser import RawConfigParser
 from dataclasses import dataclass, field
 from srcinfo.parse import parse_srcinfo
 from typing import Set, Type
@@ -38,9 +37,13 @@ from ahriman.core.util import check_output
 class Package:
     base: str
     version: str
-    url: str
+    aur_url: str
     packages: Set[str] = field(default_factory=set)
 
+    @property
+    def git_url(self) -> str:
+        return f'{self.aur_url}/{self.base}.git'
+
     @property
     def is_vcs(self) -> bool:
         return self.base.endswith('-bzr') \
@@ -50,6 +53,10 @@ class Package:
                or self.base.endswith('-hg')\
                or self.base.endswith('-svn')
 
+    @property
+    def web_url(self) -> str:
+        return f'{self.aur_url}/packages/{self.base}'
+
     # additional method to handle vcs versions
     def actual_version(self) -> str:
         if not self.is_vcs:
@@ -58,7 +65,7 @@ class Package:
         from ahriman.core.build_tools.task import Task
         clone_dir = tempfile.mkdtemp()
         try:
-            Task.fetch(clone_dir, self.url)
+            Task.fetch(clone_dir, self.git_url)
             # update pkgver first
             check_output('makepkg', '--nodeps', '--noprepare', '--nobuild',
                          exception=None, cwd=clone_dir)
@@ -75,37 +82,32 @@ class Package:
     @classmethod
     def from_archive(cls: Type[Package], path: str, aur_url: str) -> Package:
         package, base, version = check_output('expac', '-p', '%n %e %v', path, exception=None).split()
-        return cls(base, version, f'{aur_url}/{base}.git', packages={package})
+        return cls(base, version, aur_url, {package})
 
     @classmethod
     def from_aur(cls: Type[Package], name: str, aur_url: str)-> Package:
         package = aur.info(name)
-        return cls(package.package_base, package.version, f'{aur_url}/{package.package_base}.git',
-                   packages={package.name})
+        return cls(package.package_base, package.version, aur_url, {package.name})
 
     @classmethod
-    def from_build(cls: Type[Package], path: str) -> Package:
-        git_config = RawConfigParser()
-        git_config.read(os.path.join(path, '.git', 'config'))
-
+    def from_build(cls: Type[Package], path: str, aur_url: str) -> Package:
         with open(os.path.join(path, '.SRCINFO')) as fn:
             src_info, errors = parse_srcinfo(fn.read())
         if errors:
             raise InvalidPackageInfo(errors)
         packages = set(src_info['packages'].keys())
 
-        return cls(src_info['pkgbase'], f'{src_info["pkgver"]}-{src_info["pkgrel"]}',
-                   git_config.get('remote "origin"', 'url'), packages-packages)
+        return cls(src_info['pkgbase'], f'{src_info["pkgver"]}-{src_info["pkgrel"]}', aur_url, packages)
 
-    @classmethod
-    def load(cls: Type[Package], path: str, aur_url: str) -> Package:
+    @staticmethod
+    def load(path: str, aur_url: str) -> Package:
         try:
             if os.path.isdir(path):
-                package: Package = cls.from_build(path)
+                package: Package = Package.from_build(path, aur_url)
             elif os.path.exists(path):
-                package = cls.from_archive(path, aur_url)
+                package = Package.from_archive(path, aur_url)
             else:
-                package = cls.from_aur(path, aur_url)
+                package = Package.from_aur(path, aur_url)
             return package
         except InvalidPackageInfo:
             raise

src/ahriman/models/report_settings.py

@@ -20,7 +20,6 @@
 from __future__ import annotations
 
 from enum import Enum, auto
-from typing import Type
 
 from ahriman.core.exceptions import InvalidOptionException
 
@@ -28,8 +27,8 @@ from ahriman.core.exceptions import InvalidOptionException
 class ReportSettings(Enum):
     HTML = auto()
 
-    @classmethod
-    def from_option(cls: Type[ReportSettings], value: str) -> ReportSettings:
+    @staticmethod
+    def from_option(value: str) -> ReportSettings:
         if value.lower() in ('html',):
-            return cls.HTML
+            return ReportSettings.HTML
         raise InvalidOptionException(value)

src/ahriman/models/sign_settings.py

@@ -20,7 +20,6 @@
 from __future__ import annotations
 
 from enum import Enum, auto
-from typing import Type
 
 from ahriman.core.exceptions import InvalidOptionException
 
@@ -30,12 +29,12 @@ class SignSettings(Enum):
     SignPackages = auto()
     SignRepository = auto()
 
-    @classmethod
-    def from_option(cls: Type[SignSettings], value: str) -> SignSettings:
+    @staticmethod
+    def from_option(value: str) -> SignSettings:
         if value.lower() in ('no', 'disabled'):
-            return cls.Disabled
+            return SignSettings.Disabled
         elif value.lower() in ('package', 'packages', 'sign-package'):
-            return cls.SignPackages
+            return SignSettings.SignPackages
         elif value.lower() in ('repository', 'sign-repository'):
-            return cls.SignRepository
+            return SignSettings.SignRepository
         raise InvalidOptionException(value)

src/ahriman/models/upload_settings.py

@@ -20,7 +20,6 @@
 from __future__ import annotations
 
 from enum import Enum, auto
-from typing import Type
 
 from ahriman.core.exceptions import InvalidOptionException
 
@@ -29,10 +28,10 @@ class UploadSettings(Enum):
     Rsync = auto()
     S3 = auto()
 
-    @classmethod
-    def from_option(cls: Type[UploadSettings], value: str) -> UploadSettings:
+    @staticmethod
+    def from_option(value: str) -> UploadSettings:
         if value.lower() in ('rsync',):
-            return cls.Rsync
+            return UploadSettings.Rsync
         elif value.lower() in ('s3',):
-            return cls.S3
+            return UploadSettings.S3
         raise InvalidOptionException(value)

src/ahriman/web/__init__.py

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

src/ahriman/web/middlewares/__init__.py

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

src/ahriman/web/middlewares/exception_handler.py

@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from aiohttp.web import middleware, Request, Response
+from logging import Logger
+from typing import Callable
+
+from aiohttp.web_exceptions import HTTPClientError
+
+
+def exception_handler(logger: Logger) -> Callable:
+    @middleware
+    async def handle(request: Request, handler: Callable) -> Response:
+        try:
+            return await handler(request)
+        except HTTPClientError:
+            raise
+        except Exception:
+            logger.exception(f'exception during performing request to {request.path}', exc_info=True)
+            raise
+
+    return handle

src/ahriman/web/routes.py

@@ -0,0 +1,34 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from aiohttp.web import Application
+
+from ahriman.web.views.index import IndexView
+from ahriman.web.views.package import PackageView
+from ahriman.web.views.packages import PackagesView
+
+
+def setup_routes(app: Application) -> None:
+    app.router.add_get('/', IndexView)
+    app.router.add_get('/index.html', IndexView)
+
+    app.router.add_post('/api/v1/packages', PackagesView)
+
+    app.router.add_delete('/api/v1/packages/{package}', PackageView)
+    app.router.add_post('/api/v1/packages/{package}', PackageView)

src/ahriman/web/views/__init__.py

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

src/ahriman/web/views/base.py

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

src/ahriman/web/views/index.py

@@ -0,0 +1,47 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from typing import Any, Dict
+
+from aiohttp_jinja2 import template
+
+from ahriman.web.views.base import BaseView
+
+
+class IndexView(BaseView):
+
+    @template("index.jinja2")
+    async def get(self) -> Dict[str, Any]:
+        # some magic to make it jinja-readable
+        packages = [
+            {
+                'base': package.base,
+                'packages': [p for p in sorted(package.packages)],
+                'status': status.status.value,
+                'timestamp': status.timestamp,
+                'version': package.version,
+                'web_url': package.web_url
+            } for package, status in sorted(self.service.packages, key=lambda item: item[0].base)
+        ]
+
+        return {
+            'architecture': self.service.architecture,
+            'packages': packages,
+            'repository': self.service.repository.name,
+        }

src/ahriman/web/views/package.py

@@ -0,0 +1,43 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from aiohttp.web import HTTPOk, Response
+
+from ahriman.models.build_status import BuildStatusEnum
+from ahriman.models.package import Package
+from ahriman.web.views.base import BaseView
+
+
+class PackageView(BaseView):
+
+    async def delete(self) -> Response:
+        base = self.request.match_info['package']
+        self.service.remove(base)
+
+        return HTTPOk()
+
+    async def post(self) -> Response:
+        base = self.request.match_info['package']
+        data = await self.request.json()
+
+        package = Package(**data['package']) if 'package' in data else None
+        status = BuildStatusEnum(data.get('status', 'unknown'))
+        self.service.update(base, status, package)
+
+        return HTTPOk()

src/ahriman/web/views/packages.py

@@ -0,0 +1,30 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+from aiohttp.web import HTTPOk, Response
+
+from ahriman.web.views.base import BaseView
+
+
+class PackagesView(BaseView):
+
+    async def post(self) -> Response:
+        self.service.load()
+
+        return HTTPOk()

src/ahriman/web/web.py

@@ -0,0 +1,73 @@
+#
+# Copyright (c) 2021 Evgenii Alekseev.
+#
+# This file is part of ahriman 
+# (see https://github.com/arcan1s/ahriman).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+import aiohttp_jinja2
+import jinja2
+import logging
+
+from aiohttp import web
+
+from ahriman.core.configuration import Configuration
+from ahriman.core.exceptions import InitializeException
+from ahriman.core.watcher.watcher import Watcher
+from ahriman.web.middlewares.exception_handler import exception_handler
+from ahriman.web.routes import setup_routes
+
+
+async def on_shutdown(app: web.Application) -> None:
+    app.logger.warning('server terminated')
+
+
+async def on_startup(app: web.Application) -> None:
+    app.logger.info('server started')
+    try:
+        app['watcher'].load()
+    except Exception as e:
+        app.logger.exception('could not load packages', exc_info=True)
+        raise InitializeException() from e
+
+
+def run_server(app: web.Application) -> None:
+    app.logger.info('start server')
+    web.run_app(app,
+                host=app['config'].get('web', 'host'),
+                port=app['config'].getint('web', 'port'),
+                handle_signals=False)
+
+
+def setup_service(architecture: str, config: Configuration) -> web.Application:
+    app = web.Application(logger=logging.getLogger('http'))
+    app.on_shutdown.append(on_shutdown)
+    app.on_startup.append(on_startup)
+
+    app.middlewares.append(web.normalize_path_middleware(append_slash=False, remove_slash=True))
+    app.middlewares.append(exception_handler(app.logger))
+
+    app.logger.info('setup routes')
+    setup_routes(app)
+    app.logger.info('setup templates')
+    aiohttp_jinja2.setup(app, loader=jinja2.FileSystemLoader(config.get('web', 'templates')))
+
+    app.logger.info('setup configuration')
+    app['config'] = config
+
+    app.logger.info('setup watcher')
+    app['watcher'] = Watcher(architecture, config)
+
+    return app