Changeset 710

Timestamp:

07/07/08 05:52:38 (5 months ago)

Author:

sylvain

Message:

added Presence support

Files:

• oss/jlib/examples/basic/client.py (modified) (2 diffs)
• oss/jlib/jlib/core/contact.py (modified) (5 diffs)
• oss/jlib/jlib/gui/chat.py (modified) (1 diff)
• oss/jlib/jlib/gui/contact.py (modified) (4 diffs)

oss/jlib/examples/basic/client.py

@@ -27 +27 @@
-
-    def start(self):
-
+
+
-        self.connection.emit(QtCore.SIGNAL("start()"))
-        
@@ -40 +41 @@
-    def showConnectionSettings(self):
-        self.dialog = jlibConnectionDialog()
+
+        # Just because I can't be bothered to type them over and over again
-        self.dialog.connection.domain.setText('localhost')
-        self.dialog.connection.resource.setText('Home')
-        self.dialog.connection.host.setText('localhost')
+
-        if self.dialog.exec_() == QtGui.QDialog.Accepted:
-            self.connection = self.dialog.connection

oss/jlib/jlib/core/contact.py

@@ -5 +5 @@
-
-from headstock.protocol.core.roster import RosterDispatcher
+from headstock.protocol.core.presence import PresenceDispatcher
-from headstock.api.jid import JID
-from headstock.api import Entity
+from headstock.api.contact import Presence, Roster, Item
-from headstock.lib.utils import generate_unique
-
-from bridge import Element as E
-
+CLIENT_NS, XMPP_
-
-from PyQt4 import QtCore, QtGui
@@ -16 +18 @@
-from jlib.core.qaxon import QAxonObject
-
-
+
+
-
-class jlibContact(QAxonObject):
@@ -25 +28 @@
-        QAxonObject.setComponent(self, component)
-        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'inbox')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'pushed')
-
-    def getLinkages(self):
@@ -81 +85 @@
-                roster = self.recv('pushed')
-                for nodeid in roster.items:
+                    contact = roster.items[nodeid]
+                    if contact.subscription == 'remove':
+                        self.qobj.emit(QtCore.SIGNAL("removedContact(PyQt_PyObject)"), contact)
+                    elif contact.subscription == 'from':
+                        self.qobj.emit(QtCore.SIGNAL("addedContact(PyQt_PyObject)"), contact)
-                    self.send(Roster(from_jid=self.from_jid, to_jid=nodeid,
-                                     type=u'result', stanza_id=generate_unique()), 'result')
@@ -117 +126 @@
-        for nodeid in roster.items:
-            contact = roster.items[nodeid]
-
-
-
-
+
-
-    def getContact(self, index):
-        return self.roster.items.values()[index.row()]
+
+    def getIndex(self, contact):
+        for nodeid in self.roster.items:
+            if str(contact.jid) == nodeid:
+                return self.index(self.roster.items.keys().index(nodeid), 0)
+
+        return QtCore.QModelIndex()
+
+    def deleteContact(self, contact):
+        index = None
+        for nodeid in self.roster.items:
+            if str(contact.jid) == nodeid:
+                index = self.index(self.roster.items.keys().index(nodeid), 0)
+                del self.roster.items[nodeid]
+                break
+
+        if index:
+            self.removeRow(index.row(), index.parent())
+        
+    def addContact(self, contact):
+        item = QtGui.QStandardItem()
+        self.appendRow(item)
+        nodejid = str(contact.jid)
+        self.setData(self.index(item.row(), 0), 
+                     QtCore.QVariant(QtCore.QString(nodejid)))
+        if nodejid not in self.roster.items:
+            self.roster.items[nodejid] = contact
+
+class jlibPresence(QAxonObject):
+    def __init__(self, parent=None):
+        QAxonObject.__init__(self, parent)        
+        QtCore.QObject.connect(self, QtCore.SIGNAL("acceptSubscription(PyQt_PyObject)"),
+                               self.acceptSubscription) 
+        QtCore.QObject.connect(self, QtCore.SIGNAL("rejectSubscription(PyQt_PyObject)"),
+                               self.rejectSubscription)   
+        QtCore.QObject.connect(self, QtCore.SIGNAL("requestSubscription(PyQt_PyObject)"),
+                               self.requestSubscription) 
+        QtCore.QObject.connect(self, QtCore.SIGNAL("requestUnsubscription(PyQt_PyObject)"),
+                               self.requestUnsubscription)
+
+    def setComponent(self, component):
+        QAxonObject.setComponent(self, component)
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'inbox')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'acceptsub')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'rejectsub')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'requestsub')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'requestunsub')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'requestedsub')
+        self.emit(QtCore.SIGNAL("setupOneMapping(PyQt_PyObject)"), 'requestedunsub')
+
+    def getLinkages(self):
+        linkages = {("xmpp", "%s.presence" % XMPP_CLIENT_NS): ("presencedisp", "inbox"),
+                    ("presencedisp", "log"): ('logger', "inbox"),
+                    ("presencedisp", "xmpp.subscribe"): ("presencehandler", "requestedsub"),
+                    ("presencedisp", "xmpp.unsubscribe"): ("presencehandler", "requestedunsub"),
+                    ("presencehandler", "outbox"): ("presencedisp", "forward"),
+                    ("presencehandler", "roster"): ("rosterdisp", "forward"),
+                    ("presencedisp", "outbox"): ("xmpp", "forward")}
+        return dict(presencedisp=PresenceDispatcher(), presencehandler=self.component), linkages
+
+    def acceptSubscription(self, contact_jid):
+        self._deliver(contact_jid, 'acceptsub')
+
+    def rejectSubscription(self, contact_jid):
+        self._deliver(contact_jid, 'rejectsub')
+        
+    def requestSubscription(self, contact_jid):
+        self._deliver(contact_jid, 'requestsub')
+
+    def requestUnsubscription(self, contact_jid):
+        self._deliver(contact_jid, 'requestunsub')
+
+class jlibPresenceComponent(component):
+    Inboxes = {"inbox"       : "headstock.api.contact.Presence instance",
+               "control"     : "Shutdown the client stream",
+               "jid"          : "headstock.api.jid.JID instance received from the server",
+               "requestedsub"   : "Received subscription from a peer",
+               "requestedunsub" : "Received unsubscription from a peer",
+               "acceptsub"   : "Accepted subscription",
+               "rejectsub"   : "Rejected subscription",
+               "requestsub"  : "Request subscription to a peer",
+               "requestunsub"  : "Request unsubscription to a peer"}
+    
+    Outboxes = {"outbox" : "headstock.api.contact.Presence instance to return to the server",
+                "signal" : "Shutdown signal",
+                "roster" : "",
+                "log"    : "log",}
+    
+    def __init__(self):
+        super(jlibPresenceComponent, self).__init__()
+
+    def setQObject(self, qobj):
+        self.qobj = qobj
+
+    def initComponents(self):
+        sub = SubscribeTo("JID")
+        self.link((sub, 'outbox'), (self, 'jid'))
+        self.addChildren(sub)
+        sub.activate()
+
+        return 1
+
+    def main(self):
+        yield self.initComponents()
+
+        while 1:
+            if self.dataReady("control"):
+                mes = self.recv("control")
+                
+                if isinstance(mes, shutdownMicroprocess) or isinstance(mes, producerFinished):
+                    self.send(producerFinished(), "signal")
+                    break
+
+            if self.dataReady("jid"):
+                self.from_jid = self.recv('jid')
+            
+            if self.dataReady("requestedsub"):
+                p = self.recv("requestedsub")
+                p.swap_jids()
+
+                self.qobj.emit(QtCore.SIGNAL("requestedSubscription(PyQt_PyObject)"), p)
+
+            if self.dataReady("requestedunsub"):
+                p = self.recv("requestedunsub")
+                p.swap_jids()
+                
+                self.qobj.emit(QtCore.SIGNAL("requestedUnsubscription(PyQt_PyObject)"), p)
+
+            if self.dataReady("acceptsub"):
+                to_jid = self.recv("acceptsub")
+                p = Presence(from_jid=self.from_jid, to_jid=unicode(to_jid),
+                             type=u'subscribed')
+                self.send(p, "outbox")
+
+            if self.dataReady("rejectsub"):
+                to_jid = self.recv("rejectsub")
+                p = Presence(from_jid=self.from_jid, to_jid=unicode(to_jid),
+                             type=u'unsubscribed')
+                self.send(p, "outbox")
+
+            if self.dataReady("requestsub"):
+                to_jid = self.recv("requestsub")
+                p = Presence(from_jid=self.from_jid, to_jid=unicode(to_jid),
+                             type=u'subscribe')
+                self.send(p, "outbox")
+
+            if self.dataReady("requestunsub"):
+                to_jid = self.recv("requestunsub")
+                p = Presence(from_jid=self.from_jid, to_jid=unicode(to_jid),
+                             type=u'unsubscribe')
+                self.send(p, "outbox")
+
+                
+            if not self.anyReady():
+                self.pause()
+  
+            yield 1
+    

oss/jlib/jlib/gui/chat.py

@@ -27 +27 @@
-                       message)
-        history = self.chat.toPlainText()
-qobj.
+contact_
-        self.message.clear()
-

oss/jlib/jlib/gui/contact.py

@@ -3 +3 @@
-
-from jlib.gui.contactui import Ui_jlibContacts
-
+
+
-
-__all__ = ['jlibContactWidget']
@@ -15 +16 @@
-        Ui_jlibContacts.setupUi(self, parent)
-
-
-
-
+
+
+
+
+
+
+
+
+
-                               self.receivedRoster)
+        QtCore.QObject.connect(self.contact, QtCore.SIGNAL("removedContact(PyQt_PyObject)"),
+                               self.removedContact)
+        QtCore.QObject.connect(self.contact, QtCore.SIGNAL("addedContact(PyQt_PyObject)"),
+                               self.addedContact)
+
+        QtCore.QObject.connect(self.presence, QtCore.SIGNAL("requestedSubscription(PyQt_PyObject)"),
+                               self.requestedSubscription)
+
-
-        model = jlibContactModel(parent=self.contacts)
@@ -28 +43 @@
-        model = self.contacts.model()
-        model.setRoster(roster)
+        
+    def removedContact(self, contact):
+        model = self.contacts.model()
+        model.deleteContact(contact)
+
+    def addedContact(self, contact):
+        model = self.contacts.model()
+        model.addContact(contact)
-
-    def clicked(self, index):
@@ -33 +56 @@
-        self.emit(QtCore.SIGNAL("contactClicked(PyQt_PyObject)"), contact)
-
+    def requestedSubscription(self, presence):
+        reply = QtGui.QMessageBox.question(self, 'Subscription requested',
+                                           "%s wants to connect to you. Do you agree?" % str(presence.to_jid), 
+                                           QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+        if reply == QtGui.QMessageBox.Yes:
+            self.presence.emit(QtCore.SIGNAL("acceptSubscription(PyQt_PyObject)"), presence.to_jid)
+            self.presence.emit(QtCore.SIGNAL("requestSubscription(PyQt_PyObject)"), presence.to_jid)
+        else:
+            self.presence.emit(QtCore.SIGNAL("rejectSubscription(PyQt_PyObject)"), presence.to_jid)
+            
+    def unsubscribeFromContact(self):
+        index = self.contacts.currentIndex()
+        if index.isValid():
+            contact = index.model().getContact(index)
+            reply = QtGui.QMessageBox.question(self, 'Unsubscribe from contact',
+                                               "Do you really want to unsubscribe from %s?" % str(contact.jid), 
+                                               QtGui.QMessageBox.Yes, QtGui.QMessageBox.No)
+            if reply == QtGui.QMessageBox.Yes:
+                self.presence.emit(QtCore.SIGNAL("rejectSubscription(PyQt_PyObject)"), contact.jid)
+                self.presence.emit(QtCore.SIGNAL("requestUnsubscription(PyQt_PyObject)"), contact.jid)
+
+    def contextMenuEvent(self, event):
+        menu = QtGui.QMenu(self.parent())
+        actionUnsub = QtGui.QAction(QtCore.QString("Unsubscribe"), self.parent())
+        QtCore.QObject.connect(actionUnsub, QtCore.SIGNAL("triggered()"), self.unsubscribeFromContact)
+        menu.addAction(actionUnsub)
+        menu.exec_(event.globalPos())
+