[CalendarServer-changes] [8986] CalendarServer/trunk/calendarserver/tools/shell/vfs.py

[source_changes at macosforge.org]

Revision: 8986
          http://trac.macosforge.org/projects/calendarserver/changeset/8986
Author:   wsanchez at apple.com
Date:     2012-04-05 11:52:39 -0700 (Thu, 05 Apr 2012)
Log Message:
-----------
Improve info for calendar object and calendar home.

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/tools/shell/vfs.py

Modified: CalendarServer/trunk/calendarserver/tools/shell/vfs.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/shell/vfs.py	2012-04-05 00:13:26 UTC (rev 8985)
+++ CalendarServer/trunk/calendarserver/tools/shell/vfs.py	2012-04-05 18:52:39 UTC (rev 8986)
@@ -19,6 +19,7 @@
 """
 
 from cStringIO import StringIO
+from time import strftime, localtime
 
 from twisted.python import log
 from twisted.internet.defer import succeed
@@ -378,7 +379,7 @@
 
             if rows:
                 result.append("Directory Record:")
-                result.append(tableString(rows, header=("Name", "Value")))
+                result.append(tableString(rows))
 
             #
             # Group memberships
@@ -462,30 +463,21 @@
 
     @inlineCallbacks
     def describe(self):
-        # created() -> int
-        # modified() -> int
-        # properties -> IPropertyStore
+        result = ["Calendar home:\n"]
 
+        #
+        # Attributes
+        #
         uid          = (yield self.home.uid())
         created      = (yield self.home.created())
         modified     = (yield self.home.modified())
         quotaUsed    = (yield self.home.quotaUsedBytes())
         quotaAllowed = (yield self.home.quotaAllowedBytes())
-        properties   = (yield self.home.properties())
 
-        result = []
-        result.append("Calendar home for UID: %s\n" % (uid,))
-
-        #
-        # Attributes
-        #
         rows = []
-        if created is not None:
-            # FIXME: convert to formatted string
-            rows.append(("Created", str(created)))
-        if modified is not None:
-            # FIXME: convert to formatted string
-            rows.append(("Last modified", str(modified)))
+        rows.append(("UID", uid))
+        rows.append(("Created"      , timeString(created)))
+        rows.append(("Last modified", timeString(modified)))
         if quotaUsed is not None:
             rows.append((
                 "Quota",
@@ -495,16 +487,16 @@
 
         if len(rows):
             result.append("Attributes:")
-            result.append(tableString(rows, header=("Name", "Value")))
+            result.append(tableString(rows))
 
         #
         # Properties
         #
+        properties = (yield self.home.properties())
         if properties:
             result.append("Properties:")
             result.append(tableString(
-                ((name, properties[name]) for name in sorted(properties)),
-                header=("Name", "Value")
+                ((name.toString(), properties[name]) for name in sorted(properties))
             ))
 
         returnValue("\n".join(result))
@@ -593,6 +585,11 @@
     def describe(self):
         (yield self.lookup())
 
+        description = ["Calendar object:\n"]
+
+        #
+        # Calendar object attributes
+        #
         rows = []
 
         rows.append(("UID", self.uid))
@@ -609,16 +606,44 @@
 
             rows.append(("Organizer", "%s%s%s" % (organizer.value(), name, email)))
 
+        rows.append(("Created" , timeString(self.object.created())))
+        rows.append(("Modified", timeString(self.object.modified())))
+
+        description.append("Attributes:")
+        description.append(tableString(rows))
+
         #
         # Attachments
         #
         attachments = (yield self.object.attachments())
         for attachment in attachments:
-            rows.append(("Attachment", "%s (%d bytes)" % (attachment.name(), attachment.size())))
+            contentType = attachment.contentType()
+            contentType = "%s/%s" % (contentType.mediaType, contentType.mediaSubtype)
 
-        returnValue("Calendar object:\n%s" % tableString(rows))
+            rows = []
+            rows.append(("Name"        , attachment.name()))
+            rows.append(("Size"        , "%s bytes" % (attachment.size(),)))
+            rows.append(("Content Type", contentType))
+            rows.append(("MD5 Sum"     , attachment.md5()))
+            rows.append(("Created"     , timeString(attachment.created())))
+            rows.append(("Modified"    , timeString(attachment.modified())))
 
+            description.append("Attachment:")
+            description.append(tableString(rows))
 
+        #
+        # Properties
+        #
+        properties = (yield self.object.properties())
+        if properties:
+            result.append("Properties:")
+            result.append(tableString(
+                ((name.toString(), properties[name]) for name in sorted(properties))
+            ))
+
+        returnValue("\n".join(description))
+
+
 class AddressBookHomeFolder(Folder):
     """
     Address book home folder.
@@ -641,3 +666,10 @@
     output = StringIO()
     table.printTable(os=output)
     return output.getvalue()
+
+
+def timeString(time):
+    if time is None:
+        return "(unknown)"
+
+    return strftime("%a, %d %b %Y %H:%M:%S %z(%Z)", localtime(time))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120405/58dfc939/attachment.html>