diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 1f8c1f30..1ec53030 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -23,7 +23,7 @@ optdepends=('aws-cli: sync to s3' source=("https://github.com/arcan1s/ahriman/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz" 'ahriman.sysusers' 'ahriman.tmpfiles') -sha512sums=('1af6c022bb1cf3bb55cb3ba426673ee73f98bd1a4de2191033a2d09bd73c6afb10c2a14ac3c70daa6ecbf7a62385178005f5276ee6a9942dc295d7c49d7ed412' +sha512sums=('119520b7791bf231cfbe0de9f0a2611ff8c3c692e20c60c31b15cd0b0bcfe35a8b527f3003314d51a4af52a5f5e0b6f3b89bcc41c3b8127e2e812d657c505627' '13718afec2c6786a18f0b223ef8e58dccf0688bca4cdbe203f14071f5031ed20120eb0ce38b52c76cfd6e8b6581a9c9eaa2743eb11abbaca637451a84c33f075' '55b20f6da3d66e7bbf2add5d95a3b60632df121717d25a993e56e737d14f51fe063eb6f1b38bd81cc32e05db01c0c1d80aaa720c45cde87f238d8b46cdb8cbc4') backup=('etc/ahriman.ini' diff --git a/package/share/ahriman/build-status.jinja2 b/package/share/ahriman/build-status.jinja2 index fa79d1c5..3d36e9d1 100644 --- a/package/share/ahriman/build-status.jinja2 +++ b/package/share/ahriman/build-status.jinja2 @@ -11,7 +11,11 @@
-

ahriman {{ version|e }} ({{ architecture|e }})

+

ahriman + {{ version|e }} + {{ architecture|e }} + {{ service.status|e }} +

{% include "search-line.jinja2" %} @@ -39,8 +43,6 @@
diff --git a/src/ahriman/models/build_status.py b/src/ahriman/models/build_status.py index 5002b171..0535cfe7 100644 --- a/src/ahriman/models/build_status.py +++ b/src/ahriman/models/build_status.py @@ -39,6 +39,21 @@ class BuildStatusEnum(Enum): Failed = 'failed' Success = 'success' + def badges_color(self) -> str: + ''' + convert itself to shield.io badges color + :return: shields.io color + ''' + if self == BuildStatusEnum.Pending: + return 'yellow' + elif self == BuildStatusEnum.Building: + return 'yellow' + elif self == BuildStatusEnum.Failed: + return 'critical' + elif self == BuildStatusEnum.Success: + return 'success' + return 'inactive' + class BuildStatus: ''' diff --git a/src/ahriman/web/views/index.py b/src/ahriman/web/views/index.py index 36c2f3d1..89fd18e5 100644 --- a/src/ahriman/web/views/index.py +++ b/src/ahriman/web/views/index.py @@ -36,7 +36,7 @@ class IndexView(BaseView): packages - sorted list of packages properties: base, packages (sorted list), status, timestamp, version, web_url. Required repository - repository name, string, required - service - service status properties: status, timestamp. Required + service - service status properties: status, status_color, timestamp. Required version - ahriman version, string, required ''' @@ -59,6 +59,7 @@ class IndexView(BaseView): ] service = { 'status': self.service.status.status.value, + 'status_color': self.service.status.status.badges_color(), 'timestamp': self.service.status.timestamp }