started nicer NEW .html pages

diff --git a/dak/examine_package.py b/dak/examine_package.py
index 217186c3280888230540754dad679e6ffb542de3..8143eacaf7874c7f64705f2ecde645cf523efa54 100755 (executable)
--- a/dak/examine_package.py
+++ b/dak/examine_package.py
@@ -97,9 +97,14 @@ def escape_if_needed(s):
   else:
     return s
   
-def headline(s, level=2):
+def headline(s, level=2, bodyelement=None):
   if use_html:
-    print "<h%d>%s</h%d>" % (level, html_escape(s), level)
+    if bodyelement:
+      print """<thead>
+          <tr><th colspan="2" class="title" onclick="toggle('%(bodyelement)s', 'table-row-group', 'table-row-group')">%(title)s</th></tr>
+        </thead>"""%{"bodyelement":bodyelement,"title":html_escape(s)}
+    else:
+      print "<h%d>%s</h%d>" % (level, html_escape(s), level)
   else:
     print "---- %s ----" % (s)
 
@@ -440,9 +445,48 @@ def strip_pgp_signature (filename):
     return contents
 
 # Display the .changes [without the signature]
-def display_changes (changes_filename):
-    headline(".changes file for %s" % (changes_filename))
+def display_changes(changes_filename):
+    if use_html:
+        print """<div id="changes-wrap"><a name="changes" />
+                   <table class="infobox rfc822">"""
+    headline(changes_filename, bodyelement="changes-body")
+    if use_html:
+        print """    <tbody id="changes-body" class="infobody">"""
+        print """<tr><td>"""
     print_formatted_text(strip_pgp_signature(changes_filename))
+    if use_html:
+        print """</td></tr>"""
+        """ <!--
+        1. Join multiline fields
+        2. s/^\s*\.?//gm
+        3. s#\n#<br/>#g
+        4. s#^\([^ :]*:\)\s*\(.*\)$#<tr><td class="key">\1</td><td class="val">\2</td></tr>#
+        5. Special handling for homepage, distribution, bugs
+        -->
+          <tr><td class="key">Format:</td><td class="val">1.7</td></tr>
+          <tr><td class="key">Date:</td><td class="val">Mon, 24 Dec 2007 15:32:08 -0200</td></tr>
+          <tr><td class="key">Source:</td><td class="val">php-xdebug</td></tr>
+          <tr><td class="key">Binary:</td><td class="val">php5-xdebug</td></tr>
+          <tr><td class="key">Architecture:</td><td class="val">source amd64</td></tr>
+          <tr><td class="key">Version:</td><td class="val">2.0.2-1</td></tr>
+          <tr><td class="key">Distribution:</td><td class="val"><span class="dist-unstable">unstable</span></td></tr>
+          <tr><td class="key">Urgency:</td><td class="val">low</td></tr>
+          <tr><td class="key">Maintainer:</td><td class="val">Marcelo Jorge Vieira (metal) &lt;metal@alucinados.com&gt;</td></tr>
+          <tr><td class="key">Changed-By:</td><td class="val">Marcelo Jorge Vieira (metal) &lt;metal@alucinados.com&gt;</td></tr>
+          <tr><td class="key">Description:</td><td class="val">
+              php5-xdebug - xdebug extension module for PHP5</td></tr>
+          <tr><td class="key">Closes:</td><td class="val"><a href="http://bugs.debian.org/377348">377348</a></td></tr>
+          <tr><td class="key">Changes:</td><td class="val">
+              php-xdebug (2.0.2-1) unstable; urgency=low<br/>
+              <br/>
+              * Initial release (Closes: <a href="http://bugs.debian.org/377348">#377348</a>)</td></tr>
+          <tr><td class="key">Files:</td><td class="val">
+              c6ee78b58a4d70d66f8a70436b2a943c 632 web optional php-xdebug_2.0.2-1.dsc<br/>
+              d3547f74353174884452a51ee9ca687f 279891 web optional php-xdebug_2.0.2.orig.tar.gz<br/>
+              8e7c262113c8ac13f47781e0ac0eb4c3 4107 web optional php-xdebug_2.0.2-1.diff.gz<br/>
+              3c6be09f23931fabf0b3048575390ed3 137930 web optional php5-xdebug_2.0.2-1_amd64.deb</td></tr>
+              """
+        print """</tbody></table></div>"""
 
 def check_changes (changes_filename):
     display_changes(changes_filename)

diff --git a/dak/show_new.py b/dak/show_new.py
index 674eca391917220e7c297db232c72520be8d2fc6..445f6d2a54888521abf67b706fa61be20d0af6b4 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -44,54 +44,94 @@ sources = set()
 ################################################################################
 ################################################################################
 
-def html_header(name):
+def html_header(name, filestoexamine):
     if name.endswith('.changes'):
         name = ' '.join(name.split('_')[:2])
-    print """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-        <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8">"""
-    print "<title>%s - Debian NEW package overview</title>" % (name)
-    print """<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>"""
-    print """<td rowspan="2" class="reddy">Debian NEW package overview for %s</td>""" % (name)
-    print """<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"
+    />
+    <title>%(name)s - Debian NEW package overview</title>
+    <link type="text/css" rel="stylesheet" href="style.css" />
+    <link rel="shortcut icon" href="http://www.debian.org/favicon.ico" />
+    <script type="text/javascript">
+      //<![CDATA[
+      <!--
+      function toggle(id, initial, display) {
+        var o = document.getElementById(id);
+        toggleObj(o, initial, display);
+      }
+      function toggleObj(o, initial, display) {
+        if(! o.style.display)
+          o.style.display = initial;
+        if(o.style.display == display) {
+          o.style.display = "none";
+        } else {
+          o.style.display = display;
+        }
+      }
+      //-->
+      //]]>
+    </script>
+  </head>
+  <body>
+    <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 package overview for %(name)s
+      </span>
+    </div>
+    """%{"name":name}
+
+    # we assume only one source (.dsc) per changes here
+    print """
+    <div id="menu">
+      <p class="title">Navigation</p>
+      <p><a href="#changes">.changes</a></p>
+      <p><a href="#dsc">.dsc</a></p>
+      <p><a href="#source-lintian">source lintian</a></p>
+      """
+    for fn in filter(lambda x: x.endswith('.deb') or x.endswith('.udeb'),filestoexamine):
+      packagename = fn.split('_')[0]
+      print """
+      <p class="subtitle">%(pkg)s</p>
+      <p><a href="#binary-%(pkg)s-control">control file</a></p>
+      <p><a href="#binary-%(pkg)s-lintian">binary lintian</a></p>
+      <p><a href="#binary-%(pkg)s-contents">.deb contents</a></p>
+      <p><a href="#binary-%(pkg)s-copyright">copyright</a></p>
+      <p><a href="#binary-%(pkg)s-file-listing">file listing</a></p>
+      """%{"pkg":packagename}
+    print "    </div>"
+   
 def html_footer():
-    print "<p class=\"validate\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
-    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 "</body></html>"
-
+    print """    <p class="validate">Timestamp: %s (UTC)</p>"""% (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+    print """    <p><a href="http://validator.w3.org/check?uri=referer">
+      <img src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"
+      style="border: none; height: 31px; width: 88px" /></a>
+    <a href="http://jigsaw.w3.org/css-validator/check/referer">
+      <img src="http://jigsaw.w3.org/css-validator/images/vcss"
+      alt="Valid CSS!" style="border: none; height: 31px; width: 88px" /></a>
+    </p>
+  </body>
+</html>
+"""
 
 ################################################################################
 
@@ -115,19 +155,24 @@ def do_pkg(changes_file):
     # do not generate html output if that source/version already has one.
     if not os.path.exists(os.path.join(Cnf["Show-New::HTMLPath"],htmlname)):
         sys.stdout = open(os.path.join(Cnf["Show-New::HTMLPath"],htmlname),"w")
-        html_header(changes["source"])
+
+        filestoexamine = []
+        for pkg in new.keys():
+            for fn in new[pkg]["files"]:
+                if ( files[fn].has_key("new") and not
+                     files[fn]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ):
+                    filestoexamine.append(fn)
+
+        html_header(changes["source"], filestoexamine)
 
         daklib.queue.check_valid(new)
         examine_package.display_changes(Upload.pkg.changes_file)
 
-        for pkg in new.keys():
-            for file in new[pkg]["files"]:
-                if ( files[file].has_key("new") and not
-                     files[file]["type"] in [ "orig.tar.gz", "orig.tar.bz2", "tar.gz", "tar.bz2", "diff.gz", "diff.bz2"] ):
-                    if file.endswith(".deb") or file.endswith(".udeb"):
-                        examine_package.check_deb(file)
-                    elif file.endswith(".dsc"):
-                        examine_package.check_dsc(file)
+        for fn in filestoexamine:
+            if fn.endswith(".deb") or fn.endswith(".udeb"):
+                examine_package.check_deb(fn)
+            elif fn.endswith(".dsc"):
+                examine_package.check_dsc(fn)
 
         html_footer()
         if sys.stdout != stdout_fd:
@@ -139,6 +184,7 @@ def do_pkg(changes_file):
 def usage (exit_code=0):
     print """Usage: dak show-new [OPTION]... [CHANGES]...
   -h, --help                show this help and exit.
+  -p, --html-path [path]    override output directory.
   """
     sys.exit(exit_code)
 
@@ -149,7 +195,8 @@ def init():
 
     Cnf = daklib.utils.get_conf()
 
-    Arguments = [('h',"help","Show-New::Options::Help")]
+    Arguments = [('h',"help","Show-New::Options::Help"),
+                 ("p","html-path","Show-New::HTMLPath","HasArg")]
 
     for i in ["help"]:
         if not Cnf.has_key("Show-New::Options::%s" % (i)):
@@ -183,7 +230,7 @@ def main():
         print "\n" + changes_file
         do_pkg (changes_file)
     files = set(os.listdir(Cnf["Show-New::HTMLPath"]))
-    to_delete = files.difference(sources)
+    to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
     for file in to_delete:
         os.remove(os.path.join(Cnf["Show-New::HTMLPath"],file))