# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1288794159 25200
# Node ID af73a3fda72397a7f852256667a604c07e70329d
# Parent  0cfb84d788d6b0cc9b61a177270bf90ca0094695
add more metadata to files: modification time, type

diff -r 0cfb84d788d6 -r af73a3fda723 decoupage/web.py
--- a/decoupage/web.py	Wed Oct 27 09:42:58 2010 -0700
+++ b/decoupage/web.py	Wed Nov 03 07:22:39 2010 -0700
@@ -7,8 +7,8 @@
 
 from contenttransformer.app import FileTypeTransformer
 from contenttransformer.app import transformers
+from datetime import datetime
 from formatters import formatters
-
 from genshi.builder import Markup
 from genshi.template import TemplateLoader
 from genshi.template.base import TemplateError
@@ -108,6 +108,7 @@
         """
         return response to a GET requst
         """
+        
         # ensure a sane path        
         path = request.path_info.strip('/')
         directory = os.path.join(self.directory, path)
@@ -121,6 +122,8 @@
         data = {'path': path, 'files': files, 'request': request }
 
         # defaults; TODO: make this better
+        # there shouldn't need to be defaults;
+        # iirc, genshi has a mode where these will default to None
         data['title'] = conf.get('/title')
         data['directory'] = directory
         data['include'] = None
@@ -165,7 +168,6 @@
                             break
                     else:
                         raise IOError("template %s not found" % template)
-                
         try:
             template = self.loader.load(template)
             res = template.generate(**data).render('html', doctype='html')
@@ -175,6 +177,7 @@
                 return self.fileserver(local_index)
             raise
 
+        # return response
         return Response(content_type='text/html', body=res)
 
 
@@ -183,15 +186,18 @@
     def filedata(self, path, directory, conf):
         files = []
 
-        # TODO: other items to add
-        # type: 'file' or 'directory'
-        # last_modified
-        # created
-
         for i in os.listdir(directory):
+            filepath = os.path.join(directory, i)
+            filetype = 'file'
+            if os.path.isdir(filepath):
+                filetype = 'directory'
+            modified = os.path.getmtime(filepath)
+            modified = datetime.fromtimestamp(modified)
             files.append({'path' : '%s/%s' % (path.rstrip('/'), i),
                           'name': i,
-                          'description': conf.get(i.lower(), None)})
+                          'modified': modified,
+                          'description': conf.get(i.lower(), None),
+                          'type': filetype})
         
         # TODO: deal with other links in conf