<!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>[14384] 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/14384">14384</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-06 14:32:49 -0800 (Fri, 06 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix per-user data during splitting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkrequirementsdevtxt">CalendarServer/trunk/requirements-dev.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavicaldavpy">CalendarServer/trunk/twistedcaldav/icaldav.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodgetpy">CalendarServer/trunk/twistedcaldav/method/get.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_calendar_querypy">CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_commonpy">CalendarServer/trunk/twistedcaldav/method/report_common.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavresourcepy">CalendarServer/trunk/twistedcaldav/resource.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstorebridgepy">CalendarServer/trunk/twistedcaldav/storebridge.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.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 (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-dev.txt 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/requirements-dev.txt 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -8,4 +8,4 @@
</span><span class="cx"> q
</span><span class="cx"> tl.eggdeps
</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@14377#egg=CalDAVTester
</del><ins>+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@14383#egg=CalDAVTester
</ins></span></pre></div>
<a id="CalendarServertrunktwistedcaldavicaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/icaldav.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/icaldav.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/icaldav.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> Create a calendar collection for this resource.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def iCalendar(): #@NoSelf
</del><ins>+ def component(): #@NoSelf
</ins><span class="cx"> """
</span><span class="cx"> Instantiate an iCalendar component object representing this resource or
</span><span class="cx"> its child with the given name.
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodgetpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/get.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/get.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/method/get.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if accepted_type is None:
</span><span class="cx"> raise HTTPError(StatusResponse(responsecode.NOT_ACCEPTABLE, "Cannot generate requested data type"))
</span><span class="cx">
</span><del>- caldata = (yield self.iCalendarForUser())
</del><ins>+ caldata = (yield self.componentForUser())
</ins><span class="cx">
</span><span class="cx"> # Filter any attendee hidden instances
</span><span class="cx"> caldata = HiddenInstanceFilter().filter(caldata)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_calendar_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/method/report_calendar_query.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> child_uri_name = child_uri[child_uri.rfind("/") + 1:]
</span><span class="cx">
</span><span class="cx"> if generate_calendar_data or not index_query_ok:
</span><del>- calendar = (yield child.iCalendarForUser())
</del><ins>+ calendar = (yield child.componentForUser())
</ins><span class="cx"> assert calendar is not None, "Calendar %s is missing from calendar collection %r" % (child_uri_name, self)
</span><span class="cx"> else:
</span><span class="cx"> calendar = None
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> # Check private events access status
</span><span class="cx"> isowner = (yield calresource.isOwner(request))
</span><span class="cx">
</span><del>- calendar = (yield calresource.iCalendarForUser())
</del><ins>+ calendar = (yield calresource.componentForUser())
</ins><span class="cx"> yield queryCalendarObjectResource(calresource, uri, None, calendar, timezone)
</span><span class="cx">
</span><span class="cx"> returnValue(True)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_common.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> if dataAllowed:
</span><span class="cx"> # Handle private events access restrictions
</span><span class="cx"> if calendar is None:
</span><del>- calendar = (yield resource.iCalendarForUser())
</del><ins>+ calendar = (yield resource.componentForUser())
</ins><span class="cx"> filtered = HiddenInstanceFilter().filter(calendar)
</span><span class="cx"> filtered = PrivateEventFilter(resource.accessMode, isowner).filter(filtered)
</span><span class="cx"> filtered = CalendarDataFilter(property, timezone).filter(filtered)
</span><span class="lines">@@ -684,12 +684,12 @@
</span><span class="cx"> # Add extended details
</span><span class="cx"> if do_event_details:
</span><span class="cx"> child = (yield request.locateChildResource(calresource, name))
</span><del>- calendar = (yield child.iCalendarForUser())
</del><ins>+ calendar = (yield child.componentForUser())
</ins><span class="cx"> _addEventDetails(calendar, event_details, rich_options, timerange, tzinfo)
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> child = (yield request.locateChildResource(calresource, name))
</span><del>- calendar = (yield child.iCalendarForUser())
</del><ins>+ calendar = (yield child.componentForUser())
</ins><span class="cx">
</span><span class="cx"> # The calendar may come back as None if the resource is being changed, or was deleted
</span><span class="cx"> # between our initial index query and getting here. For now we will ignore this error, but in
</span><span class="lines">@@ -731,7 +731,7 @@
</span><span class="cx"> # Add extended details
</span><span class="cx"> if calendar.mainType() == "VEVENT" and do_event_details:
</span><span class="cx"> child = (yield request.locateChildResource(calresource, name))
</span><del>- calendar = (yield child.iCalendarForUser())
</del><ins>+ calendar = (yield child.componentForUser())
</ins><span class="cx"> _addEventDetails(calendar, event_details, rich_options, timerange, tzinfo)
</span><span class="cx">
</span><span class="cx"> returnValue(matchtotal)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/resource.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/resource.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/resource.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -1369,13 +1369,13 @@
</span><span class="cx"> def iCalendarFiltered(self, isowner):
</span><span class="cx">
</span><span class="cx"> # Now "filter" the resource calendar data
</span><del>- caldata = (yield self.iCalendarForUser())
</del><ins>+ caldata = (yield self.componentForUser())
</ins><span class="cx"> caldata = HiddenInstanceFilter().filter(caldata)
</span><span class="cx"> caldata = PrivateEventFilter(self.accessMode, isowner).filter(caldata)
</span><span class="cx"> returnValue(caldata)
</span><span class="cx">
</span><span class="cx">
</span><del>- def iCalendar(self):
</del><ins>+ def component(self):
</ins><span class="cx"> # storebridge handles this method
</span><span class="cx"> raise NotImplementedError()
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstorebridgepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/storebridge.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/storebridge.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/storebridge.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -2232,6 +2232,10 @@
</span><span class="cx"> return self._newStoreObject.component()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def componentForUser(self):
+ return self._newStoreObject.component()
+
+
</ins><span class="cx"> def allowedTypes(self):
</span><span class="cx"> """
</span><span class="cx"> Return a dict of allowed MIME types for storing, mapped to equivalent PyCalendar types.
</span><span class="lines">@@ -2260,7 +2264,7 @@
</span><span class="cx"> if accepted_type is None:
</span><span class="cx"> raise HTTPError(StatusResponse(responsecode.NOT_ACCEPTABLE, "Cannot generate requested data type"))
</span><span class="cx">
</span><del>- output = yield self.component()
</del><ins>+ output = yield self.componentForUser()
</ins><span class="cx">
</span><span class="cx"> response = Response(OK, {}, output.getText(accepted_type))
</span><span class="cx"> response.headers.setHeader("content-type", MimeType.fromString("%s; charset=utf-8" % (accepted_type,)))
</span><span class="lines">@@ -2633,13 +2637,10 @@
</span><span class="cx"> self._initializeWithObject(newObject, newParent)
</span><span class="cx"> returnValue(txn)
</span><span class="cx">
</span><del>- iCalendar = _CommonObjectResource.component
</del><span class="cx">
</span><del>-
</del><span class="cx"> def componentForUser(self):
</span><span class="cx"> return self._newStoreObject.componentForUser()
</span><span class="cx">
</span><del>- iCalendarForUser = componentForUser
</del><span class="cx">
</span><span class="cx"> def validIfScheduleMatch(self, request):
</span><span class="cx"> """
</span><span class="lines">@@ -3041,8 +3042,8 @@
</span><span class="cx"> etag2 = yield other.etag()
</span><span class="cx"> scheduletag1 = self.scheduleTag
</span><span class="cx"> scheduletag2 = otherStoreObject.scheduleTag
</span><del>- cal1 = yield self.component()
- cal2 = yield other.component()
</del><ins>+ cal1 = yield self.componentForUser()
+ cal2 = yield other.componentForUser()
</ins><span class="cx">
</span><span class="cx"> xml_responses = [
</span><span class="cx"> davxml.PropertyStatusResponse(
</span><span class="lines">@@ -3293,7 +3294,7 @@
</span><span class="cx">
</span><span class="cx"> yield newchild.storeComponent(component)
</span><span class="cx"> if returnChangedData and newchild._newStoreObject._componentChanged:
</span><del>- result = (yield newchild.component())
</del><ins>+ result = (yield newchild.componentForUser())
</ins><span class="cx"> returnValue(result)
</span><span class="cx"> else:
</span><span class="cx"> returnValue(None)
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (14383 => 14384)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py 2015-02-06 22:31:26 UTC (rev 14383)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py 2015-02-06 22:32:49 UTC (rev 14384)
</span><span class="lines">@@ -1336,7 +1336,7 @@
</span><span class="cx"> inbox, ownerPrincipal.scheduleInboxURL()
</span><span class="cx"> )
</span><span class="cx">
</span><del>- calendar = yield inboxItem.iCalendar()
</del><ins>+ calendar = yield inboxItem.componentForUser()
</ins><span class="cx"> if calendar.mainType() is not None:
</span><span class="cx"> try:
</span><span class="cx"> method = calendar.propertyValue("METHOD")
</span></span></pre>
</div>
</div>
</body>
</html>