Author: Matti Picus <[email protected]>
Branch: add-header-to-nightly
Changeset: r878:6c6f461b0392
Date: 2013-11-06 22:53 +0200
http://bitbucket.org/pypy/buildbot/changeset/6c6f461b0392/
Log: handle directory listings
diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py
--- a/bot2/pypybuildbot/pypylist.py
+++ b/bot2/pypybuildbot/pypylist.py
@@ -5,7 +5,7 @@
import cgi
import urllib
import sys
-from twisted.web.static import File
+from twisted.web.static import File, formatFileSize
from buildbot.status.web.base import DirectoryLister
class PyPyTarball(object):
@@ -165,6 +165,15 @@
for f, rowClass in zip(files, rowClasses):
f["class"] = rowClass
self._add_test_results(f, rowClass)
+ for d in dirs:
+ dirname = urllib.unquote(d['href'])
+ dd = py.path.local(self.path).join(dirname)
+ date = datetime.date.fromtimestamp(dd.mtime())
+ d['date'] = date.isoformat()
+ # Assume dir is non-recursive
+ size = sum([f.size() for f in dd.listdir() if f.isfile()])
+ d['size'] = formatFileSize(size)
+
return dirs, files
def _add_test_results(self, element, rowClass):
diff --git a/master/templates/directory.html b/master/templates/directory.html
--- a/master/templates/directory.html
+++ b/master/templates/directory.html
@@ -40,6 +40,7 @@
<table>
+{% if files|length > 1 %}
<tr class="{{ row_class.next() }}">
<th>Filename</th>
<th>Size</th>
@@ -47,13 +48,23 @@
<th><i>own</i> tests</th>
<th><i>applevel</i> tests</th>
</tr>
+{% else %}
+<tr class="{{ row_class.next() }}">
+<th>Directory</th>
+<th>Size</th>
+<th>Date</th>
+<th></th>
+<th></th>
+</tr>
+{% endif %}
{% for d in directories %}
<tr class="{{ row_class.next() }}">
<td><a href="{{ d.href }}"><b>{{ d.text }}</b></a></td>
- <td><b>{{ d.size }}</b></td>
- <td><b>{{ d.type }}</b></td>
- <td><b>{{ d.encoding }}</b></td>
+ <td>{{ d.size}}</td>
+ <td>{{ d.date}}</td>
+ <td></td>
+ <td></td>
</tr>
{% endfor %}
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
