Changeset 747

Timestamp:

07/28/08 10:40:04 (4 months ago)

Author:

sylvain

Message:

Support for node information discovery

Files:

• oss/jlib/jlib/core/pubsub.py (modified) (7 diffs)
• oss/jlib/jlib/gui/pubsub/node.py (modified) (1 diff)
• oss/jlib/jlib/gui/pubsub/subscription.py (modified) (2 diffs)

oss/jlib/jlib/core/pubsub.py

@@ -36 +36 @@
-        QtCore.QObject.connect(self, QtCore.SIGNAL("discoverAffiliations()"), self.discoverAffiliations)
-        QtCore.QObject.connect(self, QtCore.SIGNAL("discoverItems(PyQt_PyObject)"), self.discoverItems)
+        QtCore.QObject.connect(self, QtCore.SIGNAL("discoverNodeInformation(PyQt_PyObject)"), self.discoverNodeInfo)
-    
-    def setComponent(self, component):
@@ -51 +52 @@
-                    ('discohandler', 'subscriptions-disco'): ('discodisp', 'subscription.forward'),
-                    ('discohandler', 'affiliations-disco'): ('discodisp', 'affiliation.forward'),
+                    ('discohandler', "information-disco"): ('discodisp', "info.forward"),
-                    ("discodisp", "out.features.result"): ('discohandler', "features.result"),
-                    ("discodisp",'subscription.outbox'):('xmpp','forward'),
@@ -58 +60 @@
-                    ("discodisp", 'out.items.result'): ('discohandler', 'items.result'),
-                    ("discodisp", 'out.items.error'): ('discohandler', 'items.error'),
+                    ("discodisp", 'out.info.result'): ('discohandler', 'information.result'),
-                    ("discodisp", "outbox"): ("xmpp", "forward")}
-        return dict(discohandler=self.component, discodisp=DiscoveryDispatcher()), linkages
@@ -75 +78 @@
-    def discoverItems(self, node_name):
-        self._deliver(node_name, 'request-items-disco')
+
+    def discoverNodeInfo(self, node_name):
+        self._deliver(node_name, 'request-information-disco')
-
-class jlibPubSubDiscoveryComponent(component):
@@ -86 +92 @@
-               "request-subscriptions-disco": "",
-               "request-node-subscriptions-disco": "",
+               "request-information-disco": "",
-               
-               "subscriptions.result": "",
-               "affiliations.result": "",
+               "information.result": "",
-               "features.result": "",
-               "items.result": "",
@@ -100 +108 @@
-                    "the other components about the features instance received from the server",
-                "items-disco"   : "",
+                "information-disco": "",
-                "subscriptions-disco": "",
-                "affiliations-disco" : ""}
@@ -152 +161 @@
-                d = AffiliationsDiscovery(unicode(self.from_jid), self.pubsub_service)
-                self.send(d, "affiliations-disco")
+
+            if self.dataReady("request-information-disco"):
+                nodeid = self.recv("request-information-disco")
+                d = InformationDiscovery(unicode(self.from_jid), self.pubsub_service, node_name=nodeid)
+                self.send(d, "information-disco")
-
-            if self.dataReady("request-items-disco"):

oss/jlib/jlib/gui/pubsub/node.py

@@ -76 +76 @@
-        item = model.itemFromIndex(index)
-
-
+
+
+
+
+
+
+
+
-            menu = QtGui.QMenu(self.parent())
-            publishMenu = QtGui.QMenu(menu)

oss/jlib/jlib/gui/pubsub/subscription.py

@@ -43 +43 @@
-        self.discovery.emit(QtCore.SIGNAL("discoverNodeSubscriptions(PyQt_PyObject)"), subscription.node)
-
+    def discoverNodeInfo(self):
+        model = self.subscriptions.model()
+        subscription = model.getSubscriptionItem(self.subscriptions.currentIndex()).subscription
+        self.discovery.emit(QtCore.SIGNAL("discoverNodeInformation(PyQt_PyObject)"), subscription.node)
+
-    def discoverItems(self):
-        model = self.subscriptions.model()
@@ -63 +68 @@
-        menu.addAction(actionDiscoverNode)
-
+        actionDiscoverNodeInfo = QtGui.QAction(QtCore.QString("Discover node information"), self.parent())
+        QtCore.QObject.connect(actionDiscoverNodeInfo, QtCore.SIGNAL("triggered()"), self.discoverNodeInfo)
+        menu.addAction(actionDiscoverNodeInfo)
+
-        actionDiscoverItem = QtGui.QAction(QtCore.QString("Discover items"), self.parent())
-        QtCore.QObject.connect(actionDiscoverItem, QtCore.SIGNAL("triggered()"), self.discoverItems)