[Piuparts-commits] rev 268 - piatti/home/piupartsm piatti/org/piuparts.debian.org/htdocs/images trunk

[Holger Levsen]

Author: holger
Date: 2009-03-16 17:33:24 +0000 (Mon, 16 Mar 2009)
New Revision: 268

Added:
   piatti/org/piuparts.debian.org/htdocs/images/vcss.png
Removed:
   piatti/org/piuparts.debian.org/htdocs/images/vcss.gif
Modified:
   piatti/home/piupartsm/crontab
   trunk/piuparts-report.py
Log:
generate reports only twice per day, improve output a bit

Modified: piatti/home/piupartsm/crontab
===================================================================
--- piatti/home/piupartsm/crontab	2009-03-16 15:54:08 UTC (rev 267)
+++ piatti/home/piupartsm/crontab	2009-03-16 17:33:24 UTC (rev 268)
@@ -8,5 +8,5 @@
 # create reports every six hour
 #  (dinstall runs 1|7|13|19:52, so this is long after mirror pushes...)
 #
-42 4,10,16,22 * * * PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages nice python /org/piuparts.debian.org/share/piuparts/piuparts-report.py > ~piupartsm/reports.log
+0 6,18 * * * PYTHONPATH=/org/piuparts.debian.org/lib/python2.4/site-packages:/org/piuparts.debian.org/lib/python2.5/site-packages nice python /org/piuparts.debian.org/share/piuparts/piuparts-report.py > ~piupartsm/reports.log
 

Deleted: piatti/org/piuparts.debian.org/htdocs/images/vcss.gif

Added: piatti/org/piuparts.debian.org/htdocs/images/vcss.png
===================================================================
(Binary files differ)


Property changes on: piatti/org/piuparts.debian.org/htdocs/images/vcss.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/piuparts-report.py
===================================================================
--- trunk/piuparts-report.py	2009-03-16 15:54:08 UTC (rev 267)
+++ trunk/piuparts-report.py	2009-03-16 17:33:24 UTC (rev 268)
@@ -100,7 +100,7 @@
     <img border="0" src="/images/valid-html401.png" alt="Valid HTML 4.01!" height="31" width="88">
 </a>
 <a href="http://jigsaw.w3.org/css-validator/check/referer">
-    <img border="0" src="/images/vcss.gif" alt="Valid CSS!"  height="31" width="88">
+    <img border="0" src="/images/vcss.png" alt="Valid CSS!"  height="31" width="88">
 </a>
     
 </body>
@@ -124,7 +124,7 @@
 STATE_BODY_TEMPLATE = """
 <div id="main">
 <h1>Packages in state "%(state)s"</h1>
-<p>This page contains a list of package in state "%(state)s". Last updated: %(time)s.</p>
+<p>This page contains a list of packages in state "%(state)s". Last updated: %(time)s.</p>
 %(list)s
 </div>
 """
@@ -133,8 +133,8 @@
 SECTION_STATS_BODY_TEMPLATE = """
 <div id="main">
 <h1>Statistics of packages per section</h1>
-<p>This page contains some statistics about packages piuparts is looking
-at.</p>
+<p>This page contains some statistics about packages from <pre>%(packages-url)s</pre>piuparts is looking
+at. Last updated: %(time)s.</p>
 %(table)s
 </div>
 """
@@ -155,7 +155,7 @@
  </p>
 
  <p>
-  reports:
+  <b>Distributions tested:</b>:
   <ul>
    <li><a href="/sid/">sid</a></li>
    <li><a href="/squeeze/">squeeze</a></li>
@@ -163,7 +163,7 @@
   </ul>
  </p>
 
- <p>These pages are updated every six hours. Last update: %(time)s </p>
+ <p>These pages are updated at 6 and 18 UTC. Last update completed at %(time)s.</p>
 </div>
 """
 
@@ -392,7 +392,11 @@
                       st.get_total_packages()
             table += "</table>\n"
             write_file(os.path.join(self._output_directory, "index.html"),
-                       HTML_HEADER + SECTION_STATS_BODY_TEMPLATE % { "table": table } + HTML_FOOTER)
+                       HTML_HEADER + SECTION_STATS_BODY_TEMPLATE % {
+                                                                    "packages-url": html_protect(self._config["packages-url"]), 
+                                                                    "time": time.strftime("%Y-%m-%d %H:%M:%S %z"),
+                                                                    "table": table,
+                                                                    } + HTML_FOOTER)
 
             for state in st.get_states():
                 logging.debug("Writing page for %s" % state)