Initial VCard (XEP-0054) support + misc fixes

- new xep-0054 plugin, avatar are cached, new getProfile bridge method
- gateways plugin (XEP-0100): new __private__ key in resulting data, used to keep target jid
This commit is contained in:
Goffi 2009-12-21 13:22:11 +11:00
commit 31df7d8557
3 changed files with 278 additions and 9 deletions

View file

@ -61,6 +61,9 @@ class DBusBridgeFrontend(BridgeFrontend):
def findGateways(self, target):
return self.db_comm_iface.findGateways(target)
def getProfile(self, target):
return self.db_comm_iface.getProfile(target)
def in_band_register(self, target):
return self.db_comm_iface.in_band_register(target)

View file

@ -25,6 +25,7 @@ from chat import Chat
from param import Param
from form import Form
from gateways import GatewaysManager
from profile import Profile
import gobject
import os.path
import pdb
@ -43,7 +44,8 @@ idEXIT = 3
idPARAM = 4
idADD_CONTACT = 5
idREMOVE_CONTACT = 6
idFIND_GATEWAYS = 7
idSHOW_PROFILE = 7
idFIND_GATEWAYS = 8
const_DEFAULT_GROUP = "Unclassed"
const_STATUS = {"Online":"",
"Want to discuss":"chat",
@ -208,6 +210,8 @@ class MainWindow(wx.Frame, QuickApp):
contactMenu = wx.Menu()
contactMenu.Append(idADD_CONTACT, "&Add contact"," Add a contact to your list")
contactMenu.Append(idREMOVE_CONTACT, "&Remove contact"," Remove the selected contact from your list")
contactMenu.AppendSeparator()
contactMenu.Append(idSHOW_PROFILE, "&Show profile", " Show contact's profile")
communicationMenu = wx.Menu()
communicationMenu.Append(idFIND_GATEWAYS, "&Find Gateways"," Find gateways to legacy IM")
menuBar = wx.MenuBar()
@ -223,6 +227,7 @@ class MainWindow(wx.Frame, QuickApp):
wx.EVT_MENU(self, idEXIT, self.onExit)
wx.EVT_MENU(self, idADD_CONTACT, self.onAddContact)
wx.EVT_MENU(self, idREMOVE_CONTACT, self.onRemoveContact)
wx.EVT_MENU(self, idSHOW_PROFILE, self.onShowProfile)
wx.EVT_MENU(self, idFIND_GATEWAYS, self.onFindGateways)
@ -332,12 +337,18 @@ class MainWindow(wx.Frame, QuickApp):
self.current_action_ids.remove(id)
debug ("Form received")
form=Form(self, title='Registration', target = data['target'], type = data['type'], xml_data = data['xml'])
elif type == "RESULT":
self.current_action_ids.remove(id)
if self.current_action_ids_cb.has_key(id):
callback = self.current_action_ids_cb[id]
del self.current_action_ids_cb[id]
callback(data)
elif type == "DICT_DICT":
self.current_action_ids.remove(id)
if self.current_action_ids_cb.has_key(id):
callback = self.current_action_ids_cb[id]
del self.current_action_ids_cb[id]
callback(id,data)
callback(data)
print ("Dict of dict found as result")
else:
error ("FIXME FIXME FIXME: type [%s] not implemented" % type)
@ -428,7 +439,7 @@ class MainWindow(wx.Frame, QuickApp):
dlg.Destroy()
return
dlg = wx.MessageDialog(self, "Are you sure you want to delete %s from your roster list ?" % target.short,
dlg = wx.MessageDialog(self, "Are you sure you want to delete %s from your roster list ?" % target.short,
'Contact suppression',
wx.YES_NO | wx.ICON_QUESTION
)
@ -439,6 +450,27 @@ class MainWindow(wx.Frame, QuickApp):
dlg.Destroy()
def onShowProfile(self, e):
debug("Show contact's profile request")
target = self.contactList.getSelection()
if not target:
dlg = wx.MessageDialog(self, "You haven't selected any contact !",
'Error',
wx.OK | wx.ICON_ERROR
)
dlg.ShowModal()
dlg.Destroy()
return
id = self.bridge.getProfile(target.short)
self.current_action_ids.add(id)
self.current_action_ids_cb[id] = self.onProfileReceived
def onProfileReceived(self, data):
"""Called when a profile is received"""
debug ('Profile received: [%s]' % data)
profile=Profile(self, data)
def onFindGateways(self, e):
debug("Find Gateways request")
id = self.bridge.findGateways(self.whoami.domain)
@ -446,9 +478,11 @@ class MainWindow(wx.Frame, QuickApp):
self.current_action_ids_cb[id] = self.onGatewaysFound
print "Find Gateways id=", id
def onGatewaysFound(self, id, data):
def onGatewaysFound(self, data):
"""Called when SàT has found the server gateways"""
gatewayManager = GatewaysManager(self, data)
target = data['__private__']['target']
del data['__private__']
gatewayManager = GatewaysManager(self, data, server=target)
def onClose(self, e):
info("Exiting...")

82
frontends/wix/profile.py Normal file
View file

@ -0,0 +1,82 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
"""
wix: a SAT frontend
Copyright (C) 2009 Jérôme Poisson (goffi@goffi.org)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
import wx
import pdb
from logging import debug, info, error
from tools.jid import JID
class Profile(wx.Frame):
"""This class is used to show/modify profile given by SàT"""
def __init__(self, host, data, title="Profile"):
super(Profile, self).__init__(None, title=title)
self.host = host
self.name_dict = { 'fullname': 'Full Name',
'nick' : 'Nickname',
'birthday' : 'Birthday',
'phone' : 'Phone #',
'website' : 'Website',
'email' : 'E-mail'
}
self.ctl_list = {} # usefull to access ctrl, key = (name)
self.sizer = wx.BoxSizer(wx.VERTICAL)
self.notebook=wx.Notebook(self, -1)
self.sizer.Add(self.notebook, 1, flag=wx.EXPAND)
self.SetSizer(self.sizer)
self.SetAutoLayout(True)
#events
self.Bind(wx.EVT_CLOSE, self.onClose, self)
self.MakeModal()
self.showData(data)
self.Show()
def showData(self, data):
flags = wx.TE_READONLY
#General tab
generaltab = wx.Panel(self.notebook)
sizer = wx.FlexGridSizer(cols=2)
sizer.AddGrowableCol(1)
generaltab.SetSizer(sizer)
generaltab.SetAutoLayout(True)
for field in ['fullname','nick', 'birthday', 'phone', 'website', 'email']:
value = data[field] if data.has_key(field) else ''
label=wx.StaticText(generaltab, -1, self.name_dict[field]+": ")
sizer.Add(label)
self.ctl_list[field] = wx.TextCtrl(generaltab, -1, value, style = flags)
sizer.Add(self.ctl_list[field], 1, flag = wx.EXPAND)
self.notebook.AddPage(generaltab, "General")
def onClose(self, event):
"""Close event"""
debug("close")
self.MakeModal(False)
event.Skip()