<!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>[14152] CalendarServer/trunk/calendarserver/tools</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/14152">14152</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 13:52:47 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle setting PARTSTAT of attendees across multiple instances when importing</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsimporterpy">CalendarServer/trunk/calendarserver/tools/importer.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_importerpy">CalendarServer/trunk/calendarserver/tools/test/test_importer.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsimporterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/importer.py (14151 => 14152)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/importer.py 2014-11-10 21:34:20 UTC (rev 14151)
+++ CalendarServer/trunk/calendarserver/tools/importer.py 2014-11-10 21:52:47 UTC (rev 14152)
</span><span class="lines">@@ -255,20 +255,19 @@
</span><span class="cx"> resourceName = yield collection.resourceNameForUID(uid)
</span><span class="cx"> print("Resource name", collection, resourceName)
</span><span class="cx"> object = yield collection.objectResourceWithName(resourceName)
</span><del>- component = yield object.component()
</del><ins>+ component = yield object.componentForUser()
</ins><span class="cx"> print ("Comp", component)
</span><span class="cx">
</span><span class="cx"> ownerCUA = ownerRecord.canonicalCalendarUserAddress()
</span><span class="cx"> print("CUA", ownerCUA)
</span><del>- attendeeProp = component.getAttendeeProperty((ownerCUA,))
- print("att prop", attendeeProp)
- if attendeeProp is not None:
- print("Before", attendeeProp)
- attendeeProp.setParameter("PARTSTAT", "NEEDS-ACTION")
- attendeeProp.removeParameter("SCHEDULE-STATUS")
- print("I modified", attendeeProp)
- result = yield object.setComponent(component)
- print("Set component result", result)
</del><ins>+ for attendeeProp in (yield component.getAttendeeProperties((ownerCUA,))):
+ print("att prop", attendeeProp)
+ if attendeeProp is not None:
+ print("Before", attendeeProp)
+ attendeeProp.setParameter("PARTSTAT", "NEEDS-ACTION")
+ print("I modified", attendeeProp)
+ result = yield object.setComponent(component)
+ print("Set component result", result)
</ins><span class="cx">
</span><span class="cx"> break
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_importerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_importer.py (14151 => 14152)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_importer.py 2014-11-10 21:34:20 UTC (rev 14151)
+++ CalendarServer/trunk/calendarserver/tools/test/test_importer.py 2014-11-10 21:52:47 UTC (rev 14152)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><del>-DATA_OTHER_ORGANIZER_EVENT = """BEGIN:VCALENDAR
</del><ins>+DATA_USER02_INVITES_USER01_ORGANIZER_COPY = """BEGIN:VCALENDAR
</ins><span class="cx"> VERSION:2.0
</span><span class="cx"> PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
</span><span class="cx"> BEGIN:VEVENT
</span><span class="lines">@@ -165,12 +165,12 @@
</span><span class="cx"> ORGANIZER;CN=User 02:urn:x-uid:user02
</span><span class="cx"> SEQUENCE:0
</span><span class="cx"> SUMMARY:Other organizer
</span><ins>+TRANSP:OPAQUE
</ins><span class="cx"> END:VEVENT
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><del>-# TRANSP:OPAQUE
</del><span class="cx">
</span><del>-DATA_ATTENDEE_EVENT = """BEGIN:VCALENDAR
</del><ins>+DATA_USER02_INVITES_USER01_ATTENDEE_COPY = """BEGIN:VCALENDAR
</ins><span class="cx"> VERSION:2.0
</span><span class="cx"> NAME:I'm an attendee
</span><span class="cx"> COLOR:#0000FFFF
</span><span class="lines">@@ -333,11 +333,10 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_ImportComponentAttendee(self):
</span><span class="cx">
</span><del>- # Have another principal invite this principal
-
</del><ins>+ # Have user02 invite this user01
</ins><span class="cx"> yield storeComponentInHomeAndCalendar(
</span><span class="cx"> self.store,
</span><del>- Component.allFromString(DATA_OTHER_ORGANIZER_EVENT),
</del><ins>+ Component.allFromString(DATA_USER02_INVITES_USER01_ORGANIZER_COPY),
</ins><span class="cx"> "user02",
</span><span class="cx"> "calendar",
</span><span class="cx"> "invite.ics"
</span><span class="lines">@@ -379,7 +378,7 @@
</span><span class="cx">
</span><span class="cx"> # When importing the event again, instead trigger a re-invite
</span><span class="cx"> # from the organizer
</span><del>- component = Component.allFromString(DATA_ATTENDEE_EVENT)
</del><ins>+ component = Component.allFromString(DATA_USER02_INVITES_USER01_ATTENDEE_COPY)
</ins><span class="cx"> yield importCollectionComponent(self.store, component)
</span><span class="cx">
</span><span class="cx"> yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
</span></span></pre>
</div>
</div>
</body>
</html>