From 134360df2e0da3c8c5987ba1c42c2fd3ef9c8231 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jan 05 2024 10:00:44 +0000 Subject: mark draft rpms in web ui lists --- diff --git a/www/kojiweb/rpmlist.chtml b/www/kojiweb/rpmlist.chtml index 6ba83aa..0586275 100644 --- a/www/kojiweb/rpmlist.chtml +++ b/www/kojiweb/rpmlist.chtml @@ -65,7 +65,7 @@ colspan="2" #slurp #for $rpm in $rpms #set $epoch = ($rpm.epoch != None and $str($rpm.epoch) + ':' or '') - $util.escapeHTML($rpm.name)-$epoch$rpm.version-$rpm.release.${rpm.arch}.rpm + $util.formatRPM($rpm) #if $type in ['component', 'image'] #if $rpm.external_repo_id == 0 internal diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py index 5720db8..014add4 100644 --- a/www/lib/kojiweb/util.py +++ b/www/lib/kojiweb/util.py @@ -568,6 +568,25 @@ def formatLink(url): return url +def formatRPM(rpminfo, link=True): + """Format an rpm dict for display""" + rpminfo = rpminfo.copy() + if rpminfo.get('epoch'): + rpminfo['epoch'] = str(rpminfo['epoch']) + ':' + else: + rpminfo['epoch'] = '' + if rpminfo.get('draft'): + rpminfo['suffix'] = f" (draft_{rpminfo.get('build_id', '???')})" + else: + rpminfo['suffix'] = '' + label = escapeHTML("%(name)s-%(epoch)s%(version)s-%(release)s.%(arch)s%(suffix)s" % rpminfo) + if link: + rpm_id = rpminfo['id'] + return f'{label}' + else: + return label + + def rowToggle(template): """If the value of template._rowNum is even, return 'row-even'; if it is odd, return 'row-odd'. Increment the value before checking it.