frontend improved to take into account new SàT features
- quick_frontend: better use of contact management, it now manages nicks, avatars, and connected status - quick_frontend: disconnect and remove are now 2 separate methods for contact list - wix: new contact list using HTML items, and showing avatars. Groups are not showed for now - wix: contact status now use tuples, to keep order, human readable status and color of contact - wix: contact list is updated when avatar or nick is found - wix: fixed 'question' dialog, which is renamed in 'yes/no' - wix: action result are now ignored for unkwnown id - sortilege refactored to work again
This commit is contained in:
parent
94dd813a9a
commit
3b2d29b632
1 changed files with 293 additions and 203 deletions
|
|
@ -19,29 +19,68 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
"""
|
||||
|
||||
from logging import debug, info, error
|
||||
from logging import debug, info, warning, error
|
||||
from tools.jid import JID
|
||||
import pdb
|
||||
|
||||
|
||||
class QuickContactManagement():
|
||||
"""This helper class manage the contacts and ease the use of nicknames and shortcuts"""
|
||||
### FIXME: is SàT a better place for all this stuff ??? ###
|
||||
|
||||
def __init__(self):
|
||||
self.__contactlist = {}
|
||||
|
||||
def add(self, jid_param):
|
||||
jid=JID(jid_param)
|
||||
self.__contactlist[jid.short] = {'name':jid, 'last_resource':jid.resource}
|
||||
def add(self, entity):
|
||||
"""Add contact to the list, update resources"""
|
||||
if not self.__contactlist.has_key(entity.short):
|
||||
self.__contactlist[entity.short] = {'resources':[]}
|
||||
if entity.resource in self.__contactlist[entity.short]['resources']:
|
||||
self.__contactlist[entity.short]['resources'].remove(entity.resource)
|
||||
self.__contactlist[entity.short]['resources'].append(entity.resource)
|
||||
|
||||
def remove(self, jid_param):
|
||||
jid=JID(jid_param)
|
||||
def getAttr(self, entity, name):
|
||||
"""Return a specific attribute of contact, or all attributes
|
||||
@param entity: jid of the contact
|
||||
@param name: name of the attribute
|
||||
@return: asked attribute"""
|
||||
if self.__contactlist.has_key(entity.short):
|
||||
if name == 'status': #FIXME: for the moment, we only use the first status
|
||||
if self.__contactlist[entity.short]['statuses']:
|
||||
return self.__contactlist[entity.short]['statuses'].values()[0]
|
||||
if self.__contactlist[entity.short].has_key(name):
|
||||
return self.__contactlist[entity.short][name]
|
||||
else:
|
||||
debug('Trying to get attribute for an unknown contact')
|
||||
return None
|
||||
|
||||
def isConnected(self, entity):
|
||||
"""Tell if the contact is online"""
|
||||
print "is connected (%s): %s" %(entity, str(self.__contactlist.has_key(entity.short))) #gof
|
||||
return self.__contactlist.has_key(entity.short)
|
||||
|
||||
def remove(self, entity):
|
||||
"""remove resource. If no more resource is online or is no resource is specified, contact is deleted"""
|
||||
try:
|
||||
del self.__contactlist[jid.short]
|
||||
if entity.resource:
|
||||
self.__contactlist[entity.short]['resources'].remove(entity.resource)
|
||||
if not entity.resource or not self.__contactlist[entity.short]['resources']:
|
||||
#no more resource available: the contact seems really disconnected
|
||||
del self.__contactlist[entity.short]
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
def get_full(self, jid_param):
|
||||
jid=JID(jid_param)
|
||||
return jid.short+'/'+self.__contactlist[jid.short]['last_resource']
|
||||
def update(self, entity, key, value):
|
||||
"""Update attribute of contact
|
||||
@param entity: jid of the contact
|
||||
@param key: name of the attribute
|
||||
@param value: value of the attribute
|
||||
"""
|
||||
if self.__contactlist.has_key(entity.short):
|
||||
self.__contactlist[entity.short][key] = value
|
||||
else:
|
||||
debug ('Trying to update an uknown contact: %s', entity.short)
|
||||
|
||||
def get_full(self, entity):
|
||||
return entity.short+'/'+self.__contactlist[entity.short]['resources'][-1]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue