Changeset 731

Timestamp:

07/21/08 10:27:31 (4 months ago)

Author:

sylvain

Message:

Allowed for items to be published
Started to handle pubsub message

Files:

• oss/jlib/examples/basic/client.py (modified) (3 diffs)
• oss/jlib/jlib/core/pubsub.py (modified) (5 diffs)
• oss/jlib/jlib/gui/atom/entry.py (modified) (5 diffs)
• oss/jlib/jlib/gui/pubsub/node.py (modified) (4 diffs)

oss/jlib/examples/basic/client.py

@@ -134 +134 @@
-        self.nodesUi.setPubSub(self.connection.qobj.pubsubnode)
-        self.nodesUi.setModel(model)
+        self.nodesUi.setNode(items.node_name)
-
-    def messageReceived(self, message):
@@ -153 +154 @@
-        tab = self.tabWidget.addTab(widget, QtCore.QString(contact_jid))
-        self.tabWidget.setCurrentIndex(tab)
+
+    def updatedItem(self, node_name, item_id, entry):
+        pubsub = self.connection.qobj.pubsubnode
+        pubsub.emit(QtCore.SIGNAL("publishItem(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)"), 
+                    node_name, item_id, entry)
-
-    def retrievedItems(self, node):
@@ -163 +169 @@
-                    widget = QtGui.QWidget()
-                    form = jlibAtomEntryForm(parent=widget)
+                    form.setNode(node.node_name)
-                    form.setEntry(child)
-                    tab = self.tabWidget.addTab(widget, QtCore.QString(str(id_element)))
-                    self.tabWidget.setCurrentIndex(tab)
+                    
+                    QtCore.QObject.connect(form, QtCore.SIGNAL("itemReady(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)"),
+                                           self.updatedItem)
-
-def parse_commandline():

oss/jlib/jlib/core/pubsub.py

@@ -387 +387 @@
-                    ("pubsubdisp", "publish.outbox"): ("xmpp", "forward"),
-                    ("pubsubdisp", "retract.outbox"): ("xmpp", "forward"),
+                    ("pubsubdisp", "out.message"): ('itemshandler', 'message.received'),
-                    ("pubsubdisp", "out.retrieve.result"): ("itemshandler", "retrieved"),
-                    ("pubsubdisp", "out.create.result"): ("itemshandler", "created"),
@@ -446 +447 @@
-               "deleted" : "",
-               "error"       : "",
+               "message.received": "",
-               "xmpp.result": "",
-               "published": "",
@@ -510 +512 @@
-            if self.dataReady('request-publish-item'):
-                node_id, item_id, data = self.recv('request-publish-item')
-
-
-
+
+
+
+
-
-            if self.dataReady('request-create-collection-node'):
@@ -558 +561 @@
-                self.qobj.emit(QtCore.SIGNAL("errorNode(PyQt_PyObject)"), node)
-                
+            if self.dataReady("message.received"):
+                msg = self.recv("message.received")
+                self.qobj.emit(QtCore.SIGNAL("receivedPubSubMessage(PyQt_PyObject)"), message) 
+                
-            if not self.anyReady():
-                self.pause()
@@ -614 +621 @@
-
-        return item
+
+
+
+

oss/jlib/jlib/gui/atom/entry.py

@@ -1 +1 @@
-# -*- coding: utf-8 -*-
+import datetime
-from PyQt4 import QtCore, QtGui
-
+
+
+
-
-from jlib.gui.atom.entryui import Ui_jlibAtomEntryForm
-from jlib.core.atom import jlibAtomAuthorModel, jlibAtomLinkModel
-
-
+, 'jlibAtomEntryFormDialog'
-
-class jlibAtomEntryForm(QtGui.QWidget, Ui_jlibAtomEntryForm):
@@ -12 +15 @@
-        QtGui.QWidget.__init__(self, parent)
-        self.setupUi(parent=parent)
+        self.entry = None
-        self.node = None
-        self.entry = None
-
-    def setupUi(self, parent):
@@ -19 +22 @@
-        QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"),
-                               self.saveEntry)
-        
-    def setPubSub(self, pubsub):
-        self.pubsub = pubsub
-
-    def setNode(self, node):
-        self.node = node
+
+    def makeDefaultEntry(self):
+        entry = E(u'entry', namespace=ATOM10_NS, prefix=ATOM10_PREFIX)
+        E(u'id', namespace=ATOM10_NS, prefix=ATOM10_PREFIX,
+          content=unicode(self.atomID.text()), parent=entry)
+        date = unicode(datetime.datetime.utcnow().isoformat()) + u'Z'
+        E(u'published', namespace=ATOM10_NS, prefix=ATOM10_PREFIX,
+          content=date, parent=entry)
+        E(u'updated', namespace=ATOM10_NS, prefix=ATOM10_PREFIX,
+          content=date, parent=entry)
+        E(u'title', namespace=ATOM10_NS, prefix=ATOM10_PREFIX,
+          attributes={u'type': u'text'}, content=unicode(self.title.text()), parent=entry)
+        E(u'content', namespace=ATOM10_NS, prefix=ATOM10_PREFIX,
+          attributes={u'type': u'text'}, parent=entry)
+
+        self.entry = entry
-        
-    def setEntry(self, entry):
@@ -31 +47 @@
-        if id_element:
-            self.atomID.setText(QtCore.QString(str(id_element)))
+            self.atomID.setEnabled(False)
-
-        title_element = entry.get_child('title', ATOM10_NS)
@@ -49 +66 @@
-
-    def saveEntry(self):
-
-
+
+
+
+
+
+
+
+
-        
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -4 +4 @@
-from jlib.gui.pubsub.nodesui import Ui_jlibPubSubNodes
-from jlib.gui.pubsub.createnodedialog import jlibCreateNodeDialog
+from jlib.gui.atom.entry import jlibAtomEntryFormDialog
-
-__all__ = ['jlibPubSubNodeWidget']
@@ -23 +24 @@
-                               self.handleError)
-
+    def setNode(self, node):
+        self.node = node
+
-    def setModel(self, model):
-        self.nodes.setModel(model)
@@ -35 +39 @@
-            self.pubsub.emit(QtCore.SIGNAL("createNode(PyQt_PyObject)"), unicode(ui.nodeName.text()))
-
+    def publishAtomEntry(self):
+        dialog = jlibAtomEntryFormDialog()
+        if dialog.exec_() == QtGui.QDialog.Accepted:
+            self.pubsub.emit(QtCore.SIGNAL("publishItem(PyQt_PyObject, PyQt_PyObject, PyQt_PyObject)"), 
+                             self.node, unicode(dialog.form.atomID.text()), dialog.form.entry)
+
-    def clicked(self, index):
-        model = self.nodes.model()
@@ -44 +54 @@
-        menu = QtGui.QMenu(self.parent())
-
-
-
-
+
+
+
+
+
+
+
-
+        menu.addAction(publishMenu.menuAction())
-        menu.exec_(event.globalPos())