libervia-backend: src/core/sat

annotate src/core/sat_main.py @ 602:6fd1095b2b7b

core: sendMessage refactoring: - sendMessage now use JID instead of unicode, bridge method using unicode is now _sendMessage - added no_trigger argument, so it's now possible to forbid trigger execution (to avoid any plugin when we send a message)

author	Goffi <goffi@goffi.org>
date	Fri, 22 Feb 2013 00:15:50 +0100
parents	d1b4805124a1
children	c8b129a3c209

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

Mercurial > libervia-backend

annotate src/core/sat_main.py @ 602:6fd1095b2b7b