<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13703] CalendarServer/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13703">13703</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-29 17:39:56 -0700 (Sun, 29 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure attendees can EXDATE an invite that the organizer has deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdatafiltershiddeninstancepy">CalendarServer/trunk/twistedcaldav/datafilters/hiddeninstance.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_icalendarpy">CalendarServer/trunk/twistedcaldav/test/test_icalendar.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingitippy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/itip.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkrequirementsdevtxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-dev.txt (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/requirements-dev.txt 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -7,4 +7,4 @@
</span><span class="cx"> mockldap
</span><span class="cx"> q
</span><span class="cx"> --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@13420#egg=CalDAVClientLibrary
</span><del>---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13695#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@13702#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdatafiltershiddeninstancepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/datafilters/hiddeninstance.py (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/datafilters/hiddeninstance.py 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/twistedcaldav/datafilters/hiddeninstance.py 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx">
</span><span class="cx"> from twistedcaldav.datafilters.filter import CalendarFilter
</span><del>-from twistedcaldav.ical import Component, ignoredComponents, Property
</del><ins>+from twistedcaldav.ical import Component, ignoredComponents
</ins><span class="cx">
</span><span class="cx"> __all__ = [
</span><span class="cx"> "HiddenInstanceFilter",
</span><span class="lines">@@ -50,10 +50,7 @@
</span><span class="cx">
</span><span class="cx"> # Add EXDATE and try to preserve same timezone as DTSTART
</span><span class="cx"> if master is not None:
</span><del>- dtstart = master.getProperty("DTSTART")
- if dtstart is not None and not dtstart.value().isDateOnly() and dtstart.value().local():
- rid.adjustTimezone(dtstart.value().getTimezone())
- master.addProperty(Property("EXDATE", [rid, ]))
</del><ins>+ master.addExdate(rid)
</ins><span class="cx">
</span><span class="cx"> return ical
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -1708,6 +1708,21 @@
</span><span class="cx"> return rid in new_rids
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def addExdate(self, exdate):
+ """
+ Add an EXDATE to a master recurring component and ensure the value type, TZID
+ etc match the DTSTART of the master. This method assumes that L{self} is the
+ master component - no checking of that will be done.
+
+ @param exdate: the exdate to add
+ @type exdate: L{DateTime}
+ """
+ dtstart = self.getProperty("DTSTART")
+ if dtstart is not None and not dtstart.value().isDateOnly() and dtstart.value().local():
+ exdate.adjustTimezone(dtstart.value().getTimezone())
+ self.addProperty(Property("EXDATE", [exdate, ]))
+
+
</ins><span class="cx"> def resourceUID(self):
</span><span class="cx"> """
</span><span class="cx"> @return: the UID of the subcomponents in this component.
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -2888,7 +2888,7 @@
</span><span class="cx"> except ResourceDeletedError:
</span><span class="cx"> # This is OK - it just means the server deleted the resource during the PUT. We make it look
</span><span class="cx"> # like the PUT succeeded.
</span><del>- response = responsecode.CREATED if self.exists() else responsecode.NO_CONTENT
</del><ins>+ response = responsecode.NO_CONTENT if self.exists() else responsecode.CREATED
</ins><span class="cx">
</span><span class="cx"> # Re-initialize to get stuff setup again now we have no object
</span><span class="cx"> self._initializeWithObject(None, self._newStoreParent)
</span><span class="lines">@@ -3622,7 +3622,7 @@
</span><span class="cx"> except ResourceDeletedError:
</span><span class="cx"> # This is OK - it just means the server deleted the resource during the PUT. We make it look
</span><span class="cx"> # like the PUT succeeded.
</span><del>- response = responsecode.CREATED if self.exists() else responsecode.NO_CONTENT
</del><ins>+ response = responsecode.NO_CONTENT if self.exists() else responsecode.CREATED
</ins><span class="cx">
</span><span class="cx"> # Re-initialize to get stuff setup again now we have no object
</span><span class="cx"> self._initializeWithObject(None, self._newStoreParent)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavtesttest_icalendarpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -5673,6 +5673,93 @@
</span><span class="cx"> self.fail("Valid calendar should validate")
</span><span class="cx">
</span><span class="cx">
</span><ins>+
+
+ def test_add_exdate(self):
+ data = ((
+ """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//iCal 3.0//EN
+BEGIN:VTIMEZONE
+TZID:US/Pacific
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:FB81D520-ED27-4DBA-8894-45B7612A7621
+DTSTART;TZID=US/Pacific:20090705T100000
+DTEND;TZID=US/Pacific:20090730T103000
+CREATED:20090604T225706Z
+DTSTAMP:20090604T230500Z
+RRULE:FREQ=DAILY
+SEQUENCE:1
+SUMMARY:TEST
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
+""",
+ (
+ DateTime(2009, 7, 6, 17, 0, 0, tzid=Timezone(utc=True)),
+ DateTime(2009, 7, 6, 10, 0, 0, tzid=Timezone(tzid="US/Pacific")),
+ ),
+
+ """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//iCal 3.0//EN
+BEGIN:VTIMEZONE
+TZID:US/Pacific
+BEGIN:STANDARD
+DTSTART:20071104T020000
+RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
+TZNAME:PST
+TZOFFSETFROM:-0700
+TZOFFSETTO:-0800
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:20070311T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
+TZNAME:PDT
+TZOFFSETFROM:-0800
+TZOFFSETTO:-0700
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VEVENT
+UID:FB81D520-ED27-4DBA-8894-45B7612A7621
+DTSTART;TZID=US/Pacific:20090705T100000
+DTEND;TZID=US/Pacific:20090730T103000
+CREATED:20090604T225706Z
+DTSTAMP:20090604T230500Z
+EXDATE;TZID=US/Pacific:20090706T100000
+RRULE:FREQ=DAILY
+SEQUENCE:1
+SUMMARY:TEST
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
+""",
+ ))
+
+ for exdate in data[1]:
+ calendar = Component.fromString(data[0])
+ result = Component.fromString(data[2])
+ calendar.masterComponent().addExdate(exdate)
+ self.assertEqual(normalize_iCalStr(calendar), normalize_iCalStr(result), "Failed exdate add: {}".format(exdate))
+
+
</ins><span class="cx"> def test_allperuseruids(self):
</span><span class="cx"> data = """BEGIN:VCALENDAR
</span><span class="cx"> VERSION:2.0
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimplicitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/implicit.py 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -1556,9 +1556,13 @@
</span><span class="cx"> if doScheduling:
</span><span class="cx"> # Check to see whether all instances are CANCELLED
</span><span class="cx"> if self.calendar.hasPropertyValueInAllComponents(Property("STATUS", "CANCELLED")):
</span><del>- log.debug("Attendee '{attendee}' is creating CANCELLED event for missing UID: '{uid}' - removing entire event", attendee=self.attendee, uid=self.uid)
- self.return_status = ImplicitScheduler.STATUS_ORPHANED_CANCELLED_EVENT
- returnValue(None)
</del><ins>+ if self.action == "create":
+ log.debug("Attendee '{attendee}' is creating CANCELLED event for missing UID: '{uid}' - removing entire event", attendee=self.attendee, uid=self.uid)
+ self.return_status = ImplicitScheduler.STATUS_ORPHANED_CANCELLED_EVENT
+ returnValue(None)
+ else:
+ log.debug("Attendee '{attendee}' is modifying CANCELLED event for missing UID: '{uid}'", attendee=self.attendee, uid=self.uid)
+ returnValue(None)
</ins><span class="cx"> else:
</span><span class="cx"> # Check to see whether existing event is SCHEDULE-AGENT=CLIENT/NONE
</span><span class="cx"> if self.oldcalendar:
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingitippy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/itip.py (13702 => 13703)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/itip.py 2014-06-30 00:38:21 UTC (rev 13702)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/itip.py 2014-06-30 00:39:56 UTC (rev 13703)
</span><span class="lines">@@ -309,7 +309,8 @@
</span><span class="cx">
</span><span class="cx"> # If we have any EXDATEs lets add them to the existing calendar object.
</span><span class="cx"> if exdates and calendar_master:
</span><del>- calendar_master.addProperty(Property("EXDATE", exdates))
</del><ins>+ for exdate in exdates:
+ calendar_master.addExdate(exdate)
</ins><span class="cx">
</span><span class="cx"> # See if there are still components in the calendar - we might have deleted the last overridden instance
</span><span class="cx"> # in which case the calendar object is empty (except for VTIMEZONEs) or has only hidden components.
</span></span></pre>
</div>
</div>
</body>
</html>