Changeset 721

Timestamp:

07/20/08 07:43:36 (4 months ago)

Author:

sylvain

Message:

Extended PubSub? support.
Added subscription dialog box

Files:

• oss/jlib/designer/ui/createnodedialog.ui (modified) (3 diffs)
• oss/jlib/designer/ui/subscribenodedialog.ui (added)
• oss/jlib/examples/basic/client.py (modified) (8 diffs)
• oss/jlib/jlib/core/connection.py (modified) (1 diff)
• oss/jlib/jlib/core/pubsub.py (modified) (13 diffs)
• oss/jlib/jlib/gui/pubsub/node.py (modified) (3 diffs)
• oss/jlib/jlib/gui/pubsub/subscribenodedialog.py (added)
• oss/jlib/jlib/gui/pubsub/subscribenodedialogui.py (added)
• oss/jlib/jlib/gui/pubsub/subscription.py (modified) (2 diffs)

oss/jlib/designer/ui/createnodedialog.ui

@@ -7 +7 @@
-    <y>0</y>
-    <width>405</width>
-0
+3
-   </rect>
-  </property>
@@ -13 +13 @@
-   <string>Dialog</string>
-  </property>
-name="gridLayout" 
+
-   <item row="0" column="0" >
-    <widget class="QLabel" name="label" >
@@ -30 +30 @@
-     </property>
-     <property name="standardButtons" >
-
+NoButton|QDialogButtonBox::
-     </property>
-    </widget>

oss/jlib/examples/basic/client.py

@@ -11 +11 @@
-from jlib.gui.pubsub.feature import jlibPubSubFeatureWidget
-from jlib.core.pubsub import jlibSubscriptionDiscoveryModel, \
-
+
+
-
-from clientui import Ui_MainWindow
@@ -26 +27 @@
-        self.actionStart.setEnabled(False)
-        self.actionStop.setEnabled(False)
+        self.options = parse_commandline()
-
-        self.openedChats = []
@@ -44 +46 @@
-        self.affsUi = jlibPubSubAffiliationWidget(parent=self.page_5)
-        
-Node
+Item
-        self.nodesUi = jlibPubSubNodeWidget(parent=self.page_4)
-
@@ -51 +53 @@
-                               self.clientReady)
-        self.connection.emit(QtCore.SIGNAL("activateChat()"))
-'pubsub.localhost'
+nicode(self.options.pubsub)
-        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.contact)
-        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.presence)
@@ -67 +69 @@
-        self.dialog = jlibConnectionDialog()
-
-
-
+
+
+
+
+
-        self.dialog.connection.resource.setText('Home')
-
+
+
-
-        if self.dialog.exec_() == QtGui.QDialog.Accepted:
@@ -96 +102 @@
-        disco.emit(QtCore.SIGNAL("discoverAffiliations()"))
-
+        QtCore.QObject.connect(disco, QtCore.SIGNAL("receivedItems(PyQt_PyObject)"),
+                               self.setItemsModel)
+
-    def setSubscriptionsModel(self, subscriptions):
-        model = jlibSubscriptionDiscoveryModel(parent=self.connection.qobj.discovery)
-        model.setSubscriptions(subscriptions)
+        self.subsUi.setPubSub(self.connection.qobj.pubsubnode)
+        self.subsUi.setDiscovery(self.connection.qobj.discovery)
-        self.subsUi.setModel(model)
-
@@ -111 +122 @@
-        self.affsUi.setPubSub(self.connection.qobj.pubsubnode)
-        self.affsUi.setModel(model)
+
+    def setItemsModel(self, items):
+        model = jlibNodeItemModel(parent=self.connection.qobj.discovery)
+        model.setNodeItems(items)
+        self.nodesUi.setPubSub(self.connection.qobj.pubsubnode)
+        self.nodesUi.setModel(model)
-
-    def messageReceived(self, message):
@@ -131 +148 @@
-        self.tabWidget.setCurrentIndex(tab)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-if __name__ == "__main__":
-    import sys

oss/jlib/jlib/core/connection.py

@@ -109 +109 @@
-        ClientStream.Outboxes["%s.publish" % XMPP_PUBSUB_NS] = "Pubsub item publication handler"
-        ClientStream.Outboxes["%s.retract" % XMPP_PUBSUB_NS] = "Pubsub item deletion handler"
+        ClientStream.Outboxes["%s.items" % XMPP_PUBSUB_NS] = "Pubsub item retrieval handler"
-        ClientStream.Outboxes["%s.x" % XMPP_PUBSUB_EVENT_NS] = ""
-        ClientStream.Outboxes["%s.event" % XMPP_PUBSUB_EVENT_NS] = ""

oss/jlib/jlib/core/pubsub.py

@@ -25 +25 @@
-           'jlibFeatureItem', 'jlibFeatureDiscoveryModel',
-           'jlibAffiliationItem', 'jlibAffiliationDiscoveryModel',
-
+
+
-
-class jlibPubSubDiscovery(QAxonObject):
@@ -70 +71 @@
-        
-    def discoverNodeSubscriptions(self, node_name):
-Non
+node_nam
-
-    def discoverItems(self, node_name):
@@ -290 +291 @@
-
-    def type(self):
-4
+5
-    
-class jlibAffiliationDiscoveryModel(QtGui.QStandardItemModel):
@@ -349 +350 @@
-        QtCore.QObject.connect(self, QtCore.SIGNAL("unsubscribeNode(PyQt_PyObject)"), self.unsubscribeNode)  
-        QtCore.QObject.connect(self, QtCore.SIGNAL("publishItem(PyQt_PyObject, PyQt_PyObject)"), self.publishItem)  
-
-
+
+
+
-
-    def setComponent(self, component):
@@ -364 +366 @@
-                    ("xmpp", "%s.publish" % XMPP_PUBSUB_NS): ("pubsubdisp", "publish.inbox"),
-                    ("xmpp", "%s.retract" % XMPP_PUBSUB_NS): ("pubsubdisp", "retract.inbox"),
+                    ("xmpp", "%s.items" % XMPP_PUBSUB_NS): ("pubsubdisp", "retrieve.inbox"),
-                    ("xmpp", "%s.x" % XMPP_PUBSUB_EVENT_NS): ("pubsubdisp", "message.inbox"),
-                    ("xmpp", "%s.event" % XMPP_PUBSUB_EVENT_NS): ("pubsubdisp", "message.inbox"),
@@ -369 +372 @@
-                    ("itemshandler", "create-node"): ("pubsubdisp", "create.forward"),
-                    ("itemshandler", "delete-node"): ("pubsubdisp", "delete.forward"),
+                    ("itemshandler", "retrieve-item"): ("pubsubdisp", "retrieve.forward"),
-                    ("itemshandler", "subscribe-node"): ("pubsubdisp", "subscribe.forward"),
-                    ("itemshandler", "unsubscribe-node"): ("pubsubdisp", "unsubscribe.forward"),
@@ -374 +378 @@
-                    ('itemshandler', 'delete-item'): ('pubsubdisp', 'retract.forward'),
-                    ('itemshandler', 'purge-collection-node'): ('pubsubdisp', 'purge.forward'),
+                    ("pubsubdisp", "retrieve.outbox"): ("xmpp", "forward"),
-                    ("pubsubdisp", "create.outbox"): ("xmpp", "forward"),
-                    ("pubsubdisp", "delete.outbox"): ("xmpp", "forward"),
@@ -381 +386 @@
-                    ("pubsubdisp", "publish.outbox"): ("xmpp", "forward"),
-                    ("pubsubdisp", "retract.outbox"): ("xmpp", "forward"),
+                    ("pubsubdisp", "out.retrieve.result"): ("itemshandler", "retrieved"),
-                    ("pubsubdisp", "out.create.result"): ("itemshandler", "created"),
-                    ("pubsubdisp", "out.subscribe.result"): ("itemshandler", "subscribed"),
-                    ("pubsubdisp", "out.delete.result"): ("itemshandler", "deleted"),
+                    ("pubsubdisp", "out.retrieve.error"): ("itemshandler", "error"),
-                    ("pubsubdisp", "out.create.error"): ("itemshandler", "error"),
-                    ("pubsubdisp", "out.delete.error"): ("itemshandler", "error"),
@@ -414 +421 @@
-    def purgeCollectionNode(self, node_id):
-        self._deliver(node_id, 'request-purge-collection-node')
+
+    def retrieveItem(self, node_id, item_id):
+        self._deliver((node_id, item_id), 'request-item')
-
-class jlibPubSubNodeComponent(component):
@@ -427 +437 @@
-               "request-publish-item":     "",
-               "request-delete-item":     "",
+               "request-item": "",
-               "request-purge-collection-node": "",
-               
-               "subscribed": "",
+               "retrieved": "",
-               "created": "",
-               "deleted" : "",
@@ -444 +456 @@
-                "publish-item"  : "",
-                "delete-item"  : "",
+                "retrieve-item": "",
-                "purge-collection-node": "",
-                "subscribe-node"   : "",
@@ -487 +500 @@
-                p = Node(unicode(self.from_jid), self.pubsub_service, node_name=nodeid)
-                self.send(p, "create-node")
+
+            if self.dataReady('request-item'):
+                node_id, item_id = self.recv('request-item')
+                p = Node(unicode(self.from_jid), self.pubsub_service, type=u"get",
+                         node_name=node_id, item=Item(id=item_id))
+                self.send(p, "retrieve-item")
-
-            if self.dataReady('request-create-collection-node'):
@@ -532 +551 @@
-  
-            yield 1
+
+class jlibNodeItem(QtGui.QStandardItem):
+    def __init__(self, node_item):
+        QtGui.QStandardItem.__init__(self)
+        self.node_item = node_item
+
+    def type(self):
+        return QtGui.QStandardItem.UserType + 106
+    
+class jlibNodeItemModel(QtGui.QStandardItemModel):
+    def __init__(self, parent=None):
+        QtGui.QStandardItemModel.__init__(self, 0, 1, parent)
+        self.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Item ID"))
+        self.items = {}
+
+    def flags(self, index):
+        return QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled
+
+    def setNodeItems(self, node_items):
+        for item in node_items.items:
+            self.setNodeItem(item)
+
+    def hasNodeItem(self, item_id):
+        return item_id in self.items
+
+    def getNodeItemIndex(self, node_item):
+        item_id = str(node_item.name)
+        if self.hasNodeItem(item_id):
+            return self.items[item_id].index()
+
+        return QtCore.QModelIndex()
+
+    def getNodeItem(self, index):
+        return self.itemFromIndex(index)
+
+    def setNodeItem(self, node_item):
+        rootItem = self.invisibleRootItem()
+
+        item_id = str(node_item.name)
+        index = self.getNodeItemIndex(node_item)
+        if index.isValid():
+            item = self.items[item_id]
+        else:
+            item = jlibNodeItem(node_item)
+        
+        rootItem.appendRow(item)
+        self.setData(self.index(item.row(), 0), QtCore.QVariant(QtCore.QString(item_id)),
+                    QtCore.Qt.DisplayRole)
+
+        self.items[item_id] = item
+
+        return item

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

@@ -16 +16 @@
-
-        self.nodes.contextMenuEvent = self.contextMenuEvent
+        QtCore.QObject.connect(self.nodes, QtCore.SIGNAL("clicked(QModelIndex)"), self.clicked)
-
-    def setPubSub(self, pubsub):
@@ -21 +22 @@
-        QtCore.QObject.connect(self.pubsub, QtCore.SIGNAL("receivedError(PyQt_PyObject)"),
-                               self.handleError)
+
+    def setModel(self, model):
+        self.nodes.setModel(model)
-
-    def handleError(self, node):
@@ -31 +35 @@
-            self.pubsub.emit(QtCore.SIGNAL("createNode(PyQt_PyObject)"), unicode(ui.nodeName.text()))
-
+    def clicked(self, index):
+        model = self.nodes.model()
+        item = model.getNodeItem(index)
+        self.pubsub.emit(QtCore.SIGNAL("retrieveItem(PyQt_PyObject, PyQt_PyObject)"),
+                         item.node_item.node, item.node_item.name)
+
-    def contextMenuEvent(self, event):
-        menu = QtGui.QMenu(self.parent())

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

@@ -3 +3 @@
-
-from jlib.gui.pubsub.subscriptionsui import Ui_jlibPubSubSubscription
+from jlib.gui.pubsub.subscribenodedialog import jlibSubscribeNodeDialog
-
-__all__ = ['jlibPubSubSubscriptionWidget']
@@ -13 +14 @@
-    def setupUi(self, parent=None):
-        Ui_jlibPubSubSubscription.setupUi(self, parent)
+        self.subscriptions.contextMenuEvent = self.contextMenuEvent
-
-    def setModel(self, model):
-        self.subscriptions.setModel(model)
+
+    def setPubSub(self, pubsub):
+        self.pubsub = pubsub
+
+    def setDiscovery(self, discovery):
+        self.discovery = discovery
+
+    def subscribeNode(self):
+        ui = jlibSubscribeNodeDialog()
+        ui.show()
+        if ui.exec_() == QtGui.QDialog.Accepted:
+            self.pubsub.emit(QtCore.SIGNAL("subscribeNode(PyQt_PyObject)"), unicode(ui.nodeName.text()))
+            self.discovery.emit(QtCore.SIGNAL("discoverSubscriptions()"))
+
+    def unsubscribeNode(self):
+        model = self.subscriptions.model()
+        subscription = model.getSubscriptionItem(self.subscriptions.currentIndex()).subscription
+        self.pubsub.emit(QtCore.SIGNAL("unsubscribeNode(PyQt_PyObject)"), unicode(subscription.node))
+        self.discovery.emit(QtCore.SIGNAL("discoverSubscriptions()"))
+
+    def discoverNode(self):
+        model = self.subscriptions.model()
+        subscription = model.getSubscriptionItem(self.subscriptions.currentIndex()).subscription
+        self.discovery.emit(QtCore.SIGNAL("discoverNodeSubscriptions(PyQt_PyObject)"), subscription.node)
+
+    def discoverItems(self):
+        model = self.subscriptions.model()
+        subscription = model.getSubscriptionItem(self.subscriptions.currentIndex()).subscription
+        self.discovery.emit(QtCore.SIGNAL("discoverItems(PyQt_PyObject)"), subscription.node)
+
+    def contextMenuEvent(self, event):
+        menu = QtGui.QMenu(self.parent())
+
+        actionSubscribeNode = QtGui.QAction(QtCore.QString("Subscribe to a node"), self.parent())
+        QtCore.QObject.connect(actionSubscribeNode, QtCore.SIGNAL("triggered()"), self.subscribeNode)
+        menu.addAction(actionSubscribeNode)
+
+        actionUnsubscribeNode = QtGui.QAction(QtCore.QString("Unsubscribe from a node"), self.parent())
+        QtCore.QObject.connect(actionUnsubscribeNode, QtCore.SIGNAL("triggered()"), self.unsubscribeNode)
+        menu.addAction(actionUnsubscribeNode)
+
+        actionDiscoverNode = QtGui.QAction(QtCore.QString("Discover node"), self.parent())
+        QtCore.QObject.connect(actionDiscoverNode, QtCore.SIGNAL("triggered()"), self.discoverNode)
+        menu.addAction(actionDiscoverNode)
+
+        actionDiscoverItem = QtGui.QAction(QtCore.QString("Discover items"), self.parent())
+        QtCore.QObject.connect(actionDiscoverItem, QtCore.SIGNAL("triggered()"), self.discoverItems)
+        menu.addAction(actionDiscoverItem)
+
+        menu.exec_(event.globalPos())