From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 19B92138806 for ; Sun, 17 Dec 2017 17:00:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D08DE0C39; Sun, 17 Dec 2017 17:00:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CE92CE0C39 for ; Sun, 17 Dec 2017 16:59:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C8D7B33BE19 for ; Sun, 17 Dec 2017 16:59:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 403934C92 for ; Sun, 17 Dec 2017 16:59:57 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1513529989.1d281c78d02de7a55fc918aa414d7e9620d8e101.mgorny@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: pkgcheck2html/, htdocs/ X-VCS-Repository: proj/qa-scripts X-VCS-Files: htdocs/pkgcheck2html.css pkgcheck2html/output.html.jinja pkgcheck2html/pkgcheck2html.py X-VCS-Directories: htdocs/ pkgcheck2html/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1d281c78d02de7a55fc918aa414d7e9620d8e101 X-VCS-Branch: master Date: Sun, 17 Dec 2017 16:59:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: dc96e921-6972-4424-b78b-5b3958ae2d9c X-Archives-Hash: 63fd19a8640080ea1a4dfa3ff7b4833f commit: 1d281c78d02de7a55fc918aa414d7e9620d8e101 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 17 16:59:49 2017 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 17 16:59:49 2017 +0000 URL: https://gitweb.gentoo.org/proj/qa-scripts.git/commit/?id=1d281c78 pkgcheck2html: Group results by class htdocs/pkgcheck2html.css | 8 ++++++++ pkgcheck2html/output.html.jinja | 21 +++++++++++++++------ pkgcheck2html/pkgcheck2html.py | 14 +++++++++----- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/htdocs/pkgcheck2html.css b/htdocs/pkgcheck2html.css index eb17b19..44862ce 100644 --- a/htdocs/pkgcheck2html.css +++ b/htdocs/pkgcheck2html.css @@ -171,6 +171,14 @@ tr.warn td:hover text-overflow: ellipsis; } +li.heading +{ + font-size: 125%; + color: white; + background-color: #463C65; + padding-left: .75em; +} + .warn a { color: orange; diff --git a/pkgcheck2html/output.html.jinja b/pkgcheck2html/output.html.jinja index f8d6bf5..80c5167 100644 --- a/pkgcheck2html/output.html.jinja +++ b/pkgcheck2html/output.html.jinja @@ -14,14 +14,23 @@

issues

diff --git a/pkgcheck2html/pkgcheck2html.py b/pkgcheck2html/pkgcheck2html.py index da5dee5..ffdf76a 100755 --- a/pkgcheck2html/pkgcheck2html.py +++ b/pkgcheck2html/pkgcheck2html.py @@ -4,6 +4,7 @@ # 2-clause BSD license import argparse +import collections import datetime import io import json @@ -77,11 +78,14 @@ def deep_group(it, level = 1): def find_of_class(it, cls, level = 2): + out = collections.defaultdict(set) + for g, r in group_results(it, level): for x in r: if x.css_class == cls: - yield g - break + out[getattr(x, 'class')].add(g) + + return [(k, sorted(v)) for k, v in sorted(out.items())] def get_result_timestamp(paths): @@ -125,9 +129,9 @@ def main(*args): out = t.render( results = deep_group(results), - warnings = list(find_of_class(results, 'warn')), - staging = list(find_of_class(results, 'staging')), - errors = list(find_of_class(results, 'err')), + warnings = find_of_class(results, 'warn'), + staging = find_of_class(results, 'staging'), + errors = find_of_class(results, 'err'), ts = ts, )