[CalendarServer-changes] [5724] CalDAVClientLibrary/trunk/src/browser/commands/ls.py

[source_changes at macosforge.org]

Revision: 5724
          http://trac.macosforge.org/projects/calendarserver/changeset/5724
Author:   cdaboo at apple.com
Date:     2010-06-10 14:37:14 -0700 (Thu, 10 Jun 2010)
Log Message:
-----------
Added -d option to include DAV:displayname in long listing.

Modified Paths:
--------------
    CalDAVClientLibrary/trunk/src/browser/commands/ls.py

Modified: CalDAVClientLibrary/trunk/src/browser/commands/ls.py
===================================================================
--- CalDAVClientLibrary/trunk/src/browser/commands/ls.py	2010-06-10 20:55:11 UTC (rev 5723)
+++ CalDAVClientLibrary/trunk/src/browser/commands/ls.py	2010-06-10 21:37:14 UTC (rev 5724)
@@ -32,13 +32,17 @@
         
         longlist = False
         path = None
+        displayname = False
 
-        opts, args = getopt.getopt(shlex.split(options), 'al')
+        opts, args = getopt.getopt(shlex.split(options), 'adl')
 
         for name, _ignore_value in opts:
             
             if name == "-a":
                 pass
+            elif name == "-d":
+                displayname = True
+                longlist = True
             elif name == "-l":
                 longlist = True
             else:
@@ -62,7 +66,7 @@
 
         props = (davxml.resourcetype,)
         if longlist:
-            props += (davxml.getcontentlength, davxml.getlastmodified,)
+            props += (davxml.displayname, davxml.getcontentlength, davxml.getlastmodified,)
         results = self.shell.account.session.getPropertiesOnHierarchy(resource, props)
         items = results.keys()
         items.sort()
@@ -75,7 +79,10 @@
                 if not size:
                     size = "0"
                 modtime = props.get(davxml.getlastmodified, "-")
-                print "% 8s %s %s" % (size, modtime, rurl[len(path):])
+                if displayname:
+                    print "% 8s %s %s '%s'" % (size, modtime, rurl[len(path):], props.get(davxml.displayname, ''))
+                else:
+                    print "% 8s %s %s" % (size, modtime, rurl[len(path):])
             else:
                 print rurl[len(path):]
             
@@ -89,6 +96,7 @@
 PATH is a relative or absolute path.
 
 Options:
+-d   long listing + DAV:displayname
 -l   long listing
 """ % (name,)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100610/b098074d/attachment.html>