From c66325ff385a54ad35f61c4e9f204e0c913607d0 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Fri, 12 Mar 2021 00:14:31 +0300 Subject: [PATCH] fix interaction with web --- package/share/ahriman/build-status.jinja2 | 2 ++ src/ahriman/core/watcher/client.py | 10 ++++++---- src/ahriman/web/views/index.py | 3 +++ src/ahriman/web/views/package.py | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package/share/ahriman/build-status.jinja2 b/package/share/ahriman/build-status.jinja2 index 1b5756f6..3c56f070 100644 --- a/package/share/ahriman/build-status.jinja2 +++ b/package/share/ahriman/build-status.jinja2 @@ -58,6 +58,8 @@ +

ahriman {{ version|e }}

+ diff --git a/src/ahriman/core/watcher/client.py b/src/ahriman/core/watcher/client.py index cdb11ee6..bc14ebd5 100644 --- a/src/ahriman/core/watcher/client.py +++ b/src/ahriman/core/watcher/client.py @@ -79,10 +79,12 @@ class WebClient(Client): payload: Dict[str, Any] = { 'status': status.value, - 'base': package.base, - 'packages': [p for p in package.packages], - 'version': package.version, - 'url': package.web_url + 'package': { + 'base': package.base, + 'packages': [p for p in package.packages], + 'version': package.version, + 'aur_url': package.aur_url + } } try: diff --git a/src/ahriman/web/views/index.py b/src/ahriman/web/views/index.py index c7f83756..506c0004 100644 --- a/src/ahriman/web/views/index.py +++ b/src/ahriman/web/views/index.py @@ -20,6 +20,8 @@ from aiohttp_jinja2 import template from typing import Any, Dict +import ahriman.version as version + from ahriman.web.views.base import BaseView @@ -43,4 +45,5 @@ class IndexView(BaseView): 'architecture': self.service.architecture, 'packages': packages, 'repository': self.service.repository.name, + 'version': version.__version__, } \ No newline at end of file diff --git a/src/ahriman/web/views/package.py b/src/ahriman/web/views/package.py index 0548a3a1..1ecd8463 100644 --- a/src/ahriman/web/views/package.py +++ b/src/ahriman/web/views/package.py @@ -37,7 +37,7 @@ class PackageView(BaseView): data = await self.request.json() package = Package(**data['package']) if 'package' in data else None - status = BuildStatusEnum(data.get('status', 'unknown')) + status = BuildStatusEnum(data['status']) self.service.update(base, status, package) return HTTPOk()
package base