<!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>[12551] CalendarServer/trunk/txdav/dps</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/12551">12551</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-02-04 10:14:29 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implements more directory service methods</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsprotocolpy">CalendarServer/trunk/txdav/dps/protocol.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsservicepy">CalendarServer/trunk/txdav/dps/service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (12550 => 12551)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-02-04 17:46:43 UTC (rev 12550)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-02-04 18:14:29 UTC (rev 12551)
</span><span class="lines">@@ -20,20 +20,20 @@
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span><del>-import sys
-
</del><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def makeEvenBetterRequest():
</span><del>- shortName = sys.argv[1]
-
</del><span class="cx"> ds = DirectoryService(None)
</span><del>- record = (yield ds.recordWithShortName(RecordType.user, shortName))
- print("A: {r}".format(r=record))
- record = (yield ds.recordWithShortName(RecordType.user, shortName))
- print("B: {r}".format(r=record))
</del><ins>+ record = (yield ds.recordWithShortName(RecordType.user, "sagen"))
+ print("short name: {r}".format(r=record))
+ record = (yield ds.recordWithUID("__dre__"))
+ print("uid: {r}".format(r=record))
+ record = (yield ds.recordWithGUID("A3B1158F-0564-4F5B-81E4-A89EA5FF81B0"))
+ print("guid: {r}".format(r=record))
+ records = (yield ds.recordsWithRecordType(RecordType.user))
+ print("recordType: {r}".format(r=records))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def succeeded(result):
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> print("boo: {f}".format(f=failure))
</span><span class="cx"> reactor.stop()
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if __name__ == '__main__':
</span><span class="cx"> d = makeEvenBetterRequest()
</span><span class="cx"> d.addCallbacks(succeeded, failed)
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsprotocolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/protocol.py (12550 => 12551)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/protocol.py 2014-02-04 17:46:43 UTC (rev 12550)
+++ CalendarServer/trunk/txdav/dps/protocol.py 2014-02-04 18:14:29 UTC (rev 12551)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> from twisted.protocols import amp
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twext.python.log import Logger
</span><del>-
</del><ins>+import uuid
</ins><span class="cx"> import cPickle as pickle
</span><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="lines">@@ -35,6 +35,61 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+class RecordWithUIDCommand(amp.Command):
+ arguments = [
+ ('uid', amp.String()),
+ ]
+ response = [
+ ('fields', amp.String()),
+ ]
+
+
+class RecordWithGUIDCommand(amp.Command):
+ arguments = [
+ ('guid', amp.String()),
+ ]
+ response = [
+ ('fields', amp.String()),
+ ]
+
+
+class RecordsWithRecordTypeCommand(amp.Command):
+ arguments = [
+ ('recordType', amp.String()),
+ ]
+ response = [
+ ('fieldsList', amp.String()),
+ ]
+
+
+class RecordsWithEmailAddressCommand(amp.Command):
+ arguments = [
+ ('emailAddress', amp.String()),
+ ]
+ response = [
+ ('fieldsList', amp.String()),
+ ]
+
+
+class UpdateRecordsCommand(amp.Command):
+ arguments = [
+ ('fieldsList', amp.String()),
+ ('create', amp.Boolean(optional=True)),
+ ]
+ response = [
+ ('success', amp.Boolean()),
+ ]
+
+
+class RemoveRecordsCommand(amp.Command):
+ arguments = [
+ ('uids', amp.ListOf(amp.String())),
+ ]
+ response = [
+ ('success', amp.Boolean()),
+ ]
+
+
</ins><span class="cx"> class DirectoryProxyAMPProtocol(amp.AMP):
</span><span class="cx"> """
</span><span class="cx"> Server side of directory proxy
</span><span class="lines">@@ -47,6 +102,20 @@
</span><span class="cx"> self._directory = directory
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def recordToDict(self, record):
+ """
+ This to be replaced by something awesome
+ """
+ fields = {}
+ if record is not None:
+ for field, value in record.fields.iteritems():
+ # print("%s: %s" % (field.name, value))
+ valueType = self._directory.fieldName.valueType(field)
+ if valueType is unicode:
+ fields[field.name] = value
+ return fields
+
+
</ins><span class="cx"> @RecordWithShortNameCommand.responder
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordWithShortName(self, recordType, shortName):
</span><span class="lines">@@ -56,16 +125,55 @@
</span><span class="cx"> record = (yield self._directory.recordWithShortName(
</span><span class="cx"> RecordType.lookupByName(recordType), shortName)
</span><span class="cx"> )
</span><del>- fields = {}
- for field, value in record.fields.iteritems():
- # print("%s: %s" % (field.name, value))
- valueType = self._directory.fieldName.valueType(field)
- # TODO: handle other value types like NamedConstants
- if valueType is unicode:
- fields[field.name] = value
</del><ins>+ fields = self.recordToDict(record)
+ response = {
+ "fields": pickle.dumps(fields),
+ }
+ log.debug("Responding with: {response}", response=response)
+ returnValue(response)
</ins><span class="cx">
</span><ins>+
+ @RecordWithUIDCommand.responder
+ @inlineCallbacks
+ def recordWithUID(self, uid):
+ uid = uid.decode("utf-8")
+ log.debug("RecordWithUID: {u}", u=uid)
+ record = (yield self._directory.recordWithUID(uid))
+ fields = self.recordToDict(record)
</ins><span class="cx"> response = {
</span><span class="cx"> "fields": pickle.dumps(fields),
</span><span class="cx"> }
</span><span class="cx"> log.debug("Responding with: {response}", response=response)
</span><span class="cx"> returnValue(response)
</span><ins>+
+
+ @RecordWithGUIDCommand.responder
+ @inlineCallbacks
+ def recordWithGUID(self, guid):
+ guid = uuid.UUID(guid)
+ log.debug("RecordWithGUID: {g}", g=guid)
+ record = (yield self._directory.recordWithGUID(guid))
+ fields = self.recordToDict(record)
+ response = {
+ "fields": pickle.dumps(fields),
+ }
+ log.debug("Responding with: {response}", response=response)
+ returnValue(response)
+
+
+ @RecordsWithRecordTypeCommand.responder
+ @inlineCallbacks
+ def recordsWithRecordType(self, recordType):
+ recordType = recordType.decode("utf-8")
+ log.debug("RecordsWithRecordType: {r}", r=recordType)
+ records = (yield self._directory.recordsWithRecordType(
+ RecordType.lookupByName(recordType))
+ )
+ fieldsList = []
+ for record in records:
+ fieldsList.append(self.recordToDict(record))
+ response = {
+ "fieldsList": pickle.dumps(fieldsList),
+ }
+ log.debug("Responding with: {response}", response=response)
+ returnValue(response)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavdpsservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/service.py (12550 => 12551)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/service.py 2014-02-04 17:46:43 UTC (rev 12550)
+++ CalendarServer/trunk/txdav/dps/service.py 2014-02-04 18:14:29 UTC (rev 12551)
</span><span class="lines">@@ -35,7 +35,10 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx">
</span><del>-from .protocol import DirectoryProxyAMPProtocol, RecordWithShortNameCommand
</del><ins>+from .protocol import (
+ DirectoryProxyAMPProtocol, RecordWithShortNameCommand, RecordWithUIDCommand,
+ RecordWithGUIDCommand, RecordsWithRecordTypeCommand
+)
</ins><span class="cx">
</span><span class="cx"> from twisted.internet import reactor
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="lines">@@ -57,6 +60,36 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _dictToRecord(self, serializedFields):
+ """
+ This to be replaced by something awesome
+ """
+ if not serializedFields:
+ return None
+
+ fields = {}
+ for fieldName, value in serializedFields.iteritems():
+ field = self.fieldName.lookupByName(fieldName)
+ fields[field] = value
+ fields[self.fieldName.recordType] = self.recordType.user
+ return DirectoryRecord(self, fields)
+
+
+ def _processSingleRecord(self, result):
+ serializedFields = pickle.loads(result['fields'])
+ return self._dictToRecord(serializedFields)
+
+
+ def _processMultipleRecords(self, result):
+ serializedFieldsList = pickle.loads(result['fieldsList'])
+ results = []
+ for serializedFields in serializedFieldsList:
+ record = self._dictToRecord(serializedFields)
+ if record is not None:
+ results.append(record)
+ return results
+
+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def _getConnection(self):
</span><span class="cx"> # path = config.DirectoryProxy.SocketPath
</span><span class="lines">@@ -72,26 +105,61 @@
</span><span class="cx">
</span><span class="cx"> def recordWithShortName(self, recordType, shortName):
</span><span class="cx">
</span><del>- def deserialize(result):
- rawFields = pickle.loads(result['fields'])
- fields = {}
- for fieldName, value in rawFields.iteritems():
- field = self.fieldName.lookupByName(fieldName)
- fields[field] = value
- fields[self.fieldName.recordType] = recordType
- return DirectoryRecord(self, fields)
-
- def call(ampProto):
</del><ins>+ def _call(ampProto):
</ins><span class="cx"> return ampProto.callRemote(
</span><span class="cx"> RecordWithShortNameCommand,
</span><span class="cx"> recordType=recordType.description.encode("utf-8"),
</span><span class="cx"> shortName=shortName.encode("utf-8")
</span><span class="cx"> )
</span><span class="cx">
</span><del>- return self._getConnection().addCallback(call).addCallback(deserialize)
</del><ins>+ d = self._getConnection()
+ d.addCallback(_call)
+ d.addCallback(self._processSingleRecord)
+ return d
</ins><span class="cx">
</span><span class="cx">
</span><ins>+ def recordWithUID(self, uid):
</ins><span class="cx">
</span><ins>+ def _call(ampProto):
+ return ampProto.callRemote(
+ RecordWithUIDCommand,
+ uid=uid.encode("utf-8")
+ )
+
+ d = self._getConnection()
+ d.addCallback(_call)
+ d.addCallback(self._processSingleRecord)
+ return d
+
+
+ def recordWithGUID(self, guid):
+
+ def _call(ampProto):
+ return ampProto.callRemote(
+ RecordWithGUIDCommand,
+ guid=guid.encode("utf-8")
+ )
+
+ d = self._getConnection()
+ d.addCallback(_call)
+ d.addCallback(self._processSingleRecord)
+ return d
+
+
+ def recordsWithRecordType(self, recordType):
+
+ def _call(ampProto):
+ return ampProto.callRemote(
+ RecordsWithRecordTypeCommand,
+ recordType=recordType.description.encode("utf-8")
+ )
+
+ d = self._getConnection()
+ d.addCallback(_call)
+ d.addCallback(self._processMultipleRecords)
+ return d
+
+
</ins><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> pass
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>