<!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>[14144] 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/14144">14144</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-11-07 10:11:21 -0800 (Fri, 07 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start testing import of scheduled events -- first just as the organizer</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 (14143 => 14144)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/importer.py 2014-11-07 17:17:31 UTC (rev 14143)
+++ CalendarServer/trunk/calendarserver/tools/importer.py 2014-11-07 18:11:21 UTC (rev 14144)
</span><span class="lines">@@ -198,11 +198,13 @@
</span><span class="cx"> )
</span><span class="cx"> except UIDExistsError:
</span><span class="cx"> # That event is already in the home
</span><del>- print(
- "Skipping since UID already exists: {uid}".format(
- uid=groupedComponent.propertyValue("UID")
- )
- )
</del><ins>+ try:
+ uid = list(groupedComponent.subcomponents())[0].propertyValue("UID")
+ except:
+ uid = "unknown"
+
+ print("Skipping since UID already exists: {}".format(uid))
+
</ins><span class="cx"> except Exception, e:
</span><span class="cx"> print(
</span><span class="cx"> "Failed to import due to: {error}\n{comp}".format(
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_importerpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_importer.py (14143 => 14144)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_importer.py 2014-11-07 17:17:31 UTC (rev 14143)
+++ CalendarServer/trunk/calendarserver/tools/test/test_importer.py 2014-11-07 18:11:21 UTC (rev 14144)
</span><span class="lines">@@ -117,6 +117,32 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx">
</span><ins>+DATA_WITH_ORGANIZER = """BEGIN:VCALENDAR
+VERSION:2.0
+NAME:I'm the organizer
+COLOR:#0000FFFF
+SOURCE;VALUE=URI:http://example.com/calendars/__uids__/user01/calendar/
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:AB49C0C0-4238-41A4-8B43-F3E3DDF0E59C
+DTSTART;TZID=America/Los_Angeles:20141108T053000
+DTEND;TZID=America/Los_Angeles:20141108T070000
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;ROLE=CHAIR:urn:x-uid:user01
+ATTENDEE;CN=User 02;CUTYPE=INDIVIDUAL:urn:x-uid:user02
+ATTENDEE;CN=User 03;CUTYPE=INDIVIDUAL:urn:x-uid:user03
+ATTENDEE;CN=Mercury Seven;CUTYPE=ROOM:urn:x-uid:mercury
+CREATED:20141107T172645Z
+DTSTAMP:20141107T172645Z
+LOCATION:Mercury
+ORGANIZER;CN=User 01:urn:x-uid:user01
+SEQUENCE:0
+SUMMARY:I'm the organizer
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
+"""
+
+
</ins><span class="cx"> class ImportTests(StoreTestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for importing data to a live store.
</span><span class="lines">@@ -141,8 +167,8 @@
</span><span class="cx"> yield importCollectionComponent(self.store, component)
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><del>- home = yield txn.calendarHomeWithUID(u"user01")
- collection = yield home.childWithName(u"calendar")
</del><ins>+ home = yield txn.calendarHomeWithUID("user01")
+ collection = yield home.childWithName("calendar")
</ins><span class="cx">
</span><span class="cx"> # Verify properties have been set
</span><span class="cx"> collectionProperties = collection.properties()
</span><span class="lines">@@ -168,8 +194,8 @@
</span><span class="cx"> yield importCollectionComponent(self.store, component)
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><del>- home = yield txn.calendarHomeWithUID(u"user01")
- collection = yield home.childWithName(u"calendar")
</del><ins>+ home = yield txn.calendarHomeWithUID("user01")
+ collection = yield home.childWithName("calendar")
</ins><span class="cx">
</span><span class="cx"> # Verify properties have been changed
</span><span class="cx"> collectionProperties = collection.properties()
</span><span class="lines">@@ -187,3 +213,47 @@
</span><span class="cx"> self.assertEquals(len(objects), 3)
</span><span class="cx">
</span><span class="cx"> yield txn.commit()
</span><ins>+
+
+ @inlineCallbacks
+ def test_ImportComponentOrganizer(self):
+
+ component = Component.allFromString(DATA_WITH_ORGANIZER)
+ yield importCollectionComponent(self.store, component)
+
+ txn = self.store.newTransaction()
+ home = yield txn.calendarHomeWithUID("user01")
+ collection = yield home.childWithName("calendar")
+
+ # Verify properties have been set
+ collectionProperties = collection.properties()
+ for element, value in (
+ (davxml.DisplayName, "I'm the organizer"),
+ (customxml.CalendarColor, "#0000FFFF"),
+ ):
+ self.assertEquals(
+ value,
+ collectionProperties[PropertyName.fromElement(element)]
+ )
+
+ # Verify the organizer's child objects
+ objects = yield collection.listObjectResources()
+ self.assertEquals(len(objects), 1)
+
+ # Verify the attendees' child objects
+ home = yield txn.calendarHomeWithUID("user02")
+ collection = yield home.childWithName("calendar")
+ objects = yield collection.listObjectResources()
+ self.assertEquals(len(objects), 1)
+
+ home = yield txn.calendarHomeWithUID("user03")
+ collection = yield home.childWithName("calendar")
+ objects = yield collection.listObjectResources()
+ self.assertEquals(len(objects), 1)
+
+ home = yield txn.calendarHomeWithUID("mercury")
+ collection = yield home.childWithName("calendar")
+ objects = yield collection.listObjectResources()
+ self.assertEquals(len(objects), 1)
+
+ yield txn.commit()
</ins></span></pre>
</div>
</div>
</body>
</html>