libervia-backend: sat_bridge/DBus.py annotate

annotate sat_bridge/DBus.py @ 39:2e3411a6baad

Wix: external server management in gateways manager, SàT: bug fixes in gateway management - SàT: from twisted.words.protocols.jabber.error module imported as jab_error to avoir name colision with error log method - XEP_0100 plugin: added errback for disco info - XEP_0077 plugin: registration callback now look for "x" element (data form: see XEP-0004), and send an error message if it can't find it. - Wix: added fields for browsing external server gateways

author	Goffi <goffi@goffi.org>
date	Thu, 17 Dec 2009 17:29:02 +1100
parents	a61beb21d16d
children	9c79eb49d51f

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
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	6 Copyright (C) 2009 Jérôme Poisson (goffi@goffi.org)
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
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	9 it under the terms of the GNU General Public License as published by
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
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	16 GNU General Public License for more details.
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	17
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	18 You should have received a copy of the GNU General Public License
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
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	22
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	23 from bridge import Bridge
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	24 import dbus
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	25 import dbus.service
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	26 import dbus.mainloop.glib
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	27 import pdb
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	28 from logging import debug, info, error
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	29
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	30 const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	31 const_COMM_SUFFIX = ".communication"
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	32 const_REQ_SUFFIX = ".request"
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	33
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	34 class DbusObject(dbus.service.Object):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	35
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	36 def __init__(self, bus, path):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	37 dbus.service.Object.__init__(self, bus, path)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	38 debug("Init DbusObject...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	39 self.cb={}
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	40
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	41 def register(self, name, cb):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	42 self.cb[name]=cb
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	43
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	44 ### signals ###
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	45
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	46 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	47 signature='sa{ss}as')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	48 def newContact(self, contact, attributes, groups):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	49 debug("new contact signal (%s) sended", contact)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	50
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	51 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	52 signature='ssss')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	53 def newMessage(self, from_jid, msg, type='chat', to=''):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	54 debug("new message signal (from:%s msg:%s type:%s to:%s) sended", from_jid, msg, type, to)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	55
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	56 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	57 signature='ssssi')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	58 def presenceUpdate(self, jid, type, show, status, priority):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	59 debug("presence update signal (from:%s type: %s show:%s status:\"%s\" priority:%d) sended" , jid, type, show, status, priority)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	60
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	61 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	62 signature='sss')
18 6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	63 def paramUpdate(self, name, value, category):
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	64 debug("param update signal: %s=%s in category %s", name, value, category)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	65
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	66 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	67 signature='s')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	68 def contactDeleted(self, jid):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	69 debug("contact deleted signal: %s", jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	70
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	71 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	72 signature='ssa{ss}')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	73 def askConfirmation(self, type, id, data):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	74 debug("asking for confirmation: id = [%s] type = %s data = %s", id, type, data)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	75
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	76 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	77 signature='ssa{ss}')
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	78 def actionResult(self, type, id, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	79 debug("result of action: id = [%s] type = %s data = %s", id, type, data)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	80
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	81 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	82 signature='ssa{sa{ss}}')
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	83 def actionResultExt(self, type, id, data):
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	84 debug("extended result of action: id = [%s] type = %s data = %s", id, type, data)
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	85
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	86 ### methods ###
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	87
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	88 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	89 in_signature='sssi', out_signature='s')
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	90 def registerNewAccount(self, login, password, host, port=5222):
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	91 info ("New account registration asked")
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	92 return self.cb["registerNewAccount"](login, password, host, port)
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	93
0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	94 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	95 in_signature='', out_signature='')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	96 def connect(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	97 info ("Connection asked")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	98 return self.cb["connect"]()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	99
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	100 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
1 a06a151fc31f Disconnect first draft Goffi <goffi@goffi.org> parents: 0 diff changeset	101 in_signature='', out_signature='')
a06a151fc31f Disconnect first draft Goffi <goffi@goffi.org> parents: 0 diff changeset	102 def disconnect(self):
a06a151fc31f Disconnect first draft Goffi <goffi@goffi.org> parents: 0 diff changeset	103 info ("Disconnection asked")
a06a151fc31f Disconnect first draft Goffi <goffi@goffi.org> parents: 0 diff changeset	104 return self.cb["disconnect"]()
a06a151fc31f Disconnect first draft Goffi <goffi@goffi.org> parents: 0 diff changeset	105
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	106 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	107 in_signature='', out_signature='a(sa{ss}as)')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	108 def getContacts(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	109 debug("getContacts...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	110 return self.cb["getContacts"]()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	111
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	112 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	113 in_signature='', out_signature='a(ssssi)')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	114 def getPresenceStatus(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	115 debug("getPresenceStatus...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	116 return self.cb["getPresenceStatus"]()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	117
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	118 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	119 in_signature='ss', out_signature='')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	120 def sendMessage(self, to, message):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	121 debug("sendMessage...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	122 self.cb["sendMessage"](to, message)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	123
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	124 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	125 in_signature='ssssi', out_signature='')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	126 def setPresence(self, to="", type="", show="", status="", priority=0):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	127 self.cb["setPresence"](to, type, show, status, priority)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	128
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	129 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	130 in_signature='sss', out_signature='')
17 74a39f40eb6d refactoring: using xml params (not finished yet) Goffi <goffi@goffi.org> parents: 16 diff changeset	131 def setParam(self, name, value, category):
74a39f40eb6d refactoring: using xml params (not finished yet) Goffi <goffi@goffi.org> parents: 16 diff changeset	132 self.cb["setParam"](name, str(value), category)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	133
18 6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	134 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	135 in_signature='ss', out_signature='s')
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	136 def getParamA(self, name, category="default"):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	137 return self.cb["getParamA"](name, category)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	138
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	139 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
17 74a39f40eb6d refactoring: using xml params (not finished yet) Goffi <goffi@goffi.org> parents: 16 diff changeset	140 in_signature='', out_signature='s')
74a39f40eb6d refactoring: using xml params (not finished yet) Goffi <goffi@goffi.org> parents: 16 diff changeset	141 def getParams(self):
74a39f40eb6d refactoring: using xml params (not finished yet) Goffi <goffi@goffi.org> parents: 16 diff changeset	142 return self.cb["getParams"]()
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	143
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	144 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
18 6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	145 in_signature='s', out_signature='s')
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	146 def getParamsForCategory(self, category):
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	147 return self.cb["getParamsForCategory"](category)
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	148
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	149 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	150 in_signature='', out_signature='as')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	151 def getParamsCategories(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	152 return self.cb["getParamsCategories"]()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	153
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	154 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	155 in_signature='ssi', out_signature='a{i(ss)}')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	156 def getHistory(self, from_jid, to_jid, size):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	157 debug("History asked for %s", to_jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	158 return self.cb["getHistory"](from_jid, to_jid, size)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	159
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	160 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	161 in_signature='s', out_signature='')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	162 def addContact(self, jid):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	163 debug("Subscription asked for %s", jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	164 return self.cb["addContact"](jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	165
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	166 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	167 in_signature='s', out_signature='')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	168 def delContact(self, jid):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	169 debug("Unsubscription asked for %s", jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	170 return self.cb["delContact"](jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	171
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	172 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	173 in_signature='', out_signature='b')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	174 def isConnected(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	175 debug("Connection status requested")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	176 return self.cb["isConnected"]()
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	177
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	178 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	179 in_signature='sa{ss}', out_signature='s')
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	180 def launchAction(self, type, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	181 return self.cb["launchAction"](type, data)
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	182
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	183 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	184 in_signature='sba{ss}', out_signature='')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	185 def confirmationAnswer(self, id, accepted, data):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	186 debug("Answer for confirmation [%s]: %s", id, "Accepted" if accepted else "Refused")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	187 return self.cb["confirmationAnswer"](id, accepted, data)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	188
36 6491b7956c80 wix: Form submitting, first draft Goffi <goffi@goffi.org> parents: 25 diff changeset	189
6491b7956c80 wix: Form submitting, first draft Goffi <goffi@goffi.org> parents: 25 diff changeset	190 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	191 in_signature='s', out_signature='a{ss}')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	192 def getProgress(self, id):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	193 #debug("Progress asked for %s", id)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	194 return self.cb["getProgress"](id)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	195
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	196 def __attribute_string(self, in_sign):
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	197 i=0
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	198 idx=0
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	199 attr_string=""
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	200 while i<len(in_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	201 if in_sign[i] not in ['b','y','n','i','x','q','u','t','d','s','a']:
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	202 raise Exception #FIXME: create an exception here (unmanaged attribute type)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	203
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	204 attr_string += ("" if idx==0 else ",") + ("arg_%i" % idx)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	205 idx+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	206
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	207 if in_sign[i] == 'a':
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	208 while (True):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	209 i+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	210 if i>=len(in_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	211 raise Exception #FIXME: create an exception here (the '}' is not presend)
37 a61beb21d16d Gateway registration, unregistration & edition Goffi <goffi@goffi.org> parents: 36 diff changeset	212 if in_sign[i] == '}' or in_sign[i] == ')':
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	213 break
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	214 i+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	215 return attr_string
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	216
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	217
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	218
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	219 def addMethod(self, name, int_suffix, in_sign, out_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	220 """Dynamically add a method to Dbus Bridge"""
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	221 #FIXME: Better way ???
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	222 attributes = self.__attribute_string(in_sign)
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	223
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	224 code = compile ('def '+name+' (self,'+attributes+'): return self.cb["'+name+'"]('+attributes+')', '<DBus bridge>','exec')
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	225 exec (code)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	226 method = locals()[name]
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	227 setattr(DbusObject, name, dbus.service.method(
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	228 const_INT_PREFIX+int_suffix, in_signature=in_sign, out_signature=out_sign)(method))
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	229
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	230 class DBusBridge(Bridge):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	231 def __init__(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	232 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	233 Bridge.__init__(self)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	234 info ("Init DBus...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	235 self.session_bus = dbus.SessionBus()
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	236 self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	237 self.dbus_bridge = DbusObject(self.session_bus, '/org/goffi/SAT/bridge')
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	238
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	239 def newContact(self, contact, attributes, groups):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	240 self.dbus_bridge.newContact(contact, attributes, groups)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	241
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	242 def newMessage(self,from_jid,msg,type='chat', to=''):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	243 debug("sending message...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	244 self.dbus_bridge.newMessage(from_jid, msg, type, to)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	245
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	246 def presenceUpdate(self, jid, type, show, status, priority):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	247 debug("updating presence for %s",jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	248 self.dbus_bridge.presenceUpdate(jid, type, show, status, priority)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	249
18 6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	250 def paramUpdate(self, name, value, category):
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	251 debug("updating param [%s] %s ", category, name)
6928e3cb73a8 refactoring: using xml params part II Goffi <goffi@goffi.org> parents: 17 diff changeset	252 self.dbus_bridge.paramUpdate(name, value, category)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	253
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	254 def contactDeleted(self, jid):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	255 debug("sending contact deleted signal %s ", jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	256 self.dbus_bridge.contactDeleted(jid)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	257
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	258 def askConfirmation(self, type, id, data):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	259 self.dbus_bridge.askConfirmation(type, id, data)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	260
22 bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	261 def actionResult(self, type, id, data):
bb72c29f3432 added action cb mechanism for buttons. Tested with a temporary new user registration button. Goffi <goffi@goffi.org> parents: 18 diff changeset	262 self.dbus_bridge.actionResult(type, id, data)
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	263
25 53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	264 def actionResultExt(self, type, id, data):
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	265 self.dbus_bridge.actionResultExt(type, id, data)
53e921c8a357 new plugin: gateways plugin, and first implementation of findGateways Goffi <goffi@goffi.org> parents: 22 diff changeset	266
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	267 def register(self, name, callback):
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	268 debug("registering DBus bridge method [%s]",name)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	269 self.dbus_bridge.register(name, callback)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	270
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	271 def addMethod(self, name, int_suffix, in_sign, out_sign, method):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	272 """Dynamically add a method to Dbus Bridge"""
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	273 print ("Adding method [%s] to DBus bridge" % name)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	274 self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	275 self.register(name, method)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	276

Mercurial > libervia-backend

annotate sat_bridge/DBus.py @ 39:2e3411a6baad