libervia-backend: src/core/sat

annotate src/core/sat_main.py @ 513:8ee9113d307b

core, quick_frontend, primitivus, wixi, bridge: fixed delayed message timestamp: - new "extra" parameter in newMessage signal

author	Goffi <goffi@goffi.org>
date	Sat, 20 Oct 2012 17:23:56 +0200
parents	862c0d6ab974
children	a31abb97310d

rev	line source
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	1 #!/usr/bin/python
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	2 # -- coding: utf-8 --
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	3
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	4 """
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	5 SAT: a jabber client
459 cf005701624b copyleft date update Goffi <goffi@goffi.org> parents: 438 diff changeset	6 Copyright (C) 2009, 2010, 2011, 2012 Jérôme Poisson (goffi@goffi.org)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	7
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	8 This program is free software: you can redistribute it and/or modify
480 2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+ Goffi <goffi@goffi.org> parents: 471 diff changeset	9 it under the terms of the GNU Affero General Public License as published by
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	10 the Free Software Foundation, either version 3 of the License, or
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	11 (at your option) any later version.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	12
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	13 This program is distributed in the hope that it will be useful,
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	14 but WITHOUT ANY WARRANTY; without even the implied warranty of
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
480 2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+ Goffi <goffi@goffi.org> parents: 471 diff changeset	16 GNU Affero General Public License for more details.
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	17
480 2a072735e459 Licence modification: the full project is now under AGPL v3+ instead of GPL v3+ Goffi <goffi@goffi.org> parents: 471 diff changeset	18 You should have received a copy of the GNU Affero General Public License
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	19 along with this program. If not, see <http://www.gnu.org/licenses/>.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	20 """
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	21
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	22 CONST = {
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	23 'client_name' : u'SàT (Salut à toi)',
357 d98b7391d76c Changed version number to dev version Goffi <goffi@goffi.org> parents: 353 diff changeset	24 'client_version' : u'0.2.0D', #Please add 'D' at the end for dev versions
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	25 }
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	26
331 0a8eb0461f31 core: main SAT class now moved in its own module core.sat_main Goffi <goffi@goffi.org> parents: 330 diff changeset	27 from twisted.application import service
0a8eb0461f31 core: main SAT class now moved in its own module core.sat_main Goffi <goffi@goffi.org> parents: 330 diff changeset	28 from twisted.internet import defer
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	29 from twisted.internet.defer import inlineCallbacks, returnValue
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	30
39 2e3411a6baad Wix: external server management in gateways manager, SàT: bug fixes in gateway management Goffi <goffi@goffi.org> parents: 37 diff changeset	31 from twisted.words.protocols.jabber import jid, xmlstream
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	32 from twisted.words.xish import domish
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	33
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	34 from twisted.internet import reactor
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	35
331 0a8eb0461f31 core: main SAT class now moved in its own module core.sat_main Goffi <goffi@goffi.org> parents: 330 diff changeset	36 from wokkel import compat
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	37 from wokkel.xmppim import RosterItem
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	38
223 86d249b6d9b7 Files reorganisation Goffi <goffi@goffi.org> parents: 213 diff changeset	39 from sat.bridge.DBus import DBusBridge
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	40 import logging
460 fb1abc0f8c6a backend: added warning message when jabberfr workaround is used + fixed missing warning method Goffi <goffi@goffi.org> parents: 459 diff changeset	41 from logging import debug, info, warning, error
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	42
331 0a8eb0461f31 core: main SAT class now moved in its own module core.sat_main Goffi <goffi@goffi.org> parents: 330 diff changeset	43 import sys
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	44 import os.path
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	45
332 8c9b9ef13ba1 core: minor refactoring Goffi <goffi@goffi.org> parents: 331 diff changeset	46 from sat.core import xmpp
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	47 from sat.core.exceptions import ProfileUnknownError, UnknownEntityError
434 d7e5df876a04 core: path update for Memory import Goffi <goffi@goffi.org> parents: 427 diff changeset	48 from sat.memory.memory import Memory
223 86d249b6d9b7 Files reorganisation Goffi <goffi@goffi.org> parents: 213 diff changeset	49 from sat.tools.xml_tools import tupleList2dataForm
252 c09aa319712e Core: Trigger implementation + version number update Goffi <goffi@goffi.org> parents: 245 diff changeset	50 from sat.tools.misc import TriggerManager
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	51 from glob import glob
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	52
15 218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 14 diff changeset	53 try:
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 14 diff changeset	54 from twisted.words.protocols.xmlstream import XMPPHandler
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 14 diff changeset	55 except ImportError:
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 14 diff changeset	56 from wokkel.subprotocols import XMPPHandler
218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 14 diff changeset	57
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	58
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	59 ### logging configuration FIXME: put this elsewhere ###
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	60 logging.basicConfig(level=logging.DEBUG,
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	61 format='%(message)s')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	62 ###
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	63
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	64
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	65 sat_id = 0
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	66
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	67 def sat_next_id():
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	68 global sat_id
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	69 sat_id+=1
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	70 return "sat_id_"+str(sat_id)
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	71
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	72 class SAT(service.Service):
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	73
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	74 def get_next_id(self):
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	75 return sat_next_id()
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	76
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	77 def get_const(self, name):
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	78 """Return a constant"""
358 f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	79 try:
f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	80 _const = os.environ['SAT_CONST_%s' % name]
f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	81 if _const:
f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	82 debug(_("Constant %(name)s overrided with [%(value)s]") % {'name':name, 'value': _const})
f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	83 return _const
f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	84 except KeyError:
f147b778511a core: local_dir can now be overrided (usefull to launch 2 instances at the same time) Goffi <goffi@goffi.org> parents: 357 diff changeset	85 pass
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	86 if not CONST.has_key(name):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	87 error(_('Trying to access an undefined constant'))
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	88 raise Exception
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	89 return CONST[name]
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	90
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	91 def set_const(self, name, value):
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	92 """Save a constant"""
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	93 if CONST.has_key(name):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	94 error(_('Trying to redefine a constant'))
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	95 raise Exception
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	96 CONST[name] = value
d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	97
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	98 def __init__(self):
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	99 #TODO: standardize callback system
41 d24629c631fc SàT: new constant management, a local dir (~/.sat) is now used Goffi <goffi@goffi.org> parents: 39 diff changeset	100
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	101 self.__waiting_conf = {} #callback called when a confirmation is received
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	102 self.__progress_cb_map = {} #callback called when a progress is requested (key = progress id)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	103 self.__general_cb_map = {} #callback called for general reasons (key = name)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	104 self.__private_data = {} #used for internal callbacks (key = id)
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	105 self.profiles = {}
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	106 self.plugins = {}
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	107 self.menus = {} #used to know which new menus are wanted by plugins
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	108
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	109 self.memory=Memory(self)
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	110
365 efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	111 local_dir = self.memory.getConfig('', 'local_dir')
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	112 if not os.path.exists(local_dir):
312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	113 os.makedirs(local_dir)
312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	114
312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	115 self.trigger = TriggerManager() #trigger are used to change SàT behaviour
312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	116
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	117 self.bridge=DBusBridge()
119 ded2431cea5a Primitivus: chat window / text sending. Goffi <goffi@goffi.org> parents: 107 diff changeset	118 self.bridge.register("getVersion", lambda: self.get_const('client_version'))
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	119 self.bridge.register("getProfileName", self.memory.getProfileName)
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 58 diff changeset	120 self.bridge.register("getProfilesList", self.memory.getProfilesList)
504 65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	121 self.bridge.register("getEntityData", lambda _jid, keys, profile: self.memory.getEntityData(jid.JID(_jid),keys, profile))
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 58 diff changeset	122 self.bridge.register("createProfile", self.memory.createProfile)
420 acd908528ef7 core: profile creation/deletion through database Goffi <goffi@goffi.org> parents: 416 diff changeset	123 self.bridge.register("asyncCreateProfile", self.memory.asyncCreateProfile)
68 9b842086d915 multiple profiles update Goffi <goffi@goffi.org> parents: 67 diff changeset	124 self.bridge.register("deleteProfile", self.memory.deleteProfile)
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	125 self.bridge.register("registerNewAccount", self.registerNewAccount)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	126 self.bridge.register("connect", self.connect)
341 9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	127 self.bridge.register("asyncConnect", self.asyncConnect)
1 a06a151fc31f Disconnect first draft Goffi <goffi@goffi.org> parents: 0 diff changeset	128 self.bridge.register("disconnect", self.disconnect)
466 448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	129 self.bridge.register("getContacts", self.getContacts)
501 e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	130 self.bridge.register("getContactsFromGroup", self.getContactsFromGroup)
399 3ed53803b3b3 core: added getLastResource method Goffi <goffi@goffi.org> parents: 397 diff changeset	131 self.bridge.register("getLastResource", self.memory.getLastResource)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	132 self.bridge.register("getPresenceStatus", self.memory.getPresenceStatus)
50 daa1f01a5332 SàT improvement: Goffi <goffi@goffi.org> parents: 41 diff changeset	133 self.bridge.register("getWaitingSub", self.memory.getWaitingSub)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	134 self.bridge.register("sendMessage", self.sendMessage)
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 358 diff changeset	135 self.bridge.register("getConfig", self.memory.getConfig)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	136 self.bridge.register("setParam", self.setParam)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	137 self.bridge.register("getParamA", self.memory.getParamA)
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 412 diff changeset	138 self.bridge.register("asyncGetParamA", self.memory.asyncGetParamA)
105 d2630fba8dfd params to XMLUI tools Goffi <goffi@goffi.org> parents: 103 diff changeset	139 self.bridge.register("getParamsUI", self.memory.getParamsUI)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	140 self.bridge.register("getParams", self.memory.getParams)
18 6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	141 self.bridge.register("getParamsForCategory", self.memory.getParamsForCategory)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	142 self.bridge.register("getParamsCategories", self.memory.getParamsCategories)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	143 self.bridge.register("getHistory", self.memory.getHistory)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	144 self.bridge.register("setPresence", self.setPresence)
50 daa1f01a5332 SàT improvement: Goffi <goffi@goffi.org> parents: 41 diff changeset	145 self.bridge.register("subscription", self.subscription)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	146 self.bridge.register("addContact", self.addContact)
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	147 self.bridge.register("updateContact", self.updateContact)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	148 self.bridge.register("delContact", self.delContact)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	149 self.bridge.register("isConnected", self.isConnected)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	150 self.bridge.register("launchAction", self.launchAction)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	151 self.bridge.register("confirmationAnswer", self.confirmationAnswer)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	152 self.bridge.register("getProgress", self.getProgress)
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	153 self.bridge.register("getMenus", self.getMenus)
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	154 self.bridge.register("getMenuHelp", self.getMenuHelp)
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	155 self.bridge.register("callMenu", self.callMenu)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	156
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	157 self.memory.initialized.addCallback(self._postMemoryInit)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	158
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	159 def _postMemoryInit(self, ignore):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	160 """Method called after memory initialization is done"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	161 info(_("Memory initialised"))
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	162 self._import_plugins()
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	163
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	164
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	165 def _import_plugins(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	166 """Import all plugins found in plugins directory"""
226 d8bb72f00eec distutils install: fixed plugin import and log file path Goffi <goffi@goffi.org> parents: 225 diff changeset	167 import sat.plugins
d8bb72f00eec distutils install: fixed plugin import and log file path Goffi <goffi@goffi.org> parents: 225 diff changeset	168 plugins_path = os.path.dirname(sat.plugins.__file__)
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	169 plug_lst = [os.path.splitext(plugin)[0] for plugin in map(os.path.basename,glob(os.path.join(plugins_path,"plugin*.py")))]
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	170 __plugins_to_import = {} #plugins we still have to import
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	171 for plug in plug_lst:
287 2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	172 plugin_path = 'sat.plugins.'+plug
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	173 __import__(plugin_path)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	174 mod = sys.modules[plugin_path]
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	175 plugin_info = mod.PLUGIN_INFO
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	176 __plugins_to_import[plugin_info['import_name']] = (plugin_path, mod, plugin_info)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	177 while True:
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	178 self._import_plugins_from_dict(__plugins_to_import)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	179 if not __plugins_to_import:
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	180 break
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	181
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	182 def _import_plugins_from_dict(self, plugins_to_import, import_name=None):
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	183 """Recursively import and their dependencies in the right order
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	184 @param plugins_to_import: dict where key=import_name and values= (plugin_path, module, plugin_info)"""
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	185 if self.plugins.has_key(import_name):
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	186 debug('Plugin [%s] already imported, passing' % import_name)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	187 return
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	188 if not import_name:
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	189 import_name,(plugin_path, mod, plugin_info) = plugins_to_import.popitem()
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	190 else:
288 76247af9917c core: added plugin dependency not found import error Goffi <goffi@goffi.org> parents: 287 diff changeset	191 if not import_name in plugins_to_import:
76247af9917c core: added plugin dependency not found import error Goffi <goffi@goffi.org> parents: 287 diff changeset	192 raise ImportError(_('Dependency plugin not found: [%s]') % import_name)
287 2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	193 plugin_path, mod, plugin_info = plugins_to_import.pop(import_name)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	194 dependencies = plugin_info.setdefault("dependencies",[])
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	195 for dependency in dependencies:
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	196 if not self.plugins.has_key(dependency):
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	197 debug('Recursively import dependency of [%s]: [%s]' % (import_name, dependency))
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	198 self._import_plugins_from_dict(plugins_to_import, dependency)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	199 info (_("importing plugin: %s"), plugin_info['name'])
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	200 self.plugins[import_name] = getattr(mod, plugin_info['main'])(self)
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	201 if plugin_info.has_key('handler') and plugin_info['handler'] == 'yes':
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	202 self.plugins[import_name].is_handler = True
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	203 else:
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	204 self.plugins[import_name].is_handler = False
2720536b5a22 core: added plugin dependency management Goffi <goffi@goffi.org> parents: 282 diff changeset	205 #TODO: test xmppclient presence and register handler parent
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	206
341 9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	207
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	208 def connect(self, profile_key = '@DEFAULT@'):
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	209 """Connect to jabber server"""
341 9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	210 self.asyncConnect(profile_key)
9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	211
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	212 def asyncConnect(self, profile_key = '@DEFAULT@'):
341 9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	213 """Connect to jabber server with asynchronous reply
9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	214 @param profile_key: %(doc_profile)s
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	215 """
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	216
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	217 profile = self.memory.getProfileName(profile_key)
324 b069055320b1 core: fixed bad profile check in connect method Goffi <goffi@goffi.org> parents: 313 diff changeset	218 if not profile:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	219 error (_('Trying to connect a non-exsitant profile'))
471 6cd04adddaea core: exceptions moved to core Goffi <goffi@goffi.org> parents: 466 diff changeset	220 raise ProfileUnknownError(profile_key)
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	221
89 23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	222 if (self.isConnected(profile)):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	223 info(_("already connected !"))
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	224 return defer.succeed("None")
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	225
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	226 def afterMemoryInit(ignore):
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	227 """This part must be called when we have loaded individual parameters from memory"""
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	228 current = self.profiles[profile] = xmpp.SatXMPPClient(self, profile,
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	229 jid.JID(self.memory.getParamA("JabberID", "Connection", profile_key = profile), profile),
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	230 self.memory.getParamA("Password", "Connection", profile_key = profile),
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	231 self.memory.getParamA("Server", "Connection", profile_key = profile), 5222)
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	232
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	233 current.messageProt = xmpp.SatMessageProtocol(self)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	234 current.messageProt.setHandlerParent(current)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	235
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	236 current.roster = xmpp.SatRosterProtocol(self)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	237 current.roster.setHandlerParent(current)
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	238
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	239 current.presence = xmpp.SatPresenceProtocol(self)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	240 current.presence.setHandlerParent(current)
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	241
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	242 current.fallBack = xmpp.SatFallbackHandler(self)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	243 current.fallBack.setHandlerParent(current)
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	244
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	245 current.versionHandler = xmpp.SatVersionHandler(self.get_const('client_name'),
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	246 self.get_const('client_version'))
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	247 current.versionHandler.setHandlerParent(current)
14 a62d7d453f22 wokkel integration, part II Goffi <goffi@goffi.org> parents: 13 diff changeset	248
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	249 debug (_("setting plugins parents"))
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	250
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	251 for plugin in self.plugins.iteritems():
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	252 if plugin[1].is_handler:
62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	253 plugin[1].getHandler(profile).setHandlerParent(current)
438 62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	254 connected_cb = getattr(plugin[1], "profileConnected", None)
62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	255 if connected_cb:
62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	256 connected_cb(profile)
14 a62d7d453f22 wokkel integration, part II Goffi <goffi@goffi.org> parents: 13 diff changeset	257
412 62b17854254e database integration: first draft Goffi <goffi@goffi.org> parents: 399 diff changeset	258 current.startService()
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	259
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	260 return current.getConnectionDeferred()
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	261
484 23cbdf0a0777 core: presence status + last resource refactored and kept in entitiesCache in memory.py, profile cache is purged on disconnection Goffi <goffi@goffi.org> parents: 480 diff changeset	262 self.memory.startProfileSession(profile)
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 420 diff changeset	263 return self.memory.loadIndividualParams(profile).addCallback(afterMemoryInit)
341 9eebdc655b8b code: added asyncConnect Goffi <goffi@goffi.org> parents: 336 diff changeset	264
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	265 def disconnect(self, profile_key):
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	266 """disconnect from jabber server"""
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	267 if (not self.isConnected(profile_key)):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	268 info(_("not connected !"))
6 5799493fa548 connection and disconnection management Goffi <goffi@goffi.org> parents: 5 diff changeset	269 return
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	270 profile = self.memory.getProfileName(profile_key)
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	271 info(_("Disconnecting..."))
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	272 self.profiles[profile].stopService()
438 62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	273 for plugin in self.plugins.iteritems():
62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	274 disconnected_cb = getattr(plugin[1], "profileDisconnected", None)
62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	275 if disconnected_cb:
62145e50eae5 core: plugins can now have profileConnected/profileDisconnected method to initialise/free profile dependant resources Goffi <goffi@goffi.org> parents: 434 diff changeset	276 disconnected_cb(profile)
6 5799493fa548 connection and disconnection management Goffi <goffi@goffi.org> parents: 5 diff changeset	277
466 448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	278 def getContacts(self, profile_key):
448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	279 client = self.getClient(profile_key)
448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	280 if not client:
501 e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	281 raise ProfileUnknownError(_('Asking contacts for a non-existant profile'))
466 448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	282 ret = []
504 65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	283 for item in client.roster.getItems(): #we get all items for client's roster
466 448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	284 #and convert them to expected format
448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	285 attr = client.roster.getAttributes(item)
448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	286 ret.append([item.jid.userhost(), attr, item.groups])
448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	287 return ret
448ce3c9e2ac core: Roster cache refactoring: cache is now managed by client's SatRosterProtocol instance. Goffi <goffi@goffi.org> parents: 460 diff changeset	288
501 e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	289 def getContactsFromGroup(self, group, profile_key):
e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	290 client = self.getClient(profile_key)
e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	291 if not client:
e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	292 raise ProfileUnknownError(_("Asking group's contacts for a non-existant profile"))
e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	293 return client.roster.getJidsFromGroup(group)
e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 489 diff changeset	294
416 32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	295 def purgeClient(self, profile):
32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	296 """Remove reference to a profile client and purge cache
32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	297 the garbage collector can then free the memory"""
32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	298 try:
32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	299 del self.profiles[profile]
32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	300 except KeyError:
32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	301 error(_("Trying to remove reference to a client not referenced"))
484 23cbdf0a0777 core: presence status + last resource refactored and kept in entitiesCache in memory.py, profile cache is purged on disconnection Goffi <goffi@goffi.org> parents: 480 diff changeset	302 self.memory.purgeProfileSession(profile)
416 32dc8b18c2ae core: param loading/purging on profile connection/disconnection Goffi <goffi@goffi.org> parents: 413 diff changeset	303
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	304 def startService(self):
bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	305 info("Salut à toi ô mon frère !")
213 5c420b1f1df4 removed connect on statService, this was causing issue on first launch Goffi <goffi@goffi.org> parents: 210 diff changeset	306 #TODO: manage autoconnect
5c420b1f1df4 removed connect on statService, this was causing issue on first launch Goffi <goffi@goffi.org> parents: 210 diff changeset	307 #self.connect()
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	308
bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	309 def stopService(self):
15 218ec9984fa5 wokkel integration part III + memory saved again Goffi <goffi@goffi.org> parents: 14 diff changeset	310 self.memory.save()
13 bd9e9997d540 wokkel integration (not finished yet) Goffi <goffi@goffi.org> parents: 12 diff changeset	311 info("Salut aussi à Rantanplan")
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	312
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	313 def run(self):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	314 debug(_("running app"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	315 reactor.run()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	316
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	317 def stop(self):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	318 debug(_("stopping app"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	319 reactor.stop()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	320
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	321 ## Misc methods ##
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	322
64 d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	323 def getJidNStream(self, profile_key):
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	324 """Convenient method to get jid and stream from profile key
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	325 @return: tuple (jid, xmlstream) from profile, can be None"""
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	326 profile = self.memory.getProfileName(profile_key)
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	327 if not profile or not self.profiles[profile].isConnected():
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	328 return (None, None)
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	329 return (self.profiles[profile].jid, self.profiles[profile].xmlstream)
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	330
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	331 def getClient(self, profile_key):
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	332 """Convenient method to get client from profile key
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	333 @return: client or None if it doesn't exist"""
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	334 profile = self.memory.getProfileName(profile_key)
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	335 if not profile:
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	336 return None
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	337 return self.profiles[profile]
d46f849664aa SàT: multi-profile, plugins updated Goffi <goffi@goffi.org> parents: 63 diff changeset	338
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 332 diff changeset	339 def registerNewAccount(self, login, password, email, server, port = 5222, id = None):
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	340 """Connect to a server and create a new account using in-band registration"""
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	341
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	342 next_id = id or sat_next_id() #the id is used to send server's answer
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 332 diff changeset	343 serverRegistrer = xmlstream.XmlStreamFactory(xmpp.RegisteringAuthenticator(self, server, login, password, email, next_id))
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	344 connector = reactor.connectTCP(server, port, serverRegistrer)
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	345 serverRegistrer.clientConnectionLost = lambda conn, reason: connector.disconnect()
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	346
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	347 return next_id
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	348
107 5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	349 def registerNewAccountCB(self, id, data, profile):
135 7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	350 user = jid.parse(self.memory.getParamA("JabberID", "Connection", profile_key=profile))[0]
7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	351 password = self.memory.getParamA("Password", "Connection", profile_key=profile)
7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	352 server = self.memory.getParamA("Server", "Connection", profile_key=profile)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	353
23 925ab466c5ec better presentation for register new account Goffi <goffi@goffi.org> parents: 22 diff changeset	354 if not user or not password or not server:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	355 info (_('No user or server given'))
23 925ab466c5ec better presentation for register new account Goffi <goffi@goffi.org> parents: 22 diff changeset	356 #TODO: a proper error message must be sent to frontend
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	357 self.actionResult(id, "ERROR", {'message':_("No user, password or server given, can't register new account.")})
23 925ab466c5ec better presentation for register new account Goffi <goffi@goffi.org> parents: 22 diff changeset	358 return
925ab466c5ec better presentation for register new account Goffi <goffi@goffi.org> parents: 22 diff changeset	359
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	360 confirm_id = sat_next_id()
135 7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	361 self.__private_data[confirm_id]=(id,profile)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	362
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	363 self.askConfirmation(confirm_id, "YES/NO",
135 7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	364 {"message":_("Are you sure to register new account [%(user)s] to server %(server)s ?") % {'user':user, 'server':server, 'profile':profile}},
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	365 self.regisConfirmCB)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	366 print ("===============+++++++++++ REGISTER NEW ACCOUNT++++++++++++++============")
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	367 print "id=",id
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	368 print "data=",data
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	369
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	370 def regisConfirmCB(self, id, accepted, data):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	371 print _("register Confirmation CB ! (%s)") % str(accepted)
135 7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	372 action_id,profile = self.__private_data[id]
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	373 del self.__private_data[id]
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	374 if accepted:
135 7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	375 user = jid.parse(self.memory.getParamA("JabberID", "Connection", profile_key=profile))[0]
7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	376 password = self.memory.getParamA("Password", "Connection", profile_key=profile)
7452ac3818e7 Core, wix: added profile management for RegisterNewAccount method, and LaunchAction Goffi <goffi@goffi.org> parents: 119 diff changeset	377 server = self.memory.getParamA("Server", "Connection", profile_key=profile)
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 332 diff changeset	378 self.registerNewAccount(user, password, None, server, id=action_id)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	379 else:
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	380 self.actionResult(action_id, "SUPPRESS", {})
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	381
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	382 def submitForm(self, action, target, fields, profile_key):
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	383 """submit a form
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	384 @param target: target jid where we are submitting
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	385 @param fields: list of tuples (name, value)
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	386 @return: tuple: (id, deferred)
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	387 """
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	388
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	389 profile = self.memory.getProfileName(profile_key)
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	390 assert(profile)
36 6491b7956c80 wix: Form submitting, first draft Goffi <goffi@goffi.org> parents: 33 diff changeset	391 to_jid = jid.JID(target)
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	392
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	393 iq = compat.IQ(self.profiles[profile].xmlstream, 'set')
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	394 iq["to"] = target
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	395 iq["from"] = self.profiles[profile].jid.full()
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	396 query = iq.addElement(('jabber:iq:register', 'query'))
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	397 if action=='SUBMIT':
102 94011f553cd0 misc bugfixes Goffi <goffi@goffi.org> parents: 101 diff changeset	398 form = tupleList2dataForm(fields)
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	399 query.addChild(form.toElement())
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	400 elif action=='CANCEL':
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	401 query.addElement('remove')
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	402 else:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	403 error (_("FIXME FIXME FIXME: Unmanaged action (%s) in submitForm") % action)
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	404 raise NotImplementedError
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	405
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	406 deferred = iq.send(target)
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	407 return (iq['id'], deferred)
36 6491b7956c80 wix: Form submitting, first draft Goffi <goffi@goffi.org> parents: 33 diff changeset	408
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	409 ## Client management ##
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	410
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	411 def setParam(self, name, value, category, profile_key):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	412 """set wanted paramater and notice observers"""
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	413 info (_("setting param: %(name)s=%(value)s in category %(category)s") % {'name':name, 'value':value, 'category':category})
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	414 self.memory.setParam(name, value, category, profile_key)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	415
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	416 def isConnected(self, profile_key):
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	417 """Return connection status of profile
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	418 @param profile_key: key_word or profile name to determine profile name
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	419 @return True if connected
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	420 """
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	421 profile = self.memory.getProfileName(profile_key)
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	422 if not profile:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	423 error (_('asking connection status for a non-existant profile'))
213 5c420b1f1df4 removed connect on statService, this was causing issue on first launch Goffi <goffi@goffi.org> parents: 210 diff changeset	424 return
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	425 if not self.profiles.has_key(profile):
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	426 return False
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	427 return self.profiles[profile].isConnected()
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	428
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	429 def launchAction(self, type, data, profile_key):
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	430 """Launch a specific action asked by client
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	431 @param type: action type (button)
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	432 @param data: needed data to launch the action
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	433
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	434 @return: action id for result, or empty string in case or error
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	435 """
107 5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	436 profile = self.memory.getProfileName(profile_key)
5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	437 if not profile:
5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	438 error (_('trying to launch action with a non-existant profile'))
5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	439 raise Exception #TODO: raise a proper exception
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	440 if type=="button":
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	441 try:
106 138d82f64b6f plugin CS: friends parsing Goffi <goffi@goffi.org> parents: 105 diff changeset	442 cb_name = data['callback_id']
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	443 except KeyError:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	444 error (_("Incomplete data"))
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	445 return ""
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	446 id = sat_next_id()
107 5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	447 self.callGeneralCB(cb_name, id, data, profile = profile)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	448 return id
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	449 else:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	450 error (_("Unknown action type"))
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	451 return ""
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	452
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	453
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	454 ## jabber methods ##
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	455
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	456 def sendMessage(self, to, msg, subject=None, mess_type='auto', profile_key='@DEFAULT@'):
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	457 #FIXME: check validity of recipient
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	458 profile = self.memory.getProfileName(profile_key)
93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	459 assert(profile)
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	460 client = self.profiles[profile]
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	461 current_jid = client.jid
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	462 mess_data = { #we put data in a dict, so trigger methods can change them
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	463 "to": jid.JID(to),
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	464 "message": msg,
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	465 "subject": subject,
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	466 "type": mess_type
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	467 }
506 2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	468
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	469 if mess_data["type"] == "auto":
506 2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	470 # we try to guess the type
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	471 if mess_data["subject"]:
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	472 mess_data["type"] = 'normal'
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	473 elif not mess_data["to"].resource: #if to JID has a resource, the type is not 'groupchat'
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	474 #we may have a groupchat message, we check if the we know this jid
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	475 try:
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	476 entity_type = self.memory.getEntityData(mess_data["to"], ['type'], profile)["type"]
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	477 #FIXME: should entity_type manage ressources ?
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	478 except (UnknownEntityError, KeyError):
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	479 entity_type = "contact"
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	480
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	481 if entity_type == "chatroom":
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	482 mess_data["type"] = 'groupchat'
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	483 else:
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	484 mess_data["type"] = 'chat'
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	485 else:
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	486 mess_data["type"] == 'chat'
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	487 mess_data["type"] == "chat" if mess_data["subject"] else "normal"
506 2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	488
2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	489 if not self.trigger.point("sendMessage", mess_data, profile):
2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	490 return
2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	491
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	492 debug(_("Sending jabber message of type [%(type)s] to %(to)s...") % {"type": mess_data["type"], "to": to})
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	493 message = domish.Element(('jabber:client','message'))
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	494 message["to"] = mess_data["to"].full()
62 93cb45a7420f SàT multi-profile: connection using profiles Goffi <goffi@goffi.org> parents: 60 diff changeset	495 message["from"] = current_jid.full()
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	496 message["type"] = mess_data["type"]
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	497 if mess_data["subject"]:
260 c8406fe5e81e Added SMTP server plugin, for sending messages from classic MUA \o/ Goffi <goffi@goffi.org> parents: 257 diff changeset	498 message.addElement("subject", "jabber:client", subject)
506 2e43c74815ad plugin text commands: Text commands is a new plugin that bring IRC-like commands Goffi <goffi@goffi.org> parents: 504 diff changeset	499 message.addElement("body", "jabber:client", mess_data["message"])
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	500 client.xmlstream.send(message)
f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	501 if mess_data["type"]!="groupchat":
512 862c0d6ab974 core, bridge, quick_frontend: MUC private messages history management: Goffi <goffi@goffi.org> parents: 506 diff changeset	502 self.memory.addToHistory(current_jid, jid.JID(to), unicode(mess_data["message"]), unicode(mess_data["type"]), profile=profile) #we don't add groupchat message to history, as we get them back
489 f36c705a5310 core: sendMessage refactoring: Goffi <goffi@goffi.org> parents: 484 diff changeset	503 #and they will be added then
513 8ee9113d307b core, quick_frontend, primitivus, wixi, bridge: fixed delayed message timestamp: Goffi <goffi@goffi.org> parents: 512 diff changeset	504 self.bridge.newMessage(message['from'], unicode(mess_data["message"]), mess_type=mess_data["type"], to_jid=message['to'], extra={}, profile=profile) #We send back the message, so all clients are aware of it
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 15 diff changeset	505
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	506
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	507 def setPresence(self, to="", show="", priority = 0, statuses={}, profile_key='@DEFAULT@'):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	508 """Send our presence information"""
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	509 profile = self.memory.getProfileName(profile_key)
0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	510 assert(profile)
50 daa1f01a5332 SàT improvement: Goffi <goffi@goffi.org> parents: 41 diff changeset	511 to_jid = jid.JID(to) if to else None
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	512 self.profiles[profile].presence.available(to_jid, show, statuses, priority)
313 cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	513 #XXX: FIXME: temporary fix to work around openfire 3.7.0 bug (presence is not broadcasted to generating resource)
cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	514 if statuses.has_key(''):
cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	515 statuses['default'] = statuses['']
cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	516 del statuses['']
cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	517 self.bridge.presenceUpdate(self.profiles[profile].jid.full(), show,
cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	518 int(priority), statuses, profile)
cc8ffbfe938c QnD workaround for presence broadcast openfire bug Goffi <goffi@goffi.org> parents: 305 diff changeset	519
50 daa1f01a5332 SàT improvement: Goffi <goffi@goffi.org> parents: 41 diff changeset	520
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	521 def subscription(self, subs_type, raw_jid, profile_key):
187 12544ea2951f Core: removed addItem for roster list, according to http://wokkel.ik.nu/ticket/56 Goffi <goffi@goffi.org> parents: 155 diff changeset	522 """Called to manage subscription
12544ea2951f Core: removed addItem for roster list, according to http://wokkel.ik.nu/ticket/56 Goffi <goffi@goffi.org> parents: 155 diff changeset	523 @param subs_type: subsciption type (cf RFC 3921)
12544ea2951f Core: removed addItem for roster list, according to http://wokkel.ik.nu/ticket/56 Goffi <goffi@goffi.org> parents: 155 diff changeset	524 @param raw_jid: unicode entity's jid
12544ea2951f Core: removed addItem for roster list, according to http://wokkel.ik.nu/ticket/56 Goffi <goffi@goffi.org> parents: 155 diff changeset	525 @param profile_key: profile"""
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	526 profile = self.memory.getProfileName(profile_key)
0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	527 assert(profile)
50 daa1f01a5332 SàT improvement: Goffi <goffi@goffi.org> parents: 41 diff changeset	528 to_jid = jid.JID(raw_jid)
89 23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	529 debug (_('subsciption request [%(subs_type)s] for %(jid)s') % {'subs_type':subs_type, 'jid':to_jid.full()})
23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	530 if subs_type=="subscribe":
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	531 self.profiles[profile].presence.subscribe(to_jid)
89 23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	532 elif subs_type=="subscribed":
23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	533 self.profiles[profile].presence.subscribed(to_jid)
23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	534 elif subs_type=="unsubscribe":
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	535 self.profiles[profile].presence.unsubscribe(to_jid)
89 23caf1051099 multi-profile/subscription misc fixes Goffi <goffi@goffi.org> parents: 79 diff changeset	536 elif subs_type=="unsubscribed":
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	537 self.profiles[profile].presence.unsubscribed(to_jid)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	538
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	539 def addContact(self, to, profile_key):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	540 """Add a contact in roster list"""
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	541 profile = self.memory.getProfileName(profile_key)
0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	542 assert(profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	543 to_jid=jid.JID(to)
187 12544ea2951f Core: removed addItem for roster list, according to http://wokkel.ik.nu/ticket/56 Goffi <goffi@goffi.org> parents: 155 diff changeset	544 #self.profiles[profile].roster.addItem(to_jid) XXX: disabled (cf http://wokkel.ik.nu/ticket/56))
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	545 self.profiles[profile].presence.subscribe(to_jid)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	546
346 ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	547 def updateContact(self, to, name, groups, profile_key):
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	548 """update a contact in roster list"""
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	549 profile = self.memory.getProfileName(profile_key)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	550 assert(profile)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	551 to_jid = jid.JID(to)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	552 groups = set(groups)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	553 roster_item = RosterItem(to_jid)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	554 roster_item.name = name or None
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	555 roster_item.groups = set(groups)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	556 self.profiles[profile].roster.updateItem(roster_item)
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	557
ca3a041fed30 core: fixed several subscription scheme issues + removed most of profile_key default value in core.sat_main and core.xmmp (source of bugs) + contact update Goffi <goffi@goffi.org> parents: 341 diff changeset	558 def delContact(self, to, profile_key):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	559 """Remove contact from roster list"""
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	560 profile = self.memory.getProfileName(profile_key)
0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	561 assert(profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	562 to_jid=jid.JID(to)
63 0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	563 self.profiles[profile].roster.removeItem(to_jid)
0db25931b60d SàT: multi-profiles: somes fixes in core Goffi <goffi@goffi.org> parents: 62 diff changeset	564 self.profiles[profile].presence.unsubscribe(to_jid)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	565
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	566
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	567 ## callbacks ##
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	568
282 6a0c6d8e119d added plugin xep-0115: entity capabilities Goffi <goffi@goffi.org> parents: 277 diff changeset	569 def serverDisco(self, disco, profile):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	570 """xep-0030 Discovery Protocol."""
14 a62d7d453f22 wokkel integration, part II Goffi <goffi@goffi.org> parents: 13 diff changeset	571 for feature in disco.features:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	572 debug (_("Feature found: %s"),feature)
282 6a0c6d8e119d added plugin xep-0115: entity capabilities Goffi <goffi@goffi.org> parents: 277 diff changeset	573 self.memory.addServerFeature(feature, profile)
14 a62d7d453f22 wokkel integration, part II Goffi <goffi@goffi.org> parents: 13 diff changeset	574 for cat, type in disco.identities:
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	575 debug (_("Identity found: [%(category)s/%(type)s] %(identity)s") % {'category':cat, 'type':type, 'identity':disco.identities[(cat,type)]})
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	576
305 15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	577 def serverDiscoItems(self, disco_result, disco_client, profile, initialized):
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	578 """xep-0030 Discovery Protocol.
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	579 @param disco_result: result of the disco item querry
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	580 @param disco_client: SatDiscoProtocol instance
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	581 @param profile: profile of the user
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	582 @param initialized: deferred which must be chained when everything is done"""
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	583 def _check_entity_cb(result, entity, profile):
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	584 for category, type in result.identities:
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	585 debug (_('Identity added: (%(category)s,%(type)s) ==> %(entity)s [%(profile)s]') % {
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	586 'category':category, 'type':type, 'entity':entity, 'profile':profile})
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	587 self.memory.addServerIdentity(category, type, entity, profile)
397 ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	588
ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	589 def _errback(result, entity, profile):
ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	590 warning(_("Can't get information on identity [%(entity)s] for profile [%(profile)s]") % {'entity':entity, 'profile': profile})
305 15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	591
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	592 defer_list = []
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	593 for item in disco_result._items:
397 ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	594 if item.entity.full().count('.') == 1: #XXX: workaround for a bug on jabberfr, tmp
460 fb1abc0f8c6a backend: added warning message when jabberfr workaround is used + fixed missing warning method Goffi <goffi@goffi.org> parents: 459 diff changeset	595 warning(_('Using jabberfr workaround, be sure your domain has at least two levels (e.g. "example.tld", not "example" alone)'))
397 ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	596 continue
ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	597 args = [item.entity, profile]
ccfd69d090c3 core: workaround to avoid a bug in item detection on jabber.fr. Need more investigation with jabber.fr admins (may be a bug in ejabberd) Goffi <goffi@goffi.org> parents: 391 diff changeset	598 defer_list.append(disco_client.requestInfo(item.entity).addCallbacks(_check_entity_cb, _errback, args, None, args))
305 15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	599 defer.DeferredList(defer_list).chainDeferred(initialized)
15a12bf2bb62 core: server identities are now save in memory Goffi <goffi@goffi.org> parents: 292 diff changeset	600
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	601
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	602 ## Generic HMI ##
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	603
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	604 def actionResult(self, id, type, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	605 """Send the result of an action
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	606 @param id: same id used with action
103 6be927a465ed XMLUI refactoring, step 1 Goffi <goffi@goffi.org> parents: 102 diff changeset	607 @param type: result type ("PARAM", "SUCCESS", "ERROR", "XMLUI")
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	608 @param data: dictionary
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	609 """
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	610 self.bridge.actionResult(type, id, data)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	611
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	612 def actionResultExt(self, id, type, data):
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	613 """Send the result of an action, extended version
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	614 @param id: same id used with action
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	615 @param type: result type /!\ only "DICT_DICT" for this method
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	616 @param data: dictionary of dictionaries
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	617 """
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	618 if type != "DICT_DICT":
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	619 error(_("type for actionResultExt must be DICT_DICT, fixing it"))
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	620 type = "DICT_DICT"
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	621 self.bridge.actionResultExt(type, id, data)
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 23 diff changeset	622
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	623
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	624
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	625 def askConfirmation(self, id, type, data, cb):
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	626 """Add a confirmation callback
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	627 @param id: id used to get answer
391 c34fd9d6242e spelling Goffi <goffi@goffi.org> parents: 388 diff changeset	628 @param type: confirmation type ("YES/NO", "FILE_TRANSFER")
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	629 @param data: data (depend of confirmation type)
a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	630 @param cb: callback called with the answer
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	631 """
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	632 if self.__waiting_conf.has_key(id):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	633 error (_("Attempt to register two callbacks for the same confirmation"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	634 else:
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	635 self.__waiting_conf[id] = cb
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	636 self.bridge.askConfirmation(type, id, data)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	637
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	638
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	639 def confirmationAnswer(self, id, accepted, data):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	640 """Called by frontends to answer confirmation requests"""
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	641 debug (_("Received confirmation answer for id [%(id)s]: %(success)s") % {'id': id, 'success':_("accepted") if accepted else _("refused")})
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	642 if not self.__waiting_conf.has_key(id):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	643 error (_("Received an unknown confirmation"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	644 else:
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	645 cb = self.__waiting_conf[id]
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	646 del self.__waiting_conf[id]
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	647 cb(id, accepted, data)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	648
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	649 def registerProgressCB(self, id, CB):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	650 """Register a callback called when progress is requested for id"""
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	651 self.__progress_cb_map[id] = CB
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	652
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	653 def removeProgressCB(self, id):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	654 """Remove a progress callback"""
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	655 if not self.__progress_cb_map.has_key(id):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	656 error (_("Trying to remove an unknow progress callback"))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	657 else:
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	658 del self.__progress_cb_map[id]
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	659
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	660 def getProgress(self, id):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	661 """Return a dict with progress information
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	662 data['position'] : current possition
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	663 data['size'] : end_position
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	664 """
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	665 data = {}
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	666 try:
388 a617af506154 core: progress callback now use id as first parameter Goffi <goffi@goffi.org> parents: 365 diff changeset	667 self.__progress_cb_map[id](id, data)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	668 except KeyError:
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	669 pass
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	670 #debug("Requested progress for unknown id")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	671 return data
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	672
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	673 def registerGeneralCB(self, name, CB):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	674 """Register a callback called for general reason"""
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	675 self.__general_cb_map[name] = CB
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	676
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	677 def removeGeneralCB(self, name):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	678 """Remove a general callback"""
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	679 if not self.__general_cb_map.has_key(name):
69 86f1f7f6d332 i18n first draft Goffi <goffi@goffi.org> parents: 68 diff changeset	680 error (_("Trying to remove an unknow general callback"))
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	681 else:
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	682 del self.__general_cb_map[name]
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	683
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	684 def callGeneralCB(self, name, args, *kwargs):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	685 """Call general function back"""
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	686 try:
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	687 return self.__general_cb_map[name](args, *kwargs)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	688 except KeyError:
107 5ae370c71803 CS: message sending is now working Goffi <goffi@goffi.org> parents: 106 diff changeset	689 error(_("Trying to call unknown function (%s)") % name)
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	690 return None
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	691
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	692 #Menus management
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	693
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	694 def importMenu(self, category, name, callback, help_string = "", type = "NORMAL"):
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	695 """register a new menu for frontends
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	696 @param category: category of the menu
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	697 @param name: menu item entry
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	698 @param callback: method to be called when menuitem is selected"""
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	699 if self.menus.has_key((category,name)):
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	700 error ("Want to register a menu which already existe")
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	701 return
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	702 self.menus[(category,name,type)] = {'callback':callback, 'help_string':help_string, 'type':type}
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	703
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	704 def getMenus(self):
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	705 """Return all menus registered"""
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	706 return self.menus.keys()
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	707
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	708 def getMenuHelp(self, category, name, type="NORMAL"):
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	709 """return the help string of the menu"""
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	710 try:
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	711 return self.menus[(category,name,type)]['help_string']
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	712 except KeyError:
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	713 error (_("Trying to access an unknown menu"))
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	714 return ""
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	715
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	716 def callMenu(self, category, name, type="NORMAL", profile_key='@DEFAULT@'):
266 c4b84a2d2ad1 bridge: constructor and template improved, documentation added Goffi <goffi@goffi.org> parents: 264 diff changeset	717 """return the id of the action"""
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	718 profile = self.memory.getProfileName(profile_key)
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	719 if not profile_key:
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	720 error (_('Non-exsitant profile'))
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	721 return ""
102 94011f553cd0 misc bugfixes Goffi <goffi@goffi.org> parents: 101 diff changeset	722 if self.menus.has_key((category,name,type)):
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	723 id = self.get_next_id()
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	724 self.menus[(category,name,type)]['callback'](id, profile)
783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	725 return id
102 94011f553cd0 misc bugfixes Goffi <goffi@goffi.org> parents: 101 diff changeset	726 else:
94011f553cd0 misc bugfixes Goffi <goffi@goffi.org> parents: 101 diff changeset	727 error (_("Trying to access an unknown menu (%(category)s/%(name)s/%(type)s)")%{'category':category, 'name':name,'type':type})
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 90 diff changeset	728 return ""

Mercurial > libervia-backend

annotate src/core/sat_main.py @ 513:8ee9113d307b