[Git][qa/jenkins.debian.net][master] refactoring

[Holger Levsen (@holger)]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
d3832884 by Holger Levsen at 2024-03-23T13:29:25+01:00
refactoring

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


2 changed files:

- bin/rblib/html.py
- bin/reproducible_html_live_status.py


Changes:

=====================================
bin/rblib/html.py
=====================================
@@ -152,6 +152,14 @@ def write_html_page(title, body, destfile, no_header=False, style_note=False,
         fd.write(html)
 
 
+def convert_into_status_html(statusname):
+    if statusname == 'None':
+        return ''
+    status = Status.get(statusname)
+    return '{n} <img src="/static/{icon}" alt="{n}" title="{n}" />'.format(
+            n=status.value.name, icon=status.value.icon)
+
+
 def gen_status_link_icon(status, spokenstatus, icon, suite, arch):
     """
     Returns the html for "<icon> <spokenstatus>" with both icon and status


=====================================
bin/reproducible_html_live_status.py
=====================================
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2015-2023 Holger Levsen <holger at layer-acht.org>
+# Copyright © 2015-2024 Holger Levsen <holger at layer-acht.org>
 #           © 2018      Mattia Rizzolo <mattia at mapreri.org>
 # based on ~jenkins.d.n:~mattia/status.sh by Mattia Rizzolo <mattia at mapreri.org>
 # Licensed under GPL-2
@@ -15,7 +15,7 @@ from rblib import query_db, db_table
 from rblib.confparse import log
 from rblib.models import Package, Status
 from rblib.utils import convert_into_hms_string
-from rblib.html import tab, create_main_navigation, write_html_page
+from rblib.html import tab, create_main_navigation, write_html_page, convert_into_status_html
 from reproducible_html_indexes import build_leading_text_section
 from rblib.const import (
     DISTRO_BASE, DISTRO_URL, DISTRO_URI,
@@ -29,13 +29,6 @@ sources = db_table('sources')
 schedule = db_table('schedule')
 stats_build = db_table('stats_build')
 
-def convert_into_status_html(statusname):
-    if statusname == 'None':
-        return ''
-    status = Status.get(statusname)
-    return '{n} <img src="/static/{icon}" alt="{n}" title="{n}" />'.format(
-            n=status.value.name, icon=status.value.icon)
-
 
 def generate_schedule(arch):
     """ the schedule pages are very different than others index pages """



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/d38328849eeae87cedb827a3dfcd8b7eb818f9ff

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/d38328849eeae87cedb827a3dfcd8b7eb818f9ff
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20240323/cb498c01/attachment-0001.htm>