[CalendarServer-changes] [3372] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 3372
          http://trac.macosforge.org/projects/calendarserver/changeset/3372
Author:   sagen at apple.com
Date:     2008-11-12 09:27:03 -0800 (Wed, 12 Nov 2008)
Log Message:
-----------
Use the new "canceled" icon

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/mail.py
    CalendarServer/trunk/twistedcaldav/test/test_mail.py

Modified: CalendarServer/trunk/twistedcaldav/mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/mail.py	2008-11-12 03:32:16 UTC (rev 3371)
+++ CalendarServer/trunk/twistedcaldav/mail.py	2008-11-12 17:27:03 UTC (rev 3372)
@@ -772,25 +772,38 @@
         deferred.addErrback(_failure, msgId, fromAddr, toAddr)
 
 
-    def getIconPath(self, details, language='en'):
-        month = int(details['month'])
-        day = int(details['day'])
+    def getIconPath(self, details, canceled, language='en'):
         iconDir = config.Scheduling.iMIP.MailIconsDirectory.rstrip("/")
-        with translationTo(language) as trans:
-            monthName = trans.monthAbbreviation(month)
-        iconName = "%02d.png" % (day,)
-        iconPath = os.path.join(iconDir, monthName, iconName)
-        if not os.path.exists(iconPath):
-            # Try the generic (numeric) version
-            iconPath = os.path.join(iconDir, "%02d" % (month,), iconName)
-        return iconPath
 
+        if canceled:
+            iconName = "canceled.png"
+            iconPath = os.path.join(iconDir, iconName)
+            if os.path.exists(iconPath):
+                return iconPath
+            else:
+                return None
 
+        else:
+            month = int(details['month'])
+            day = int(details['day'])
+            with translationTo(language) as trans:
+                monthName = trans.monthAbbreviation(month)
+            iconName = "%02d.png" % (day,)
+            iconPath = os.path.join(iconDir, monthName, iconName)
+            if not os.path.exists(iconPath):
+                # Try the generic (numeric) version
+                iconPath = os.path.join(iconDir, "%02d" % (month,), iconName)
+                if not os.path.exists(iconPath):
+                    return None
+            return iconPath
+
+
     def generateEmail(self, newInvitation, calendar, orgEmail, orgCN,
         attendees, fromAddress, replyToAddress, toAddress, language='en'):
 
         details = self.getEventDetails(calendar, language=language)
-        iconPath = self.getIconPath(details, language=language)
+        canceled = (calendar.propertyValue("METHOD") == "CANCEL")
+        iconPath = self.getIconPath(details, canceled, language=language)
 
         with translationTo(language):
             msg = MIMEMultipart()
@@ -801,7 +814,6 @@
             msgId = messageid()
             msg["Message-ID"] = msgId
 
-            canceled = (calendar.propertyValue("METHOD") == "CANCEL")
             if canceled:
                 formatString = _("Event canceled: %(summary)s")
             elif newInvitation:

Modified: CalendarServer/trunk/twistedcaldav/test/test_mail.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/test_mail.py	2008-11-12 03:32:16 UTC (rev 3371)
+++ CalendarServer/trunk/twistedcaldav/test/test_mail.py	2008-11-12 17:27:03 UTC (rev 3372)
@@ -31,7 +31,7 @@
         self.dataDir = os.path.join(os.path.dirname(__file__), "data", "mail")
 
     def test_iconPath(self):
-        iconPath = self.handler.getIconPath({'day':'1', 'month':'1'}, language='en')
+        iconPath = self.handler.getIconPath({'day':'1', 'month':'1'}, False, language='en')
         iconDir = "/usr/share/caldavd/share/date_icons"
         if os.path.exists("%s/JAN/01.png" % (iconDir,)):
             self.assertEquals(iconPath, "%s/JAN/01.png" % (iconDir,))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081112/1bd84790/attachment.html>