<!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>[12528] 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/12528">12528</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-01-31 17:22:05 -0800 (Fri, 31 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simple implementation of recordWithShortName</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 (12527 => 12528)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-02-01 00:35:22 UTC (rev 12527)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-02-01 01:22:05 UTC (rev 12528)
</span><span class="lines">@@ -34,7 +34,12 @@
</span><span class="cx"> def gotResults(record):
</span><span class="cx"> print('Done: %s' % (record,))
</span><span class="cx"> reactor.stop()
</span><del>- d.addCallback(gotResults)
</del><ins>+
+ def gotError(failure):
+ print("Failure: %s" % (failure,))
+ reactor.stop()
+
+ d.addCallbacks(gotResults, gotError)
</ins><span class="cx"> reactor.run()
</span><span class="cx">
</span><span class="cx"> if __name__ == '__main__':
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsprotocolpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/protocol.py (12527 => 12528)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/protocol.py 2014-02-01 00:35:22 UTC (rev 12527)
+++ CalendarServer/trunk/txdav/dps/protocol.py 2014-02-01 01:22:05 UTC (rev 12528)
</span><span class="lines">@@ -30,11 +30,10 @@
</span><span class="cx"> ('shortName', amp.String()),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('record', amp.String()),
</del><ins>+ ('fields', amp.String()),
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class DirectoryProxyAMPProtocol(amp.AMP):
</span><span class="cx"> """
</span><span class="cx"> """
</span><span class="lines">@@ -49,44 +48,22 @@
</span><span class="cx"> @RecordWithShortNameCommand.responder
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def recordWithShortName(self, recordType, shortName):
</span><ins>+ recordType = recordType.decode("utf-8")
+ shortName = shortName.decode("utf-8")
</ins><span class="cx"> log.debug("RecordWithShortName: {r} {n}", r=recordType, n=shortName)
</span><span class="cx"> record = (yield self._directory.recordWithShortName(
</span><span class="cx"> RecordType.lookupByName(recordType), shortName)
</span><span class="cx"> )
</span><del>- record.service = None
</del><ins>+ 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
+
</ins><span class="cx"> response = {
</span><del>- "record": pickle.dumps(record),
</del><ins>+ "fields": pickle.dumps(fields),
</ins><span class="cx"> }
</span><span class="cx"> log.debug("Responding with: {response}", response=response)
</span><span class="cx"> returnValue(response)
</span><del>-
-
-#
-# A test AMP client
-#
-
-def makeRequest():
- from twisted.internet import reactor
- from twisted.internet.protocol import ClientCreator
-
- creator = ClientCreator(reactor, amp.AMP)
- d = creator.connectUNIX("data/Logs/state/directory-proxy.sock")
-
- def connected(ampProto):
- import sys
- shortName = sys.argv[1]
- return ampProto.callRemote(
- RecordWithShortNameCommand,
- shortName=shortName,
- recordType=RecordType.user.description.encode("utf-8"))
- d.addCallback(connected)
-
- def gotResults(result):
- print('Done: %s' % (result,))
- reactor.stop()
- d.addCallback(gotResults)
- reactor.run()
-
-
-if __name__ == '__main__':
- makeRequest()
</del></span></pre></div>
<a id="CalendarServertrunktxdavdpsservicepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/service.py (12527 => 12528)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/service.py 2014-02-01 00:35:22 UTC (rev 12527)
+++ CalendarServer/trunk/txdav/dps/service.py 2014-02-01 01:22:05 UTC (rev 12528)
</span><span class="lines">@@ -16,6 +16,10 @@
</span><span class="cx">
</span><span class="cx"> from twext.who.xml import DirectoryService as XMLDirectoryService
</span><span class="cx"> from twext.who.index import DirectoryService as BaseDirectoryService
</span><ins>+from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
+from twext.who.util import ConstantsContainer
+from twext.who.idirectory import RecordType
+
</ins><span class="cx"> from twisted.python.usage import Options, UsageError
</span><span class="cx"> from twisted.plugin import IPlugin
</span><span class="cx"> from twisted.application import service
</span><span class="lines">@@ -39,6 +43,10 @@
</span><span class="cx">
</span><span class="cx"> class DirectoryService(BaseDirectoryService):
</span><span class="cx">
</span><ins>+ recordType = ConstantsContainer(
+ (RecordType.user, RecordType.group)
+ )
+
</ins><span class="cx"> def _getConnection(self):
</span><span class="cx"> # path = config.DirectoryProxy.SocketPath
</span><span class="cx"> path = "data/Logs/state/directory-proxy.sock"
</span><span class="lines">@@ -47,7 +55,13 @@
</span><span class="cx"> def recordWithShortName(self, recordType, shortName):
</span><span class="cx">
</span><span class="cx"> def deserialize(result):
</span><del>- return pickle.loads(result['record'])
</del><ins>+ 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)
</ins><span class="cx">
</span><span class="cx"> def call(ampProto):
</span><span class="cx"> return ampProto.callRemote(
</span><span class="lines">@@ -60,6 +74,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class DirectoryRecord(BaseDirectoryRecord):
+ pass
+
+
</ins><span class="cx"> class DirectoryProxyAMPFactory(Factory):
</span><span class="cx"> """
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>