[dak/master] html fun
* daklib/utils.py: move the html escape stuff here.
* dak/examine_package.py: Remove the html escape stuff.
* dak/queue_report.py: lotsa html changes to get more info on the
page and to get Tinchos css foo working.
* web/style.css: Added new stuff from Tincho
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
ChangeLog | 11 +++
dak/examine_package.py | 16 +---
dak/queue_report.py | 220 +++++++++++++++++++++++++++++------------------
daklib/utils.py | 8 ++
web/style.css | 102 ++++++++++++++++++++++
5 files changed, 262 insertions(+), 95 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f3f16af..61903eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-12-19 Joerg Jaspert <joerg@debian.org>
+
+ * daklib/utils.py: move the html escape stuff here.
+
+ * dak/examine_package.py: Remove the html escape stuff.
+
+ * dak/queue_report.py: lotsa html changes to get more info on the
+ page and to get Tinchos css foo working.
+
+ * web/style.css: Added new stuff from Tincho
+
2008-12-16 Joerg Jaspert <joerg@debian.org>
* config/debian/cron.dinstall: Run logs.py as last command before
diff --git a/dak/examine_package.py b/dak/examine_package.py
index ae3ec6c..c7ab7ad 100755
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -55,9 +55,6 @@ re_version = re.compile('^(.*)\((.*)\)')
re_newlinespace = re.compile('\n')
re_spacestrip = re.compile('(\s)')
-html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
-re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
-
################################################################################
Cnf = None
@@ -89,12 +86,9 @@ PACKAGE can be a .changes, .dsc, .deb or .udeb filename."""
################################################################################
# probably xml.sax.saxutils would work as well
-def html_escape(s):
- return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
-
def escape_if_needed(s):
if use_html:
- return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
+ return utils.re_html_escaping.sub(lambda x: utils.html_escaping.get(x.group(0)), s)
else:
return s
@@ -103,9 +97,9 @@ def headline(s, level=2, bodyelement=None):
if bodyelement:
print """<thead>
<tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s <span class="toggle-msg">(click to toggle)</span></th></tr>
- </thead>"""%{"bodyelement":bodyelement,"title":html_escape(s)}
+ </thead>"""%{"bodyelement":bodyelement,"title":utils.html_escape(s)}
else:
- print "<h%d>%s</h%d>" % (level, html_escape(s), level)
+ print "<h%d>%s</h%d>" % (level, utils.html_escape(s), level)
else:
print "---- %s ----" % (s)
@@ -130,7 +124,7 @@ html_colours = {
def colour_output(s, colour):
if use_html:
- return ("%s%s%s" % (html_colours[colour][0], html_escape(s), html_colours[colour][1]))
+ return ("%s%s%s" % (html_colours[colour][0], utils.html_escape(s), html_colours[colour][1]))
else:
return ("%s%s%s" % (ansi_colours[colour], s, ansi_colours['end']))
@@ -146,7 +140,7 @@ def formatted_text(s, strip=False):
if use_html:
if strip:
s = s.strip()
- return "<pre>%s</pre>" % (html_escape(s))
+ return "<pre>%s</pre>" % (utils.html_escape(s))
else:
return s
diff --git a/dak/queue_report.py b/dak/queue_report.py
index aa1c54d..33e2659 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -36,6 +36,7 @@
import copy, glob, os, stat, sys, time
import apt_pkg
+import cgi
from daklib import queue
from daklib import utils
from daklib.dak_exceptions import *
@@ -157,100 +158,133 @@ def sortfunc(a,b):
############################################################
def header():
- print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
- <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Debian NEW and BYHAND Packages</title>
- <link type="text/css" rel="stylesheet" href="style.css">
- <link rel="shortcut icon" href="http://www.debian.org/favicon.ico";>
- </head>
- <body>
- <div align="center">
- <a href="http://www.debian.org/";>
- <img src="http://www.debian.org/logos/openlogo-nd-50.png"; border="0" hspace="0" vspace="0" alt=""></a>
- <a href="http://www.debian.org/";>
- <img src="http://www.debian.org/Pics/debian.png"; border="0" hspace="0" vspace="0" alt="Debian Project"></a>
- </div>
- <br />
- <table class="reddy" width="100%">
- <tr>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-upperleft.png"; align="left" border="0" hspace="0" vspace="0"
- alt="" width="15" height="16"></td>
- <td rowspan="2" class="reddy">Debian NEW and BYHAND Packages</td>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-upperright.png"; align="right" border="0" hspace="0" vspace="0"
- alt="" width="16" height="16"></td>
- </tr>
- <tr>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-lowerleft.png"; align="left" border="0" hspace="0" vspace="0"
- alt="" width="16" height="16"></td>
- <td class="reddy">
- <img src="http://www.debian.org/Pics/red-lowerright.png"; align="right" border="0" hspace="0" vspace="0"
- alt="" width="15" height="16"></td>
- </tr>
- </table>
- """
+ print """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="de" lang="de">
+ <head>
+ <meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8" />
+ <link type="text/css" rel="stylesheet" href="style.css" />
+ <link rel="shortcut icon" href="http://www.debian.org/favicon.ico"; />
+ <title>
+ Debian NEW and BYHAND Packages
+ </title>
+ </head>
+ <body id="NEW">
+ <div id="logo">
+ <a href="http://www.debian.org/";>
+ <img src="http://www.debian.org/logos/openlogo-nd-50.png";
+ alt="debian logo" /></a>
+ <a href="http://www.debian.org/";>
+ <img src="http://www.debian.org/Pics/debian.png";
+ alt="Debian Project" /></a>
+ </div>
+ <div id="titleblock">
+
+ <img src="http://www.debian.org/Pics/red-upperleft.png";
+ id="red-upperleft" alt="corner image"/>
+ <img src="http://www.debian.org/Pics/red-lowerleft.png";
+ id="red-lowerleft" alt="corner image"/>
+ <img src="http://www.debian.org/Pics/red-upperright.png";
+ id="red-upperright" alt="corner image"/>
+ <img src="http://www.debian.org/Pics/red-lowerright.png";
+ id="red-lowerright" alt="corner image"/>
+ <span class="title">
+ Debian NEW and BYHAND Packages
+ </span>
+ </div>
+ """
def footer():
- print "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
- print "<hr><p>Hint: Age is the youngest upload of the package, if there is more than one version.</p>"
- print "<p>You may want to look at <a href=\"http://ftp-master.debian.org/REJECT-FAQ.html\";>the REJECT-FAQ</a> for possible reasons why one of the above packages may get rejected.</p>"
- print """<a href="http://validator.w3.org/check?uri=referer";>
- <img border="0" src="http://www.w3.org/Icons/valid-html401"; alt="Valid HTML 4.01!" height="31" width="88"></a>
- <a href="http://jigsaw.w3.org/css-validator/check/referer";>
- <img border="0" src="http://jigsaw.w3.org/css-validator/images/vcss"; alt="Valid CSS!"
- height="31" width="88"></a>
+ print "<p class=\"timestamp\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+
+ print """
+ <div class="footer">
+ <p>Hint: Age is the youngest upload of the package, if there is more than
+ one version.<br />
+ You may want to look at <a href="http://ftp-master.debian.org/REJECT-FAQ.html";>the REJECT-FAQ</a>
+ for possible reasons why one of the above packages may get rejected.</p>
+ <p>
+ <a href="http://validator.w3.org/check?uri=referer";><img src="http://www.w3.org/Icons/valid-xhtml10";
+ alt="Valid XHTML 1.0 Strict" height="31" width="88" /></a>
+ <a href="http://jigsaw.w3.org/css-validator/";>
+ <img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss";
+ alt="Valid CSS!" />
+ </a>
+ </p>
+ </div> </body> </html>
"""
- print "</body></html>"
-def table_header(type):
+def table_header(type, source_count, total_count):
print "<h1>Summary for: %s</h1>" % (type)
- print """<center><table border="0">
+ print """
+ <table class="NEW">
+ <caption>
+ """
+ print "Package count in <strong>%s</strong>: <em>%s</em> | Total Package count: <em>%s</em>" % (type, source_count, total_count)
+ print """
+ </caption>
+ <thead>
<tr>
- <th align="center">Package</th>
- <th align="center">Version</th>
- <th align="center">Arch</th>
- <th align="center">Distribution</th>
- <th align="center">Age</th>
- <th align="center">Maintainer</th>
- <th align="center">Closes</th>
+ <th>Package</th>
+ <th>Version</th>
+ <th>Arch</th>
+ <th>Distribution</th>
+ <th>Age</th>
+ <th>Upload info</th>
+ <th>Closes</th>
</tr>
- """
+ </thead>
+ <tbody>
+ """
-def table_footer(type, source_count, total_count):
- print "</table></center><br>\n"
- print "<p class=\"validate\">Package count in <b>%s</b>: <i>%s</i>\n" % (type, source_count)
- print "<br>Total Package count: <i>%s</i></p>\n" % (total_count)
+def table_footer(type):
+ print "</tbody></table>"
-def table_row(source, version, arch, last_mod, maint, distribution, closes):
+def table_row(source, version, arch, last_mod, maint, distribution, closes, fingerprint, sponsor, changedby):
global row_number
+ trclass = "sid"
+ for dist in distribution:
+ if dist == "experimental":
+ trclass = "exp"
+
if row_number % 2 != 0:
- print "<tr class=\"even\">"
+ print "<tr class=\"%s even\">" % (trclass)
else:
- print "<tr class=\"odd\">"
+ print "<tr class=\"%s odd\">" % (trclass)
- tdclass = "sid"
- for dist in distribution:
- if dist == "experimental":
- tdclass = "exp"
- print "<td valign=\"top\" class=\"%s\">%s</td>" % (tdclass, source)
- print "<td valign=\"top\" class=\"%s\">" % (tdclass)
+ print "<td class=\"package\">%s</td>" % (source)
+ print "<td class=\"version\">"
for vers in version.split():
- print "<a href=\"/new/%s_%s.html\">%s</a><br>" % (source, vers, vers)
- print "</td><td valign=\"top\" class=\"%s\">%s</td><td valign=\"top\" class=\"%s\">" % (tdclass, arch, tdclass)
+ print "<a href=\"/new/%s_%s.html\">%s</a><br/>" % (source, utils.html_escape(vers), utils.html_escape(vers))
+ print "</td>"
+ print "<td class=\"arch\">%s</td>" % (arch)
+ print "<td class=\"distribution\">"
for dist in distribution:
- print "%s<br>" % (dist)
- print "</td><td valign=\"top\" class=\"%s\">%s</td>" % (tdclass, last_mod)
+ print "%s<br/>" % (dist)
+ print "</td>"
+ print "<td class=\"age\">%s</td>" % (last_mod)
(name, mail) = maint.split(":")
- print "<td valign=\"top\" class=\"%s\"><a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a></td>" % (tdclass, mail, name)
- print "<td valign=\"top\" class=\"%s\">" % (tdclass)
+ print "<td class=\"upload-data\">"
+ print "<span class=\"maintainer\">Maintainer: <a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
+ (name, mail) = changedby.split(":")
+ print "<span class=\"changed-by\">Changed-By: <a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
+
+ try:
+ (login, domain) = sponsor.split("@")
+ print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a></span>@debian.org<br/>" % (utils.html_escape(login), utils.html_escape(login))
+ except:
+ pass
+
+ print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
+ print "</td>"
+
+ print "<td class=\"closes\">"
for close in closes:
- print "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s\";>#%s</a><br>" % (close, close)
+ print "<a href=\"http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%s\";>#%s</a><br/>" % (utils.html_escape(close), utils.html_escape(close))
print "</td></tr>"
row_number+=1
@@ -306,11 +340,15 @@ def process_changes_files(changes_files, type):
max_source_len = 0
max_version_len = 0
max_arch_len = 0
- maintainer = {}
- maint=""
- distribution=""
- closes=""
for i in per_source_items:
+ maintainer = {}
+ maint=""
+ distribution=""
+ closes=""
+ fingerprint=""
+ changeby = {}
+ changedby=""
+ sponsor=""
last_modified = time.time()-i[1]["oldest"]
source = i[1]["list"][0]["source"]
if len(source) > max_source_len:
@@ -328,8 +366,22 @@ def process_changes_files(changes_files, type):
maintainer["maintainername"] = "Unknown"
maintainer["maintaineremail"] = "Unknown"
maint="%s:%s" % (maintainer["maintainername"], maintainer["maintaineremail"])
+ # ...likewise for the Changed-By: field if it exists.
+ try:
+ (changeby["changedby822"], changeby["changedby2047"],
+ changeby["changedbyname"], changeby["changedbyemail"]) = \
+ utils.fix_maintainer (j["changed-by"])
+ except ParseMaintError, msg:
+ (changeby["changedby822"], changeby["changedby2047"],
+ changeby["changedbyname"], changeby["changedbyemail"]) = \
+ ("", "", "", "")
+ changedby="%s:%s" % (changeby["changedbyname"], changeby["changedbyemail"])
+
distribution=j["distribution"].keys()
closes=j["closes"].keys()
+ fingerprint=j["fingerprint"]
+ if j.has_key("sponsoremail"):
+ sponsor=j["sponsoremail"]
for arch in j["architecture"].keys():
arches[arch] = ""
version = j["version"]
@@ -346,7 +398,7 @@ def process_changes_files(changes_files, type):
note = " | [N]"
else:
note = ""
- entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes])
+ entries.append([source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby])
# direction entry consists of "Which field, which direction, time-consider" where
# time-consider says how we should treat last_modified. Thats all.
@@ -391,20 +443,20 @@ def process_changes_files(changes_files, type):
# Output for a html file. First table header. then table_footer.
# Any line between them is then a <tr> printed from subroutine table_row.
if len(entries) > 0:
- table_header(type.upper())
- for entry in entries:
- (source, version_list, arch_list, note, last_modified, maint, distribution, closes) = entry
- table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes)
total_count = len(changes_files)
source_count = len(per_source_items)
- table_footer(type.upper(), source_count, total_count)
+ table_header(type.upper(), source_count, total_count)
+ for entry in entries:
+ (source, version_list, arch_list, note, last_modified, maint, distribution, closes, fingerprint, sponsor, changedby) = entry
+ table_row(source, version_list, arch_list, time_pp(last_modified), maint, distribution, closes, fingerprint, sponsor, changedby)
+ table_footer(type.upper())
else:
# The "normal" output without any formatting.
format="%%-%ds | %%-%ds | %%-%ds%%s | %%s old\n" % (max_source_len, max_version_len, max_arch_len)
msg = ""
for entry in entries:
- (source, version_list, arch_list, note, last_modified, undef, undef, undef) = entry
+ (source, version_list, arch_list, note, last_modified, undef, undef, undef, undef, undef, undef) = entry
msg += format % (source, version_list, arch_list, note, time_pp(last_modified))
if msg:
diff --git a/daklib/utils.py b/daklib/utils.py
index fc1465d..47c80f3 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -50,6 +50,9 @@ re_verwithext = re.compile(r"^(\d+)(?:\.(\d+))(?:\s+\((\S+)\))?$")
re_srchasver = re.compile(r"^(\S+)\s+\((\S+)\)$")
+html_escaping = {'"':'"', '&':'&', '<':'<', '>':'>'}
+re_html_escaping = re.compile('|'.join(map(re.escape, html_escaping.keys())))
+
default_config = "/etc/dak/dak.conf"
default_apt_config = "/etc/dak/apt.conf"
@@ -62,6 +65,11 @@ known_hashes = [("sha1", apt_pkg.sha1sum, (1, 8)),
################################################################################
+def html_escape(s):
+ return re_html_escaping.sub(lambda x: html_escaping.get(x.group(0)), s)
+
+################################################################################
+
def open_file(filename, mode='r'):
try:
f = open(filename, mode)
diff --git a/web/style.css b/web/style.css
index b942d1b..cb42771 100644
--- a/web/style.css
+++ b/web/style.css
@@ -300,3 +300,105 @@ a:hover{
#NEW-details-page td pre {
margin: 0pt
}
+
+/*
+ * Added by Tincho 2008/12/18
+ */
+#NEW p {
+ font-weight: normal;
+}
+#NEW div.footer {
+ border-top: 1px solid black;
+}
+#NEW p.timestamp {
+ text-align: right;
+ font-size: 90%;
+ font-family: monospace;
+ margin: 0px;
+}
+table.NEW {
+ margin: auto auto;
+ width: 95%;
+}
+table.NEW tr {
+ background-color: #FFF;
+ text-align: left;
+}
+table.NEW tr.exp td.package, table.NEW tr.exp td.distribution, table.NEW tr.exp td.arch, table.NEW tr.exp td.age {
+ color: #c00;
+}
+table.NEW tr.sid {
+ color: #000;
+}
+table.NEW tr.odd {
+ background-color: #FFFFFF;
+}
+table.NEW tr.even {
+ background-color: #e8e8e8;
+}
+table.NEW td {
+ vertical-align: top;
+}
+table.NEW td.upload-data {
+}
+table.NEW span.signature {
+ font-size: 60%;
+}
+table.NEW caption {
+ caption-side: bottom;
+ background-color: #FFF;
+}
+/*
+ * Copied from removals-style.css
+ */
+a img {
+ text-decoration: none;
+ border: none;
+}
+#logo {
+ text-align: center;
+ margin-bottom: 1.5em;
+}
+#titleblock {
+ position: relative;
+ width: 100%;
+ text-align: center;
+ background-color: #DF0451;
+ color: #FFFF00;
+ padding: 0.2em;
+}
+ .titleblock a {
+ color: #FFFF00;
+ text-decoration: none;
+ }
+ .titleblock a:hover {
+ color: #FFFF00;
+ text-decoration: underline;
+ }
+ #red-upperleft {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ }
+ #red-lowerleft {
+ position: absolute;
+ bottom: 0px;
+ left: 0px;
+ }
+ #red-upperright {
+ position: absolute;
+ top: 0px;
+ right: 0px;
+ }
+ #red-lowerright {
+ position: absolute;
+ bottom: 0px;
+ right: 0px;
+ }
+ .title {
+ vertical-align: middle;
+ font-weight: normal;
+ font-family: serif;
+ font-size: 22px;
+ }
+
--
1.5.6.5
Reply to: