Changeset 51

Timestamp:

03/06/02 22:42:27 (6 years ago)

Author:

sholloway

Message:

*** empty log message ***

Files:

• trunk/RBJabber/RBJabber/JID.py (added)
• trunk/RBJabber/RBJabber/JabberConnection.py (modified) (2 diffs)
• trunk/RBJabber/RBJabber/MessageRouter.py (added)
• trunk/RBJabber/RBJabber/PresenceMap.py (modified) (2 diffs)
• trunk/RBJabber/RBJabber/Test.py (modified) (3 diffs)

trunk/RBJabber/RBJabber/JabberConnection.py

@@ -6 +6 @@
-from Foundation import SmartSelect
-from Foundation.ContextApply import WeakInstanceApply
+from JID import *
-import socket
-import re
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -15 +15 @@
-_xmlJabberHeader = '''<?xml version="1.0" encoding="UTF-8" ?><stream:stream to="%s" xmlns="jabber:client" xmlns:stream="http://etherx.jabber.org/streams">'''
-_xmlJabberFooter = '''</stream:stream>'''
-
-_restrID = '''[\w-]+(?:[\w\.-]+[\w-]+)?'''
-_restrServer = '''[\w-]+(?:[\w\.-]+[\w-]+)?'''
-_restrResource = '''\S+'''
-reJabberURL = re.compile('''(?:jabber://)?(%s)''' % (_restrServer))
-reJabberJID = re.compile('''(%s)@(%s)(?:/(%s))?''' % (_restrID, _restrServer, _restrResource))
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/RBJabber/RBJabber/PresenceMap.py

@@ -3 +3 @@
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+
-
-#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#~ Classes 
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
+Basic
-    def __init__(self, JC):
-        JC.stream.AddObserver('presence', self)
@@ -14 +16 @@
-    def Update(self, subject, UpdateDict):
-        presence = UpdateDict.get('presence', None)
-
+
+
-
+    def __getitem__(self, *args, **kw):
+        return apply(self.Map.__getitem__, args, kw)
+
+    def __setitem__(self, *args, **kw):
+        return apply(self.Map.__setitem__, args, kw)
+
+    def __contains__(self, *args, **kw):
+        return apply(self.Map.__contains__, args, kw)
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class PresenceUpdateMap:
+    def __init__(self, JC, PresenceMapEntryClass=None):
+        JC.stream.AddObserver('presence', self)
+        self._UpdateMap = {}
+        if not PresenceMapEntryClass:
+            from Foundation.SubjectObserver.Subject import Subject
+            PresenceMapEntryClass = Subject
+        self.PresenceMapEntryClass = PresenceMapEntryClass
+
+    def _UpdateIndexXForm(self, FromJID):
+        FromJID = JIDsplitnorm(FromJID)
+        return (JIDjoin(FromJID), JIDjoin(FromJID)[:-1])
+
+    def _UpdateMapXForm(self, node):
+        return self._UpdateIndexXForm(node.from_)
+
+    def Update(self, subject, UpdateDict):
+        presence = UpdateDict.get('presence', None)
+        lstXForms = self._UpdateMapXForm(presence)
+        for index in lstXForms:
+            PresenceSubject = self._UpdateMap.get(index, None)
+            if PresenceSubject:
+                PresenceSubject.UpdateObservers(presence=presence, index=index)
+
+    def Get(self, index, bCreateSubject=1):
+        index = self._UpdateIndexXForm(index)[0]
+        result = self._UpdateMap.get(index, None)
+        if result is None and bCreateSubject:
+            result = self.PresenceMapEntryClass()
+            self._UpdateMap[index] = result
+        return result
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+class PresenceMap(PresenceUpdateMap, PresenceMapBasic):
+    def __init__(self, JC, PresenceMapEntryClass=None):
+        PresenceMapBasic.__init__(self, JC)
+        PresenceUpdateMap.__init__(self, JC, PresenceMapEntryClass=None)
+
+    def Update(self, subject, UpdateDict):
+        PresenceMapBasic.Update(self, subject, UpdateDict)
+        PresenceUpdateMap.Update(self, subject, UpdateDict)

trunk/RBJabber/RBJabber/Test.py

@@ -1 +1 @@
-from Client import *
-
+
+
-from Foundation.SmartSelect import SmartSelect
-from iqQuery import iqQuery
@@ -16 +17 @@
-    print
-    print "Message from %r" % value.from_
+    print value._toPrettyXML()
+    print
+
+def _printTypedMessage(subject, UpdateDict):
+    msgType = UpdateDict['index']
+    value = UpdateDict['message']
+    print
+    print "%s Message from %r" % (msgType, value.from_)
-    print value._toPrettyXML()
-    print
@@ -88 +97 @@
-
-        pm = PresenceMap(jc)
+        router = MessageRouterByType(jc)
+        obs = SubjectObserver.Observer(_printTypedMessage)
+        router.Get('message').AddObserver(obs)
+        router.Get('groupchat').AddObserver(obs)
+        router.Get('chat').AddObserver(obs)
+        router.Get('headline').AddObserver(obs)
-
-        for x in xrange(2): process(1)