libervia-backend: src/bridge/DBus.py annotate

annotate src/bridge/DBus.py @ 365:efbfccfed623

core: local_dir moved to config file - ~/.sat.conf added to potential config file location - removed useless profile param from getConfig

author	Goffi <goffi@goffi.org>
date	Sat, 18 Jun 2011 17:56:59 +0200
parents	312ca6f9d84a
children	3ea41a199b36

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
228 b1794cbb88e5 2011 copyright upgrade Goffi <goffi@goffi.org> parents: 224 diff changeset	6 Copyright (C) 2009, 2010, 2011 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
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
272 1d2e0dfe7114 bridge: core & frontend sides of bridge are now generated Goffi <goffi@goffi.org> parents: 267 diff changeset	27 from logging import debug, info
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	28
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	29 const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
360 6b5626c37909 bridge: regenerated DBus bridge Goffi <goffi@goffi.org> parents: 345 diff changeset	30 const_OBJ_PATH = '/org/goffi/SAT/bridge'
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
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	46 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	47 signature='ssa{ss}')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	48 def actionResult(self, answer_type, id, data):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	49 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	50
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	51 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	52 signature='ssa{sa{ss}}')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	53 def actionResultExt(self, answer_type, id, data):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	54 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	55
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	56 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	57 signature='ssa{ss}')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	58 def askConfirmation(self, conf_type, id, data):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	59 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 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,
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	62 signature='s')
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	63 def connected(self, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	64 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	65
52 6455fb62ff83 Connection/disconnection signals Goffi <goffi@goffi.org> parents: 49 diff changeset	66 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
262 af3d4f11fe43 Added management of connection error Goffi <goffi@goffi.org> parents: 260 diff changeset	67 signature='ss')
274 c1ad04586edf Bridge: rename connection_error to connectionError for function name consistency Goffi <goffi@goffi.org> parents: 272 diff changeset	68 def connectionError(self, error_type, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	69 pass
0 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_COMM_SUFFIX,
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	72 signature='ss')
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	73 def contactDeleted(self, entity, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	74 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	75
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	76 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	77 signature='s')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	78 def disconnected(self, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	79 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	80
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	81 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	82 signature='ssss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	83 def newAlert(self, message, title, alert_type, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	84 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	85
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	86 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	87 signature='sa{ss}ass')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	88 def newContact(self, contact, attributes, groups, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	89 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	90
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	91 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	92 signature='sssss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	93 def newMessage(self, from_jid, message, mess_type, to_jid, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	94 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	95
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	96 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	97 signature='ssss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	98 def paramUpdate(self, name, value, category, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	99 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	100
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	101 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	102 signature='ssia{ss}s')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	103 def presenceUpdate(self, entity, show, priority, statuses, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	104 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	105
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	106 @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	107 signature='sss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	108 def subscribe(self, sub_type, entity, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	109 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	110
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	111 @dbus.service.signal(const_INT_PREFIX+const_REQ_SUFFIX,
9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	112 signature='sa{ss}')
9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	113 def updatedValue(self, name, value):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	114 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	115
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	116
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	117 ### methods ###
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	118
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	119 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	120 in_signature='ss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	121 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	122 def addContact(self, entity, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	123 return self.cb["addContact"](unicode(entity), unicode(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	124
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	125 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	126 in_signature='s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	127 async_callbacks=('callback', 'errback'))
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	128 def asyncConnect(self, profile_key="@DEFAULT@", callback=None, errback=None):
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	129 return self.cb["asyncConnect"](unicode(profile_key), callback, errback)
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	130
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	131 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	132 in_signature='ssss', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	133 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	134 def callMenu(self, category, name, menu_type, profile_key):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	135 return self.cb["callMenu"](unicode(category), unicode(name), unicode(menu_type), unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	136
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	137 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	138 in_signature='sba{ss}', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	139 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	140 def confirmationAnswer(self, id, accepted, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	141 return self.cb["confirmationAnswer"](unicode(id), accepted, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	142
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	143 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	144 in_signature='s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	145 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	146 def connect(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	147 return self.cb["connect"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	148
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	149 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	150 in_signature='s', out_signature='i',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	151 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	152 def createProfile(self, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	153 return self.cb["createProfile"](unicode(profile))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	154
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	155 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	156 in_signature='ss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	157 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	158 def delContact(self, entity, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	159 return self.cb["delContact"](unicode(entity), unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	160
119 ded2431cea5a Primitivus: chat window / text sending. Goffi <goffi@goffi.org> parents: 105 diff changeset	161 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	162 in_signature='s', out_signature='i',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	163 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	164 def deleteProfile(self, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	165 return self.cb["deleteProfile"](unicode(profile))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	166
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	167 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	168 in_signature='s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	169 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	170 def disconnect(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	171 return self.cb["disconnect"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	172
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	173 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
365 efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	174 in_signature='ss', out_signature='s',
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 360 diff changeset	175 async_callbacks=None)
365 efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	176 def getConfig(self, section, name):
efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	177 return self.cb["getConfig"](unicode(section), unicode(name))
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 360 diff changeset	178
312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 360 diff changeset	179 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	180 in_signature='s', out_signature='a(sa{ss}as)',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	181 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	182 def getContacts(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	183 return self.cb["getContacts"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	184
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	185 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	186 in_signature='ssi', out_signature='a{i(ss)}',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	187 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	188 def getHistory(self, from_jid, to_jid, size):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	189 return self.cb["getHistory"](unicode(from_jid), unicode(to_jid), size)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	190
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	191 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	192 in_signature='sss', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	193 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	194 def getMenuHelp(self, category, name, menu_type):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	195 return self.cb["getMenuHelp"](unicode(category), unicode(name), unicode(menu_type))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	196
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	197 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	198 in_signature='', out_signature='a(sss)',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	199 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	200 def getMenus(self, ):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	201 return self.cb["getMenus"]()
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	202
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	203 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	204 in_signature='ssss', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	205 async_callbacks=None)
272 1d2e0dfe7114 bridge: core & frontend sides of bridge are now generated Goffi <goffi@goffi.org> parents: 267 diff changeset	206 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"):
1d2e0dfe7114 bridge: core & frontend sides of bridge are now generated Goffi <goffi@goffi.org> parents: 267 diff changeset	207 return self.cb["getParamA"](unicode(name), unicode(category), unicode(attribute), unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	208
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	209 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	210 in_signature='s', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	211 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	212 def getParams(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	213 return self.cb["getParams"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	214
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	215 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	216 in_signature='', out_signature='as',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	217 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	218 def getParamsCategories(self, ):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	219 return self.cb["getParamsCategories"]()
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	220
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	221 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	222 in_signature='ss', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	223 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	224 def getParamsForCategory(self, category, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	225 return self.cb["getParamsForCategory"](unicode(category), unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	226
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	227 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	228 in_signature='s', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	229 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	230 def getParamsUI(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	231 return self.cb["getParamsUI"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	232
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	233 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	234 in_signature='s', out_signature='a{sa{s(sia{ss})}}',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	235 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	236 def getPresenceStatus(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	237 return self.cb["getPresenceStatus"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	238
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	239 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	240 in_signature='s', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	241 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	242 def getProfileName(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	243 return self.cb["getProfileName"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	244
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	245 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	246 in_signature='', out_signature='as',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	247 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	248 def getProfilesList(self, ):
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	249 return self.cb["getProfilesList"]()
9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	250
9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	251 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	252 in_signature='s', out_signature='a{ss}',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	253 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	254 def getProgress(self, id):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	255 return self.cb["getProgress"](unicode(id))
68 9b842086d915 multiple profiles update Goffi <goffi@goffi.org> parents: 67 diff changeset	256
9b842086d915 multiple profiles update Goffi <goffi@goffi.org> parents: 67 diff changeset	257 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	258 in_signature='', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	259 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	260 def getVersion(self, ):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	261 return self.cb["getVersion"]()
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	262
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	263 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	264 in_signature='s', out_signature='a{ss}',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	265 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	266 def getWaitingSub(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	267 return self.cb["getWaitingSub"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	268
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	269 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	270 in_signature='s', out_signature='b',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	271 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	272 def isConnected(self, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	273 return self.cb["isConnected"](unicode(profile_key))
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	274
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	275 @dbus.service.method(const_INT_PREFIX+const_REQ_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	276 in_signature='sa{ss}s', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	277 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	278 def launchAction(self, action_type, data, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	279 return self.cb["launchAction"](unicode(action_type), data, unicode(profile_key))
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	280
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	281 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	282 in_signature='ssssi', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	283 async_callbacks=None)
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	284 def registerNewAccount(self, login, password, email, host, port=5222):
953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	285 return self.cb["registerNewAccount"](unicode(login), unicode(password), unicode(email), unicode(host), port)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	286
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	287 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	288 in_signature='sssss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	289 async_callbacks=None)
272 1d2e0dfe7114 bridge: core & frontend sides of bridge are now generated Goffi <goffi@goffi.org> parents: 267 diff changeset	290 def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	291 return self.cb["sendMessage"](unicode(to_jid), unicode(message), unicode(subject), unicode(mess_type), unicode(profile_key))
65 d35c5edab53f SàT: multi-profile: memory & dbus bridge's methods profile management Goffi <goffi@goffi.org> parents: 61 diff changeset	292
d35c5edab53f SàT: multi-profile: memory & dbus bridge's methods profile management Goffi <goffi@goffi.org> parents: 61 diff changeset	293 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	294 in_signature='ssss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	295 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	296 def setParam(self, name, value, category, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	297 return self.cb["setParam"](unicode(name), unicode(value), unicode(category), unicode(profile_key))
105 d2630fba8dfd params to XMLUI tools Goffi <goffi@goffi.org> parents: 101 diff changeset	298
d2630fba8dfd params to XMLUI tools Goffi <goffi@goffi.org> parents: 101 diff changeset	299 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	300 in_signature='ssia{ss}s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	301 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	302 def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	303 return self.cb["setPresence"](unicode(to_jid), unicode(show), priority, statuses, unicode(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	304
16 0a024d5e0cd0 New account creation (in-band registration) Goffi <goffi@goffi.org> parents: 10 diff changeset	305 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	306 in_signature='sss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	307 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	308 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	309 return self.cb["subscription"](unicode(sub_type), unicode(entity), unicode(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	310
345 e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	311 @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	312 in_signature='ssass', out_signature='',
e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	313 async_callbacks=None)
e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	314 def updateContact(self, entity, name, groups, profile_key="@DEFAULT@"):
e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	315 return self.cb["updateContact"](unicode(entity), unicode(name), groups, unicode(profile_key))
e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	316
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 89 diff changeset	317
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	318 def __attributes(self, in_sign):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	319 """Return arguments to user given a in_sign
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	320 @param in_sign: in_sign in the short form (using s,a,i,b etc)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	321 @return: list of arguments that correspond to a in_sign (e.g.: "sss" return "arg1, arg2, arg3")"""
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	322 i=0
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	323 idx=0
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	324 attr=[]
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	325 while i<len(in_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	326 if in_sign[i] not in ['b','y','n','i','x','q','u','t','d','s','a']:
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	327 raise ParseError("Unmanaged attribute type [%c]" % in_sign[i])
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	328
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	329 attr.append("arg_%i" % idx)
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	330 idx+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	331
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	332 if in_sign[i] == 'a':
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	333 i+=1
182 556c2bd7c344 Primitivus now implement showDialog + new "newAlert" bridge method to show a dialog from core Goffi <goffi@goffi.org> parents: 135 diff changeset	334 if in_sign[i]!='{' and in_sign[i]!='(': #FIXME: must manage tuples out of arrays
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	335 i+=1
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	336 continue #we have a simple type for the array
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	337 opening_car = in_sign[i]
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	338 assert(opening_car in ['{','('])
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	339 closing_car = '}' if opening_car == '{' else ')'
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	340 opening_count = 1
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	341 while (True): #we have a dict or a list of tuples
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	342 i+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	343 if i>=len(in_sign):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	344 raise ParseError("missing }")
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	345 if in_sign[i] == opening_car:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	346 opening_count+=1
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	347 if in_sign[i] == closing_car:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	348 opening_count-=1
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	349 if opening_count == 0:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	350 break
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	351 i+=1
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	352 return attr
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	353
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	354 def addMethod(self, name, int_suffix, in_sign, out_sign, async=False, doc={}):
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	355 """Dynamically add a method to Dbus Bridge"""
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	356 _attributes = self.__attributes(in_sign)
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	357
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	358 if async:
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	359 _attributes.extend(['callback','errback'])
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	360
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	361 attributes = ', '.join(_attributes)
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	362
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	363 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	364 exec (code)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	365 method = locals()[name]
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	366 async_callbacks = ('callback', 'errback') if async else None
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	367 setattr(DbusObject, name, dbus.service.method(
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	368 const_INT_PREFIX+int_suffix, in_signature=in_sign, out_signature=out_sign,
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	369 async_callbacks=async_callbacks)(method))
284 c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	370 function = getattr(self, name)
c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	371 func_table = self._dbus_class_table[self.__class__.__module__ + '.' + self.__class__.__name__][function._dbus_interface]
c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	372 func_table[function.__name__] = function #Needed for introspection
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	373
298 15c8916317d0 dbus bridge: added doc parameter, unmanaged yet Goffi <goffi@goffi.org> parents: 284 diff changeset	374 def addSignal(self, name, int_suffix, signature, doc={}):
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	375 """Dynamically add a signal to Dbus Bridge"""
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	376 attributes = ', '.join(self.__attributes(signature))
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	377
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	378 #code = compile ('def '+name+' (self,'+attributes+'): debug ("'+name+' signal")', '<DBus bridge>','exec') #XXX: the debug is too annoying with xmllog
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	379 code = compile ('def '+name+' (self,'+attributes+'): pass', '<DBus bridge>','exec')
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	380 exec (code)
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	381 signal = locals()[name]
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	382 setattr(DbusObject, name, dbus.service.signal(
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	383 const_INT_PREFIX+int_suffix, signature=signature)(signal))
284 c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	384 function = getattr(self, name)
c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	385 func_table = self._dbus_class_table[self.__class__.__module__ + '.' + self.__class__.__name__][function._dbus_interface]
c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	386 func_table[function.__name__] = function #Needed for introspection
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	387
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	388 class DBusBridge(Bridge):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	389 def __init__(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	390 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	391 Bridge.__init__(self)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	392 info ("Init DBus...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	393 self.session_bus = dbus.SessionBus()
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	394 self.dbus_name = dbus.service.BusName(const_INT_PREFIX, self.session_bus)
360 6b5626c37909 bridge: regenerated DBus bridge Goffi <goffi@goffi.org> parents: 345 diff changeset	395 self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	396
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	397 def actionResult(self, answer_type, id, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	398 self.dbus_bridge.actionResult(answer_type, id, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	399
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	400 def actionResultExt(self, answer_type, id, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	401 self.dbus_bridge.actionResultExt(answer_type, id, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	402
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	403 def askConfirmation(self, conf_type, id, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	404 self.dbus_bridge.askConfirmation(conf_type, id, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	405
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	406 def connected(self, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	407 self.dbus_bridge.connected(profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	408
274 c1ad04586edf Bridge: rename connection_error to connectionError for function name consistency Goffi <goffi@goffi.org> parents: 272 diff changeset	409 def connectionError(self, error_type, profile):
c1ad04586edf Bridge: rename connection_error to connectionError for function name consistency Goffi <goffi@goffi.org> parents: 272 diff changeset	410 self.dbus_bridge.connectionError(error_type, profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	411
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	412 def contactDeleted(self, entity, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	413 self.dbus_bridge.contactDeleted(entity, profile)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	414
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	415 def disconnected(self, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	416 self.dbus_bridge.disconnected(profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	417
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	418 def newAlert(self, message, title, alert_type, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	419 self.dbus_bridge.newAlert(message, title, alert_type, profile)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	420
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	421 def newContact(self, contact, attributes, groups, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	422 self.dbus_bridge.newContact(contact, attributes, groups, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	423
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	424 def newMessage(self, from_jid, message, mess_type, to_jid, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	425 self.dbus_bridge.newMessage(from_jid, message, mess_type, to_jid, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	426
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	427 def paramUpdate(self, name, value, category, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	428 self.dbus_bridge.paramUpdate(name, value, category, profile)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	429
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	430 def presenceUpdate(self, entity, show, priority, statuses, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	431 self.dbus_bridge.presenceUpdate(entity, show, priority, statuses, profile)
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	432
221 96186f36d8cb bridge: fixed newAlert parameters order Goffi <goffi@goffi.org> parents: 182 diff changeset	433 def subscribe(self, sub_type, entity, profile):
96186f36d8cb bridge: fixed newAlert parameters order Goffi <goffi@goffi.org> parents: 182 diff changeset	434 self.dbus_bridge.subscribe(sub_type, entity, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	435
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	436 def updatedValue(self, name, value):
9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	437 self.dbus_bridge.updatedValue(name, value)
9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	438
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	439
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	440 def register(self, name, callback):
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	441 debug("registering DBus bridge method [%s]", name)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	442 self.dbus_bridge.register(name, callback)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	443
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	444 def addMethod(self, name, int_suffix, in_sign, out_sign, method, async=False, doc={}):
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	445 """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	446 print ("Adding method [%s] to DBus bridge" % name)
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	447 self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign, async, doc)
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	448 self.register(name, method)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	449
298 15c8916317d0 dbus bridge: added doc parameter, unmanaged yet Goffi <goffi@goffi.org> parents: 284 diff changeset	450 def addSignal(self, name, int_suffix, signature, doc={}):
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	451 self.dbus_bridge.addSignal(name, int_suffix, signature, doc)
74 6e3a06b4dd36 plugin xep-0045: added roomUserJoined and roomUserLeft signals Goffi <goffi@goffi.org> parents: 73 diff changeset	452 setattr(DBusBridge, name, getattr(self.dbus_bridge, name))

Mercurial > libervia-backend

annotate src/bridge/DBus.py @ 365:efbfccfed623