[CalendarServer-changes] [12528] CalendarServer/trunk/txdav/dps

[source_changes at macosforge.org]

Revision: 12528
          http://trac.calendarserver.org//changeset/12528
Author:   sagen at apple.com
Date:     2014-01-31 17:22:05 -0800 (Fri, 31 Jan 2014)
Log Message:
-----------
Simple implementation of recordWithShortName

Modified Paths:
--------------
    CalendarServer/trunk/txdav/dps/client.py
    CalendarServer/trunk/txdav/dps/protocol.py
    CalendarServer/trunk/txdav/dps/service.py

Modified: CalendarServer/trunk/txdav/dps/client.py
===================================================================
--- 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)
@@ -34,7 +34,12 @@
     def gotResults(record):
         print('Done: %s' % (record,))
         reactor.stop()
-    d.addCallback(gotResults)
+
+    def gotError(failure):
+        print("Failure: %s" % (failure,))
+        reactor.stop()
+
+    d.addCallbacks(gotResults, gotError)
     reactor.run()
 
 if __name__ == '__main__':

Modified: CalendarServer/trunk/txdav/dps/protocol.py
===================================================================
--- 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)
@@ -30,11 +30,10 @@
         ('shortName', amp.String()),
     ]
     response = [
-        ('record', amp.String()),
+        ('fields', amp.String()),
     ]
 
 
-
 class DirectoryProxyAMPProtocol(amp.AMP):
     """
     """
@@ -49,44 +48,22 @@
     @RecordWithShortNameCommand.responder
     @inlineCallbacks
     def recordWithShortName(self, recordType, shortName):
+        recordType = recordType.decode("utf-8")
+        shortName = shortName.decode("utf-8")
         log.debug("RecordWithShortName: {r} {n}", r=recordType, n=shortName)
         record = (yield self._directory.recordWithShortName(
             RecordType.lookupByName(recordType), shortName)
         )
-        record.service = None
+        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
+
         response = {
-            "record": pickle.dumps(record),
+            "fields": pickle.dumps(fields),
         }
         log.debug("Responding with: {response}", response=response)
         returnValue(response)
-
-
-#
-# 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()

Modified: CalendarServer/trunk/txdav/dps/service.py
===================================================================
--- 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)
@@ -16,6 +16,10 @@
 
 from twext.who.xml import DirectoryService as XMLDirectoryService
 from twext.who.index import DirectoryService as BaseDirectoryService
+from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
+from twext.who.util import ConstantsContainer
+from twext.who.idirectory import RecordType
+
 from twisted.python.usage import Options, UsageError
 from twisted.plugin import IPlugin
 from twisted.application import service
@@ -39,6 +43,10 @@
 
 class DirectoryService(BaseDirectoryService):
 
+    recordType = ConstantsContainer(
+        (RecordType.user, RecordType.group)
+    )
+
     def _getConnection(self):
         # path = config.DirectoryProxy.SocketPath
         path = "data/Logs/state/directory-proxy.sock"
@@ -47,7 +55,13 @@
     def recordWithShortName(self, recordType, shortName):
 
         def deserialize(result):
-            return pickle.loads(result['record'])
+            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):
             return ampProto.callRemote(
@@ -60,6 +74,10 @@
 
 
 
+class DirectoryRecord(BaseDirectoryRecord):
+    pass
+
+
 class DirectoryProxyAMPFactory(Factory):
     """
     """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/a780e0ee/attachment.html>