<!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>[14153] 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/14153">14153</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 14:28:45 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up importing of attendee data</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 (14152 => 14153)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/importer.py 2014-11-10 21:52:47 UTC (rev 14152)
+++ CalendarServer/trunk/calendarserver/tools/importer.py 2014-11-10 22:28:45 UTC (rev 14153)
</span><span class="lines">@@ -202,6 +202,11 @@
</span><span class="cx"> groupedComponents = Component.componentsFromComponent(component)
</span><span class="cx"> for groupedComponent in groupedComponents:
</span><span class="cx">
</span><ins>+ try:
+ uid = list(groupedComponent.subcomponents())[0].propertyValue("UID")
+ except:
+ uid = "unknown"
+
</ins><span class="cx"> # If event is unscheduled or the organizer matches homeUID, store the
</span><span class="cx"> # component
</span><span class="cx">
</span><span class="lines">@@ -223,13 +228,9 @@
</span><span class="cx"> yield storeComponentInHomeAndCalendar(
</span><span class="cx"> store, groupedComponent, ownerUID, collectionResourceName, resourceName
</span><span class="cx"> )
</span><ins>+ print("Imported: {}".format(uid))
</ins><span class="cx"> except UIDExistsError:
</span><span class="cx"> # That event is already in the home
</span><del>- try:
- uid = list(groupedComponent.subcomponents())[0].propertyValue("UID")
- except:
- uid = "unknown"
-
</del><span class="cx"> print("Skipping since UID already exists: {}".format(uid))
</span><span class="cx">
</span><span class="cx"> except Exception, e:
</span><span class="lines">@@ -242,39 +243,11 @@
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> # Owner is not the organizer
</span><del>- print("OTHER")
- txn = store.newTransaction()
- organizerHome = yield txn.calendarHomeWithUID(organizerRecord.uid)
- if organizerHome is None:
- continue
- # Iterate owner's calendars to find the one containing the event
- # UID
- uid = list(groupedComponent.subcomponents())[0].propertyValue("UID")
- for collection in (yield organizerHome.children()):
- if collection.name() != "inbox":
- resourceName = yield collection.resourceNameForUID(uid)
- print("Resource name", collection, resourceName)
- object = yield collection.objectResourceWithName(resourceName)
- component = yield object.componentForUser()
- print ("Comp", component)
</del><ins>+ ownerCUA = ownerRecord.canonicalCalendarUserAddress()
+ yield reInviteAttendee(store, organizerRecord.uid, uid, ownerCUA)
</ins><span class="cx">
</span><del>- ownerCUA = ownerRecord.canonicalCalendarUserAddress()
- print("CUA", ownerCUA)
- 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)
</del><span class="cx">
</span><del>- break
</del><span class="cx">
</span><del>- yield txn.commit()
-
-
-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def storeComponentInHomeAndCalendar(
</span><span class="cx"> store, component, homeUID, collectionResourceName, objectResourceName
</span><span class="lines">@@ -296,7 +269,6 @@
</span><span class="cx"> @type collectionResourceName: C{str}
</span><span class="cx"> @param objectResourceName: name of the objectresource
</span><span class="cx"> @type objectResourceName: C{str}
</span><del>-
</del><span class="cx"> """
</span><span class="cx"> txn = store.newTransaction()
</span><span class="cx"> home = yield txn.calendarHomeWithUID(homeUID, create=True)
</span><span class="lines">@@ -308,7 +280,46 @@
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="cx">
</span><ins>+@inlineCallbacks
+def reInviteAttendee(
+ store, organizerUID, objectUID, attendeeCUA
+):
+ """
+ Force a re-invite of an attendee
</ins><span class="cx">
</span><ins>+ Find the event with the given objectUID within the calendar home for
+ organizerUID, and update it so the attendeeCUA's PARTSTAT is set to
+ NEEDS-ACTION.
+
+ @param store: The db store to add the component to
+ @type store: L{IDataStore}
+ @param organizerUID: uid of the organizer
+ @type organizerUID: C{str}
+ @param objectUID: uid of the event
+ @type objectUID: C{str}
+ @param attendeeCUA: CUA of the attendee to re-invite
+ @type attendeeCUA: C{str}
+ """
+
+ txn = store.newTransaction()
+ organizerHome = yield txn.calendarHomeWithUID(organizerUID)
+ if organizerHome is not None:
+ for object in (yield organizerHome.getCalendarResourcesForUID(objectUID)):
+ component = yield object.componentForUser()
+
+ # duplicate() so implicit actions will trigger -- otherwise
+ # the data objects will be the same when you call setComponent
+ component = component.duplicate()
+
+ for attendeeProp in (yield component.getAttendeeProperties((attendeeCUA,))):
+ if attendeeProp is not None:
+ attendeeProp.setParameter("PARTSTAT", "NEEDS-ACTION")
+ yield object.setComponent(component)
+ print("Reinviting to: {}".format(objectUID))
+
+ yield txn.commit()
+
+
</ins><span class="cx"> class ImporterService(WorkerService, object):
</span><span class="cx"> """
</span><span class="cx"> Service which runs, imports the data, then stops the reactor.
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_importerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_importer.py (14152 => 14153)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_importer.py 2014-11-10 21:52:47 UTC (rev 14152)
+++ CalendarServer/trunk/calendarserver/tools/test/test_importer.py 2014-11-10 22:28:45 UTC (rev 14153)
</span><span class="lines">@@ -396,5 +396,3 @@
</span><span class="cx"> "NEEDS-ACTION"
</span><span class="cx"> )
</span><span class="cx"> yield txn.commit()
</span><del>-
- test_ImportComponentAttendee.todo = "Debug"
</del></span></pre>
</div>
</div>
</body>
</html>