Add support for per calendar colors.

diff --git a/calypso/webdav.py b/calypso/webdav.py
index e059d1963bd01791179c3aed3aacdf1f3f62f5da..34aacce4e812f05a4c3ec60b410bdcb9bb2fe83f 100644 (file)
--- a/calypso/webdav.py
+++ b/calypso/webdav.py
@@ -584,6 +584,14 @@ class Collection(object):
             _text = _text + item.text
         return _text
 
+    @property
+    def color(self):
+        """Color."""
+        try:
+            return "#%s" % self.metadata.get('collection', 'color')
+        except (ConfigParser.NoSectionError, ConfigParser.NoOptionError, ValueError):
+            return None
+
     @property
     def headers(self):
         """Find headers items in collection."""

diff --git a/calypso/xmlutils.py b/calypso/xmlutils.py
index af2ad86a6768ae2a4cd4ffff824b350ede4ff655..7f9c67427ee1b984842e83f1918dd21bce5a5d4b 100644 (file)
--- a/calypso/xmlutils.py
+++ b/calypso/xmlutils.py
@@ -46,6 +46,7 @@ NAMESPACES = {
     "C": "urn:ietf:params:xml:ns:caldav",
     "A": "urn:ietf:params:xml:ns:carddav",
     "D": "DAV:",
+    "E": "http://apple.com/ns/ical/",
     "CS": "http://calendarserver.org/ns/"}
 
 log = logging.getLogger(__name__)
@@ -177,6 +178,8 @@ def propfind(path, xml_request, collection, depth, context):
                 element.text = item.etag
             elif tag == _tag("D", "displayname") and is_collection:
                 element.text = collection.name
+            elif tag == _tag("E", "calendar-color") and is_collection:
+                element.text = collection.color
             elif tag == _tag("D", "principal-URL"):
                 # TODO: use a real principal URL, read rfc3744-4.2 for info
                 tag = ET.Element(_tag("D", "href"))