display file size in directory.xhtml

diff --git a/src/allmydata/web/directory.xhtml b/src/allmydata/web/directory.xhtml
index a290d1fe8a0493fc92abd16fe7c87a669e500136..98fe00e77938c87d91b3f4dabc9e6b9be91a9435 100644 (file)
--- a/src/allmydata/web/directory.xhtml
+++ b/src/allmydata/web/directory.xhtml
@@ -17,12 +17,14 @@
   <tr n:pattern="header">
     <td>Filename</td>
     <td>Type</td>
+    <td>Size</td>
     <td>URI</td>
     <td></td>
   </tr>
   <tr n:pattern="item" n:render="row">
     <td><n:slot name="filename"/></td>
     <td><n:slot name="type"/></td>
+    <td><n:slot name="size"/></td>
     <td><n:slot name="uri"/></td>
     <td><n:slot name="delete"/></td>
   </tr>

diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index 26e4d050aa43c7357f855f1eb724528ffc58e1e8..b8dce062578fe9a113aa0171c79877e4c17d4ed9 100644 (file)
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -4,6 +4,7 @@ from twisted.web import static, resource, server, html
 from twisted.python import util, log
 from nevow import inevow, rend, loaders, appserver, url, tags as T
 from allmydata.util import idlib
+from allmydata.uri import unpack_uri
 from allmydata.interfaces import IDownloadTarget#, IDownloader
 from allmydata import upload
 from zope.interface import implements, Interface
@@ -126,6 +127,10 @@ class Directory(rend.Page):
             dl_uri_url = dl_uri_url.add("filename", name)
             ctx.fillSlots("uri", T.a(href=dl_uri_url)[html.escape(uri)])
 
+            #extract and display file size
+            unpacked = unpack_uri(uri)
+            ctx.fillSlots("size", unpacked[9])
+
             # this creates a button which will cause our child__delete method
             # to be invoked, which deletes the file and then redirects the
             # browser back to this directory
@@ -142,6 +147,7 @@ class Directory(rend.Page):
             ctx.fillSlots("filename",
                           T.a(href=subdir_url)[html.escape(name)])
             ctx.fillSlots("type", "DIR")
+            ctx.fillSlots("size", "-")
             ctx.fillSlots("uri", "-")
             ctx.fillSlots("delete", "-")
         return ctx.tag