<!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>[12858] CalendarServer/branches/users/sagen/move2who/txdav</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/12858">12858</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-07 17:31:09 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move common "calendar" stuff to txdav/who/directory.py</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2whotxdavdpsclientpy">CalendarServer/branches/users/sagen/move2who/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whotxdavdpsserverpy">CalendarServer/branches/users/sagen/move2who/txdav/dps/server.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whotxdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who/txdav/who/directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2whotxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who/txdav/dps/client.py (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who/txdav/dps/client.py 2014-03-08 00:53:53 UTC (rev 12857)
+++ CalendarServer/branches/users/sagen/move2who/txdav/dps/client.py 2014-03-08 01:31:09 UTC (rev 12858)
</span><span class="lines">@@ -104,13 +104,6 @@
</span><span class="cx">
</span><span class="cx"> # print("FIELDS", serializedFields)
</span><span class="cx">
</span><del>- # MOVE2WHO -- existing code assumes record.emailAddresses always exists,
- # so adding this here, but perhaps we should change the behavior in
- # twext.who itself:
- # Add default empty list of email addresses
- if self.fieldName.emailAddresses.name not in serializedFields:
- serializedFields[self.fieldName.emailAddresses.name] = []
-
</del><span class="cx"> fields = {}
</span><span class="cx"> for fieldName, value in serializedFields.iteritems():
</span><span class="cx"> try:
</span><span class="lines">@@ -233,39 +226,6 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- # def listRecords(self, recordType):
- # # MOVE2WHO
- # return []
-
-
- @inlineCallbacks
- def recordWithCalendarUserAddress(self, address):
- # FIXME: Circular
- from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
- address = normalizeCUAddr(address)
- record = None
- if address.startswith("urn:uuid:"):
- guid = address[9:]
- record = yield self.recordWithGUID(guid)
- elif address.startswith("mailto:"):
- records = yield self.recordsWithEmailAddress(address[7:])
- if records:
- returnValue(records[0])
- else:
- returnValue(None)
- elif address.startswith("/principals/"):
- parts = address.split("/")
- if len(parts) == 4:
- if parts[2] == "__uids__":
- guid = parts[3]
- record = yield self.recordWithGUID(guid)
- else:
- recordType = self.fieldName.lookupByName(parts[2])
- record = yield self.recordWithShortName(recordType, parts[3])
-
- returnValue(record if record and record.hasCalendars else None)
-
-
</del><span class="cx"> def recordsMatchingTokens(self, tokens, context=None, limitResults=50,
</span><span class="cx"> timeoutSeconds=10):
</span><span class="cx"> return self._call(
</span><span class="lines">@@ -277,14 +237,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>- # FIXME: Existing code assumes record type names are plural. Is there any
- # reason to maintain backwards compatibility? I suppose there could be
- # scripts referring to record type of "users", "locations"
- def recordTypeToOldName(self, recordType):
- return recordType.name + u"s"
</del><span class="cx">
</span><del>- def oldNameToRecordType(self, oldName):
- return self.recordType.lookupByName(oldName[:-1])
</del><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whotxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who/txdav/dps/server.py (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who/txdav/dps/server.py 2014-03-08 00:53:53 UTC (rev 12857)
+++ CalendarServer/branches/users/sagen/move2who/txdav/dps/server.py 2014-03-08 01:31:09 UTC (rev 12858)
</span><span class="lines">@@ -21,9 +21,6 @@
</span><span class="cx"> from calendarserver.tap.util import getDBPool, storeFromConfig
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.aggregate import DirectoryService as AggregateDirectoryService
</span><del>-from twext.who.expression import (
- MatchType, Operand, MatchExpression, CompoundExpression, MatchFlags
-)
</del><span class="cx"> from twext.who.idirectory import RecordType
</span><span class="cx"> from twext.who.ldap import DirectoryService as LDAPDirectoryService
</span><span class="cx"> from twisted.application import service
</span><span class="lines">@@ -179,34 +176,10 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordsMatchingTokens(self, tokens, context=None):
</span><span class="cx"> tokens = [t.decode("utf-8") for t in tokens]
</span><del>-
</del><span class="cx"> log.debug("RecordsMatchingTokens: {t}", t=(", ".join(tokens)))
</span><del>-
- fields = [
- ("fullNames", MatchType.contains),
- ("emailAddresses", MatchType.startsWith),
- ]
- outer = []
- for token in tokens:
- inner = []
- for name, matchType in fields:
- inner.append(
- MatchExpression(
- self._directory.fieldName.lookupByName(name),
- token,
- matchType,
- MatchFlags.caseInsensitive
- )
- )
- outer.append(
- CompoundExpression(
- inner,
- Operand.OR
- )
- )
- expression = CompoundExpression(outer, Operand.AND)
- records = yield self._directory.recordsFromExpression(expression)
-
</del><ins>+ records = yield self._directory.recordsMatchingTokens(
+ tokens, context=context
+ )
</ins><span class="cx"> fieldsList = []
</span><span class="cx"> for record in records:
</span><span class="cx"> fieldsList.append(self.recordToDict(record))
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whotxdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who/txdav/who/directory.py (12857 => 12858)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who/txdav/who/directory.py 2014-03-08 00:53:53 UTC (rev 12857)
+++ CalendarServer/branches/users/sagen/move2who/txdav/who/directory.py 2014-03-08 01:31:09 UTC (rev 12858)
</span><span class="lines">@@ -20,6 +20,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> import uuid
</span><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
+from twext.who.expression import (
+ MatchType, Operand, MatchExpression, CompoundExpression, MatchFlags
+)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> __all__ = [
</span><span class="lines">@@ -41,9 +45,76 @@
</span><span class="cx"> self.principalCollection = principalCollection
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def recordWithCalendarUserAddress(self, address):
+ # FIXME: Circular
+ from txdav.caldav.datastore.scheduling.cuaddress import normalizeCUAddr
+ address = normalizeCUAddr(address)
+ record = None
+ if address.startswith("urn:uuid:"):
+ guid = address[9:]
+ record = yield self.recordWithGUID(guid)
+ elif address.startswith("mailto:"):
+ records = yield self.recordsWithEmailAddress(address[7:])
+ if records:
+ returnValue(records[0])
+ else:
+ returnValue(None)
+ elif address.startswith("/principals/"):
+ parts = address.split("/")
+ if len(parts) == 4:
+ if parts[2] == "__uids__":
+ guid = parts[3]
+ record = yield self.recordWithGUID(guid)
+ else:
+ recordType = self.fieldName.lookupByName(parts[2])
+ record = yield self.recordWithShortName(recordType, parts[3])
+
+ returnValue(record if record and record.hasCalendars else None)
+
+
+ def recordsMatchingTokens(self, tokens, context=None, limitResults=50,
+ timeoutSeconds=10):
+ fields = [
+ ("fullNames", MatchType.contains),
+ ("emailAddresses", MatchType.startsWith),
+ ]
+ outer = []
+ for token in tokens:
+ inner = []
+ for name, matchType in fields:
+ inner.append(
+ MatchExpression(
+ self.fieldName.lookupByName(name),
+ token,
+ matchType,
+ MatchFlags.caseInsensitive
+ )
+ )
+ outer.append(
+ CompoundExpression(
+ inner,
+ Operand.OR
+ )
+ )
+ expression = CompoundExpression(outer, Operand.AND)
+ return self.recordsFromExpression(expression)
+
+
+ # FIXME: Existing code assumes record type names are plural. Is there any
+ # reason to maintain backwards compatibility? I suppose there could be
+ # scripts referring to record type of "users", "locations"
+ def recordTypeToOldName(self, recordType):
+ return recordType.name + u"s"
+
+
+ def oldNameToRecordType(self, oldName):
+ return self.recordType.lookupByName(oldName[:-1])
+
+
+
</ins><span class="cx"> class CalendarDirectoryRecordMixin(object):
</span><span class="cx">
</span><del>-
</del><span class="cx"> @property
</span><span class="cx"> def calendarUserAddresses(self):
</span><span class="cx"> if not self.hasCalendars:
</span></span></pre>
</div>
</div>
</body>
</html>