node support (JEP 0030). Has to be tested
This commit is contained in:
Yann Leboulanger
parent
a3fb1bac82
commit
eb83c5dd5e
|
|
@ -321,6 +321,10 @@ class Connection:
|
|||
|
||||
def _DiscoverItemsCB(self, con, iq_obj):
|
||||
gajim.log.debug('DiscoverItemsCB')
|
||||
q = iq_obj.getQueryNode()
|
||||
node = q.getAttr('node')
|
||||
if not node:
|
||||
node = ''
|
||||
qp = iq_obj.getQueryPayload()
|
||||
items = []
|
||||
if not qp:
|
||||
|
|
@ -331,12 +335,16 @@ class Connection:
|
|||
attr[key.encode('utf8')] = i.attrs[key].encode('utf8')
|
||||
items.append(attr)
|
||||
jid = str(iq_obj.getFrom())
|
||||
self.dispatch('AGENT_INFO_ITEMS', (jid, items))
|
||||
self.dispatch('AGENT_INFO_ITEMS', (jid, node, items))
|
||||
|
||||
def _DiscoverInfoErrorCB(self, con, iq_obj):
|
||||
gajim.log.debug('DiscoverInfoErrorCB')
|
||||
jid = str(iq_obj.getFrom())
|
||||
con.browseAgents(jid)
|
||||
q = iq_obj.getQueryNode()
|
||||
node = q.getAttr('node')
|
||||
if not node:
|
||||
node = ''
|
||||
con.browseAgents(jid, node)
|
||||
|
||||
def _DiscoverInfoCB(self, con, iq_obj):
|
||||
gajim.log.debug('DiscoverInfoCB')
|
||||
|
|
@ -344,6 +352,10 @@ class Connection:
|
|||
# For identity: category, name is mandatory, type is optional.
|
||||
# For feature: var is mandatory
|
||||
identities, features = [], []
|
||||
q = iq_obj.getQueryNode()
|
||||
node = q.getAttr('node')
|
||||
if not node:
|
||||
node = ''
|
||||
qp = iq_obj.getQueryPayload()
|
||||
if not qp:
|
||||
qp = []
|
||||
|
|
@ -357,10 +369,10 @@ class Connection:
|
|||
features.append(i.getAttr('var'))
|
||||
jid = str(iq_obj.getFrom())
|
||||
if not identities:
|
||||
self.connection.browseAgents(jid)
|
||||
self.connection.browseAgents(jid, node)
|
||||
else:
|
||||
self.dispatch('AGENT_INFO_INFO', (jid, identities, features))
|
||||
self.connection.discoverItems(jid)
|
||||
self.connection.discoverItems(jid, node)
|
||||
|
||||
def _VersionCB(self, con, iq_obj):
|
||||
gajim.log.debug('VersionCB')
|
||||
|
|
@ -663,9 +675,9 @@ class Connection:
|
|||
if self.connection:
|
||||
self.connection.updateRosterItem(jid=jid, name=name, groups=groups)
|
||||
|
||||
def request_agents(self, jid):
|
||||
def request_agents(self, jid, node):
|
||||
if self.connection:
|
||||
self.connection.discoverInfo(jid)
|
||||
self.connection.discoverInfo(jid, node)
|
||||
|
||||
def ask_register_agent_info(self, agent):
|
||||
if not self.connection:
|
||||
|
|
|
|||
|
|
@ -716,7 +716,7 @@ class Client(Connection):
|
|||
|
||||
def _discover(self,ns,jid,node=None):
|
||||
iq=Iq(to=jid,type='get',query=ns)
|
||||
if node: iq.putAttr('node',node)
|
||||
if node: iq.getQueryNode().putAttr('node',node)
|
||||
self.send(iq)
|
||||
|
||||
def discoverItems(self,jid,node=None):
|
||||
|
|
|
|||
|
|
@ -1541,17 +1541,22 @@ class Service_discovery_window:
|
|||
self.address_comboboxentry_entry = self.address_comboboxentry.child
|
||||
self.address_comboboxentry_entry.set_activates_default(True)
|
||||
|
||||
model = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING)
|
||||
model = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_STRING,
|
||||
gobject.TYPE_STRING)
|
||||
self.services_treeview.set_model(model)
|
||||
#columns
|
||||
renderer = gtk.CellRendererText()
|
||||
renderer.set_data('column', 0)
|
||||
self.services_treeview.insert_column_with_attributes(-1, 'Name', \
|
||||
self.services_treeview.insert_column_with_attributes(-1, _('Name'), \
|
||||
renderer, text = 0)
|
||||
renderer = gtk.CellRendererText()
|
||||
renderer.set_data('column', 1)
|
||||
self.services_treeview.insert_column_with_attributes(-1, 'Service', \
|
||||
self.services_treeview.insert_column_with_attributes(-1, _('Service'), \
|
||||
renderer, text = 1)
|
||||
renderer = gtk.CellRendererText()
|
||||
renderer.set_data('column', 1)
|
||||
self.services_treeview.insert_column_with_attributes(-1, _('Node'), \
|
||||
renderer, text = 2)
|
||||
|
||||
self.address_comboboxentry = xml.get_widget('address_comboboxentry')
|
||||
liststore = gtk.ListStore(str)
|
||||
|
|
@ -1577,22 +1582,25 @@ class Service_discovery_window:
|
|||
self.browse(server_address)
|
||||
self.window.show_all()
|
||||
|
||||
def browse(self, jid):
|
||||
def browse(self, jid, node = ''):
|
||||
'''Send a request to the core to know the available services'''
|
||||
model = self.services_treeview.get_model()
|
||||
if not model.get_iter_first():
|
||||
# we begin to fill the treevier with the first line
|
||||
iter = model.append(None, (jid, jid))
|
||||
iter = model.append(None, (jid, jid, node))
|
||||
self.agent_infos[jid] = {'features' : []}
|
||||
gajim.connections[self.account].request_agents(jid)
|
||||
gajim.connections[self.account].request_agents(jid, node)
|
||||
|
||||
def agents(self, agents):
|
||||
'''When list of available agent arrive :
|
||||
Fill the treeview with it'''
|
||||
model = self.services_treeview.get_model()
|
||||
for agent in agents:
|
||||
iter = model.append(None, (agent['name'], agent['jid']))
|
||||
self.agent_infos[agent['jid']] = {'features' : []}
|
||||
node = ''
|
||||
if agent.has_key('node'):
|
||||
node = agent['node']
|
||||
iter = model.append(None, (agent['name'], agent['jid'], node))
|
||||
self.agent_infos[agent['jid'] + node] = {'features' : []}
|
||||
|
||||
def iter_is_visible(self, iter):
|
||||
if not iter:
|
||||
|
|
@ -1611,22 +1619,24 @@ class Service_discovery_window:
|
|||
child = model.iter_children(iter)
|
||||
while child:
|
||||
child_jid = model.get_value(child, 1)
|
||||
child_node = model.get_value(child, 2)
|
||||
# We never requested its infos
|
||||
if not self.agent_infos[child_jid].has_key('features'):
|
||||
self.browse(child_jid)
|
||||
if not self.agent_infos[child_jid + child_node].has_key('features'):
|
||||
self.browse(child_jid, child_node)
|
||||
child = model.iter_next(child)
|
||||
|
||||
def agent_info_info(self, agent, identities, features):
|
||||
'''When we recieve informations about an agent, but not its items'''
|
||||
self.agent_info(agent, identities, features, [])
|
||||
|
||||
def agent_info_items(self, agent, items):
|
||||
def agent_info_items(self, agent, node, items):
|
||||
'''When we recieve items about an agent'''
|
||||
model = self.services_treeview.get_model()
|
||||
iter = model.get_iter_root()
|
||||
# We look if this agent is in the treeview
|
||||
while (iter):
|
||||
if agent == model.get_value(iter, 1):
|
||||
if agent == model.get_value(iter, 1) and node == model.get_value(
|
||||
iter, 2):
|
||||
break
|
||||
if model.iter_has_child(iter):
|
||||
iter = model.iter_children(iter)
|
||||
|
|
@ -1644,17 +1654,21 @@ class Service_discovery_window:
|
|||
name = ''
|
||||
if item.has_key('name'):
|
||||
name = item['name']
|
||||
node = ''
|
||||
if item.has_key('node'):
|
||||
node = item['node']
|
||||
# We look if this item is already in the treeview
|
||||
iter_child = model.iter_children(iter)
|
||||
while iter_child:
|
||||
if item['jid'] == model.get_value(iter_child, 1):
|
||||
if item['jid'] == model.get_value(iter_child, 1) and \
|
||||
node == model.get_value(iter_child, 2):
|
||||
break
|
||||
iter_child = model.iter_next(iter_child)
|
||||
if not iter_child: # If it is not we add it
|
||||
iter_child = model.append(iter, (name, item['jid']))
|
||||
self.agent_infos[item['jid']] = {'identities': [item]}
|
||||
iter_child = model.append(iter, (name, item['jid'], node))
|
||||
self.agent_infos[item['jid'] + node] = {'identities': [item]}
|
||||
if self.iter_is_visible(iter_child) or expand:
|
||||
self.browse(item['jid'])
|
||||
self.browse(item['jid'], node)
|
||||
if expand:
|
||||
self.services_treeview.expand_row((model.get_path(iter)), False)
|
||||
|
||||
|
|
@ -1662,9 +1676,14 @@ class Service_discovery_window:
|
|||
'''When we recieve informations about an agent'''
|
||||
model = self.services_treeview.get_model()
|
||||
iter = model.get_iter_root()
|
||||
node = ''
|
||||
if len(identities):
|
||||
if identities[0].has_key('node'):
|
||||
node = identities[0]['node']
|
||||
# We look if this agent is in the treeview
|
||||
while (iter):
|
||||
if agent == model.get_value(iter, 1):
|
||||
if agent == model.get_value(iter, 1) and node == model.get_value(
|
||||
iter, 2):
|
||||
break
|
||||
if model.iter_has_child(iter):
|
||||
iter = model.iter_children(iter)
|
||||
|
|
@ -1675,25 +1694,12 @@ class Service_discovery_window:
|
|||
iter = model.iter_next(iter)
|
||||
if not iter: #If it is not we stop
|
||||
return
|
||||
self.agent_infos[agent]['features'] = features
|
||||
self.agent_infos[agent + node]['features'] = features
|
||||
if len(identities):
|
||||
self.agent_infos[agent]['identities'] = identities
|
||||
self.agent_infos[agent + node]['identities'] = identities
|
||||
if identities[0].has_key('name'):
|
||||
model.set_value(iter, 0, identities[0]['name'])
|
||||
for item in items:
|
||||
if not item.has_key('name'):
|
||||
continue
|
||||
# We look if this item is already in the treeview
|
||||
iter_child = model.iter_children(iter)
|
||||
while iter_child:
|
||||
if item['jid'] == model.get_value(iter_child, 1):
|
||||
break
|
||||
iter_child = model.iter_next(iter_child)
|
||||
if not iter_child: # If it is not we add it
|
||||
iter_child = model.append(iter, (item['name'], item['jid']))
|
||||
self.agent_infos[item['jid']] = {'identities': [item]}
|
||||
if self.iter_is_visible(iter_child):
|
||||
self.browse(item['jid'])
|
||||
self.agent_info_items(agent, node, items)
|
||||
|
||||
def on_refresh_button_clicked(self, widget):
|
||||
'''When refresh button is clicked: refresh list: clear and rerequest it'''
|
||||
|
|
@ -1760,13 +1766,17 @@ class Service_discovery_window:
|
|||
model, iter = self.services_treeview.get_selection().get_selected()
|
||||
if not iter: return
|
||||
jid = model.get_value(iter, 1)
|
||||
if self.agent_infos[jid].has_key('features'):
|
||||
if common.jabber.NS_REGISTER in self.agent_infos[jid]['features']:
|
||||
node = model.get_value(iter, 2)
|
||||
if self.agent_infos[jid + node].has_key('features'):
|
||||
if common.jabber.NS_REGISTER in self.agent_infos[jid + node] \
|
||||
['features']:
|
||||
self.register_button.set_sensitive(True)
|
||||
if self.agent_infos[jid].has_key('identities'):
|
||||
if len(self.agent_infos[jid]['identities']):
|
||||
if self.agent_infos[jid]['identities'][0].has_key('category'):
|
||||
if self.agent_infos[jid]['identities'][0]['category'] == 'conference':
|
||||
if self.agent_infos[jid + node].has_key('identities'):
|
||||
if len(self.agent_infos[jid + node]['identities']):
|
||||
if self.agent_infos[jid + node]['identities'][0].has_key(
|
||||
'category'):
|
||||
if self.agent_infos[jid + node]['identities'][0]['category'] == \
|
||||
'conference':
|
||||
self.join_button.set_sensitive(True)
|
||||
|
||||
def on_go_button_clicked(self, widget):
|
||||
|
|
|
|||
|
|
@ -350,9 +350,10 @@ class Interface:
|
|||
array[2], array[3])
|
||||
|
||||
def handle_event_agent_info_items(self, account, array):
|
||||
#('AGENT_INFO_ITEMS', account, (agent, items))
|
||||
#('AGENT_INFO_ITEMS', account, (agent, node, items))
|
||||
if self.windows[account].has_key('disco'):
|
||||
self.windows[account]['disco'].agent_info_items(array[0], array[1])
|
||||
self.windows[account]['disco'].agent_info_items(array[0], array[1],
|
||||
array[2])
|
||||
|
||||
def handle_event_agent_info_info(self, account, array):
|
||||
#('AGENT_INFO_INFO', account, (agent, identities, features))
|
||||
|
|
|
|||
Loading…
Reference in New Issue