<!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>[14565] 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/14565">14565</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-03-11 16:50:22 -0700 (Wed, 11 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Optimize addStructuredLocation and properly handle multiple locations.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavicalpy">CalendarServer/trunk/twistedcaldav/ical.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavicalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/ical.py (14564 => 14565)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/ical.py 2015-03-11 23:43:31 UTC (rev 14564)
+++ CalendarServer/trunk/twistedcaldav/ical.py 2015-03-11 23:50:22 UTC (rev 14565)
</span><span class="lines">@@ -1103,7 +1103,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if isinstance(property, str):
</span><del>- for property in self.properties(property):
</del><ins>+ for property in tuple(self.properties(property)):
</ins><span class="cx"> self.removeProperty(property)
</span><span class="cx"> else:
</span><span class="cx"> self._pycalendar.removeProperty(property._pycalendar)
</span><span class="lines">@@ -1120,7 +1120,7 @@
</span><span class="cx"> @type pname: C{str}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- for property in self.properties(pname):
</del><ins>+ for property in tuple(self.properties(pname)):
</ins><span class="cx"> self.removeProperty(property)
</span><span class="cx">
</span><span class="cx"> for component in self.subcomponents():
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (14564 => 14565)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-03-11 23:43:31 UTC (rev 14564)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py 2015-03-11 23:50:22 UTC (rev 14565)
</span><span class="lines">@@ -3139,39 +3139,62 @@
</span><span class="cx"> X-APPLE-STRUCTURED-LOCATION property and update the LOCATION property
</span><span class="cx"> to contain the name and street address.
</span><span class="cx"> """
</span><ins>+
+ cache = {}
</ins><span class="cx"> dir = self.directoryService()
</span><span class="cx"> for sub in component.subcomponents():
</span><ins>+ locations = []
+ removed = False
</ins><span class="cx"> for attendee in sub.getAllAttendeeProperties():
</span><span class="cx"> if attendee.parameterValue("CUTYPE") == "ROOM":
</span><span class="cx"> value = attendee.value()
</span><del>- loc = yield dir.recordWithCalendarUserAddress(value)
- if loc is not None:
- uid = getattr(loc, "associatedAddress", "")
- if uid:
- addr = yield dir.recordWithUID(uid)
- if addr is not None:
- street = getattr(addr, "streetAddress", "")
- geo = getattr(addr, "geographicLocation", "")
- if street and geo:
- title = attendee.parameterValue("CN")
- params = {
- "X-ADDRESS": street,
- "X-APPLE-RADIUS": "71",
- "X-TITLE": title,
- }
- structured = Property(
- "X-APPLE-STRUCTURED-LOCATION",
- geo.encode("utf-8"), params=params,
- valuetype=Value.VALUETYPE_URI
- )
- sub.replaceProperty(structured)
- newLocProperty = Property(
- "LOCATION",
- "{0}\n{1}".format(title, street.encode("utf-8"))
- )
- sub.replaceProperty(newLocProperty)
</del><span class="cx">
</span><ins>+ # Cache record based data once per-attendee
+ if value not in cache:
+ cache[value] = None
+ loc = yield dir.recordWithCalendarUserAddress(value)
+ if loc is not None:
+ uid = getattr(loc, "associatedAddress", "")
+ if uid:
+ addr = yield dir.recordWithUID(uid)
+ if addr is not None:
+ street = getattr(addr, "streetAddress", "")
+ geo = getattr(addr, "geographicLocation", "")
+ if street and geo:
+ title = attendee.parameterValue("CN")
+ cache[value] = (street, geo, title,)
</ins><span class="cx">
</span><ins>+ # Use the cached data if present
+ entry = cache[value]
+ if entry is not None:
+ street, geo, title = entry
+ params = {
+ "X-ADDRESS": street,
+ "X-APPLE-RADIUS": "71",
+ "X-TITLE": title,
+ }
+ structured = Property(
+ "X-APPLE-STRUCTURED-LOCATION",
+ geo.encode("utf-8"), params=params,
+ valuetype=Value.VALUETYPE_URI
+ )
+
+ # The first time we have any X- prop, remove all existing ones
+ if not removed:
+ sub.removeProperty("X-APPLE-STRUCTURED-LOCATION")
+ removed = True
+ sub.addProperty(structured)
+ locations.append("{0}\n{1}".format(title, street.encode("utf-8")))
+
+ # Update the LOCATION if X-'s were added
+ if locations:
+ newLocProperty = Property(
+ "LOCATION",
+ "; ".join(locations)
+ )
+ sub.replaceProperty(newLocProperty)
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def decorateHostedStatus(self, component):
</span><span class="cx"> """
</span><span class="lines">@@ -3235,6 +3258,10 @@
</span><span class="cx"> internal_request=is_internal,
</span><span class="cx"> ))
</span><span class="cx">
</span><ins>+ # Structured locations for organizer non-splits only
+ if scheduler.state == "organizer" and internal_state != ComponentUpdateState.SPLIT_OWNER:
+ yield self.addStructuredLocation(component)
+
</ins><span class="cx"> # Group attendees - though not during a split
</span><span class="cx"> if scheduler.state == "organizer" and internal_state != ComponentUpdateState.SPLIT_OWNER:
</span><span class="cx"> changed = yield self.reconcileGroupAttendees(component, inserting)
</span><span class="lines">@@ -3478,9 +3505,6 @@
</span><span class="cx"> # Default/duplicate alarms
</span><span class="cx"> self.processAlarms(component, inserting)
</span><span class="cx">
</span><del>- # Process structured location
- yield self.addStructuredLocation(component)
-
</del><span class="cx"> # Process hosted status
</span><span class="cx"> if config.HostedStatus.Enabled:
</span><span class="cx"> yield self.decorateHostedStatus(component)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (14564 => 14565)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-03-11 23:43:31 UTC (rev 14564)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-03-11 23:50:22 UTC (rev 14565)
</span><span class="lines">@@ -2518,6 +2518,123 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_setComponent_structuredLocation_Multiple(self):
+ """
+ Verify multiple ROOM attendees result in multiple X-APPLE-STRUCTURED-LOCATION properties
+ added, as well as updated multi-valued LOCATION properties.
+ """
+
+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+CALSCALE:GREGORIAN
+PRODID:-//Apple Inc.//Mac OS X 10.9.1//EN
+BEGIN:VEVENT
+UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
+DTSTART:20131211T164500Z
+DURATION:PT1H
+ATTENDEE;CN=Conference Room One;CUTYPE=ROOM;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPAN
+ T;SCHEDULE-STATUS=2.0:urn:x-uid:room-addr-1
+ATTENDEE;CN=Conference Room Two;CUTYPE=ROOM;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPAN
+ T;SCHEDULE-STATUS=2.0:urn:x-uid:room-addr-2
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01@example.com;PARTSTAT=AC
+ CEPTED:urn:x-uid:user01
+CREATED:20131211T221854Z
+DTSTAMP:20131211T230632Z
+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01
+RRULE:FREQ=DAILY;COUNT=5
+SEQUENCE:8
+SUMMARY:locations
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+UID:561F5DBB-3F38-4B3A-986F-DD05CBAF554F
+RECURRENCE-ID:20131214T164500Z
+DTSTART:20131214T160000Z
+DURATION:PT1H
+ATTENDEE;CN=Conference Room Two;CUTYPE=ROOM;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPAN
+ T;SCHEDULE-STATUS=2.0:urn:x-uid:room-addr-2
+ATTENDEE;CN=User 01;CUTYPE=INDIVIDUAL;EMAIL=user01@example.com;PARTSTAT=AC
+ CEPTED:urn:x-uid:user01
+CREATED:20131211T221854Z
+DTSTAMP:20131211T230632Z
+ORGANIZER;CN=User 01;EMAIL=user01@example.com:urn:x-uid:user01
+SEQUENCE:8
+SUMMARY:locations
+TRANSP:OPAQUE
+END:VEVENT
+END:VCALENDAR
+""".replace("\n", "\r\n")
+
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
+ yield calendar.createCalendarObjectWithName(
+ "structured.ics",
+ Component.fromString(data)
+ )
+
+ yield self.commit()
+
+ cobj = yield self.calendarObjectUnderTest(
+ name="structured.ics",
+ calendar_name="calendar",
+ home="user01"
+ )
+ comp = yield cobj.component()
+ components = list(comp.subcomponents())
+
+ # Check first component
+ locProp = components[0].getProperty("LOCATION")
+ self.assertEquals(
+ locProp.value(),
+ "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014; Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+ )
+ structProps = tuple(components[0].properties("X-APPLE-STRUCTURED-LOCATION"))
+ self.assertEqual(len(structProps), 2)
+ self.assertEquals(
+ set([structProp.value() for structProp in structProps]),
+ set(("geo:37.331741,-122.030333", "geo:37.332633,-122.030502",))
+ )
+
+ # Check second component
+ locProp = components[1].getProperty("LOCATION")
+ self.assertEquals(
+ locProp.value(),
+ "Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+ )
+ structProps = tuple(components[1].properties("X-APPLE-STRUCTURED-LOCATION"))
+ self.assertEqual(len(structProps), 1)
+ self.assertEquals(
+ structProps[0].value(),
+ "geo:37.332633,-122.030502"
+ )
+
+ yield self.commit()
+
+ cal = yield self.calendarUnderTest(
+ name="calendar",
+ home="room-addr-1"
+ )
+ cobjs = yield cal.calendarObjects()
+ self.assertEqual(len(cobjs), 1)
+ comp = yield cobjs[0].component()
+ components = list(comp.subcomponents())
+
+ # Check first component
+ locProp = components[0].getProperty("LOCATION")
+ self.assertEquals(
+ locProp.value(),
+ "Room with Address 1\n1 Infinite Loop, Cupertino, CA 95014; Room with Address 2\n2 Infinite Loop, Cupertino, CA 95014"
+ )
+ structProps = tuple(components[0].properties("X-APPLE-STRUCTURED-LOCATION"))
+ self.assertEqual(len(structProps), 2)
+ self.assertEquals(
+ set([structProp.value() for structProp in structProps]),
+ set(("geo:37.331741,-122.030333", "geo:37.332633,-122.030502",))
+ )
+
+ yield self.commit()
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_setComponent_externalPrincipal(self):
</span><span class="cx"> """
</span><span class="cx"> Verify attendees who are not locally hosted have X-APPLE-HOSTED-STATUS=EXTERNAL
</span></span></pre>
</div>
</div>
</body>
</html>