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

annotate src/bridge/DBus.py @ 468:c97640c90a94

D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes

author	Goffi <goffi@goffi.org>
date	Fri, 30 Mar 2012 09:23:23 +0200
parents	cf005701624b
children	db4c2b82bab6

rev	line source
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	1 #!/usr/bin/python
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	2 #-- coding: utf-8 --
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	3
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	4 """
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	5 SAT: a jabber client
459 cf005701624b copyleft date update Goffi <goffi@goffi.org> parents: 448 diff changeset	6 Copyright (C) 2009, 2010, 2011, 2012 Jérôme Poisson (goffi@goffi.org)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	7
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	8 This program is free software: you can redistribute it and/or modify
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
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	27 import inspect
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	28 from logging import debug, info, error
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	29 from twisted.internet.defer import Deferred
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	30
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	31 const_INT_PREFIX = "org.goffi.SAT" #Interface prefix
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	32 const_ERROR_PREFIX = const_INT_PREFIX+".error"
360 6b5626c37909 bridge: regenerated DBus bridge Goffi <goffi@goffi.org> parents: 345 diff changeset	33 const_OBJ_PATH = '/org/goffi/SAT/bridge'
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	34 const_CORE_SUFFIX = ".core"
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	35 const_PLUGIN_SUFFIX = ".plugin"
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	36
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	37 class MethodNotRegistered(dbus.DBusException):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	38 _dbus_error_name = const_ERROR_PREFIX + ".MethodNotRegistered"
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	39
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	40 class InternalError(dbus.DBusException):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	41 _dbus_error_name = const_ERROR_PREFIX + ".InternalError"
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	42
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	43 class AsyncNotDeferred(dbus.DBusException):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	44 _dbus_error_name = const_ERROR_PREFIX + ".AsyncNotDeferred"
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	45
424 72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	46 class DeferredNotAsync(dbus.DBusException):
72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	47 _dbus_error_name = const_ERROR_PREFIX + ".DeferredNotAsync"
72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	48
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	49 class GenericException(dbus.DBusException):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	50 def __init__(self, twisted_error):
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	51 super(GenericException,self).__init__()
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	52 mess = twisted_error.getErrorMessage()
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	53 self._dbus_error_name = const_ERROR_PREFIX+"."+ (mess or str(err.__class__))
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	54
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	55 class DbusObject(dbus.service.Object):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	56
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	57 def __init__(self, bus, path):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	58 dbus.service.Object.__init__(self, bus, path)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	59 debug("Init DbusObject...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	60 self.cb={}
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	61
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	62 def register(self, name, cb):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	63 self.cb[name]=cb
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	64
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	65 def _callback(self, name, args, *kwargs):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	66 """call the callback if it exists, raise an exception else
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	67 if the callback return a deferred, use async methods"""
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	68 if not name in self.cb:
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	69 raise MethodNotRegistered
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	70
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	71 if "callback" in kwargs:
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	72 #we must have errback too
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	73 if not "errback" in kwargs:
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	74 error("errback is missing in method call [%s]" % name)
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	75 raise InternalError
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	76 callback = kwargs.pop("callback")
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	77 errback = kwargs.pop("errback")
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	78 async = True
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	79 else:
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	80 async = False
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	81 result = self.cb[name](args, *kwargs)
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	82 if async:
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	83 if not isinstance(result, Deferred):
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 424 diff changeset	84 error("Asynchronous method [%s] does not return a Deferred." % name)
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	85 raise AsyncNotDeferred
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	86 result.addCallback(lambda result: callback() if result==None else callback(result))
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	87 result.addErrback(lambda err:errback(GenericException(err)))
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	88 else:
424 72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	89 if isinstance(result, Deferred):
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 424 diff changeset	90 error("Synchronous method [%s] return a Deferred." % name)
424 72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	91 raise DeferredNotAsync
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	92 return result
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	93
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	94 ### signals ###
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	95
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	96 @dbus.service.signal(const_INT_PREFIX+const_PLUGIN_SUFFIX,
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	97 signature='')
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	98 def dummySignal(self):
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	99 #FIXME: workaround for addSignal (doesn't work if one method doensn't
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	100 # already exist for plugins), probably missing some initialisation, need
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	101 # further investigations
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	102 pass
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	103
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	104 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	105 signature='ssa{ss}')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	106 def actionResult(self, answer_type, id, data):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	107 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	108
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	109 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	110 signature='ssa{sa{ss}}')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	111 def actionResultExt(self, answer_type, id, data):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	112 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	113
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	114 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	115 signature='ssa{ss}')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	116 def askConfirmation(self, conf_type, id, data):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	117 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	118
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	119 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	120 signature='s')
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	121 def connected(self, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	122 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	123
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	124 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
262 af3d4f11fe43 Added management of connection error Goffi <goffi@goffi.org> parents: 260 diff changeset	125 signature='ss')
274 c1ad04586edf Bridge: rename connection_error to connectionError for function name consistency Goffi <goffi@goffi.org> parents: 272 diff changeset	126 def connectionError(self, error_type, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	127 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	128
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	129 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	130 signature='ss')
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	131 def contactDeleted(self, entity_jid, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	132 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	133
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	134 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	135 signature='s')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	136 def disconnected(self, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	137 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	138
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	139 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	140 signature='ssss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	141 def newAlert(self, message, title, alert_type, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	142 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	143
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	144 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	145 signature='sa{ss}ass')
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	146 def newContact(self, contact_jid, attributes, groups, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	147 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	148
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	149 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	150 signature='sssss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	151 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	152 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	153
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	154 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	155 signature='ssss')
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	156 def paramUpdate(self, name, value, category, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	157 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	158
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	159 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	160 signature='ssia{ss}s')
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	161 def presenceUpdate(self, entity_jid, show, priority, statuses, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	162 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	163
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	164 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	165 signature='sss')
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	166 def subscribe(self, sub_type, entity_jid, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	167 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	168
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	169 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	170 signature='sa{ss}s')
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	171 def updatedValue(self, name, value, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	172 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	173
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	174
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	175 ### methods ###
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	176
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	177 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	178 in_signature='ss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	179 async_callbacks=None)
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	180 def addContact(self, entity_jid, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	181 return self._callback("addContact", unicode(entity_jid), unicode(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	182
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	183 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	184 in_signature='s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	185 async_callbacks=('callback', 'errback'))
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	186 def asyncConnect(self, profile_key="@DEFAULT@", callback=None, errback=None):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	187 return self._callback("asyncConnect", unicode(profile_key), callback=callback, errback=errback)
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	188
6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	189 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	190 in_signature='s', out_signature='',
6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	191 async_callbacks=('callback', 'errback'))
6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	192 def asyncCreateProfile(self, profile, callback=None, errback=None):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	193 return self._callback("asyncCreateProfile", unicode(profile), callback=callback, errback=errback)
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	194
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	195 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	196 in_signature='ssss', out_signature='s',
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 399 diff changeset	197 async_callbacks=('callback', 'errback'))
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 399 diff changeset	198 def asyncGetParamA(self, name, category, attribute="value", profile_key="@DEFAULT@", callback=None, errback=None):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	199 return self._callback("asyncGetParamA", unicode(name), unicode(category), unicode(attribute), unicode(profile_key), callback=callback, errback=errback)
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 399 diff changeset	200
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 399 diff changeset	201 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 399 diff changeset	202 in_signature='ssss', out_signature='s',
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	203 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	204 def callMenu(self, category, name, menu_type, profile_key):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	205 return self._callback("callMenu", unicode(category), unicode(name), unicode(menu_type), unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	206
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	207 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	208 in_signature='sba{ss}', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	209 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	210 def confirmationAnswer(self, id, accepted, data):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	211 return self._callback("confirmationAnswer", unicode(id), accepted, data)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	212
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	213 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	214 in_signature='s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	215 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	216 def connect(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	217 return self._callback("connect", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	218
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	219 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	220 in_signature='s', out_signature='i',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	221 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	222 def createProfile(self, profile):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	223 return self._callback("createProfile", unicode(profile))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	224
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	225 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	226 in_signature='ss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	227 async_callbacks=None)
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	228 def delContact(self, entity_jid, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	229 return self._callback("delContact", unicode(entity_jid), unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	230
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	231 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	232 in_signature='s', out_signature='i',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	233 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	234 def deleteProfile(self, profile):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	235 return self._callback("deleteProfile", unicode(profile))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	236
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	237 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	238 in_signature='s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	239 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	240 def disconnect(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	241 return self._callback("disconnect", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	242
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	243 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
365 efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	244 in_signature='ss', out_signature='s',
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 360 diff changeset	245 async_callbacks=None)
365 efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	246 def getConfig(self, section, name):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	247 return self._callback("getConfig", unicode(section), unicode(name))
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 360 diff changeset	248
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	249 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	250 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	251 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	252 def getContacts(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	253 return self._callback("getContacts", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	254
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	255 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
448 17c7e48bf68f core: - history management improved Goffi <goffi@goffi.org> parents: 425 diff changeset	256 in_signature='ssib', out_signature='a(dsss)',
425 e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 424 diff changeset	257 async_callbacks=('callback', 'errback'))
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 424 diff changeset	258 def getHistory(self, from_jid, to_jid, limit, between=True, callback=None, errback=None):
e4e9187e3b5b backend, bridge: asynchronous history Goffi <goffi@goffi.org> parents: 424 diff changeset	259 return self._callback("getHistory", unicode(from_jid), unicode(to_jid), limit, between, callback=callback, errback=errback)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	260
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	261 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
399 3ed53803b3b3 core: added getLastResource method Goffi <goffi@goffi.org> parents: 387 diff changeset	262 in_signature='ss', out_signature='s',
3ed53803b3b3 core: added getLastResource method Goffi <goffi@goffi.org> parents: 387 diff changeset	263 async_callbacks=None)
3ed53803b3b3 core: added getLastResource method Goffi <goffi@goffi.org> parents: 387 diff changeset	264 def getLastResource(self, contact_jid, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	265 return self._callback("getLastResource", unicode(contact_jid), unicode(profile_key))
399 3ed53803b3b3 core: added getLastResource method Goffi <goffi@goffi.org> parents: 387 diff changeset	266
3ed53803b3b3 core: added getLastResource method Goffi <goffi@goffi.org> parents: 387 diff changeset	267 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	268 in_signature='sss', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	269 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	270 def getMenuHelp(self, category, name, menu_type):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	271 return self._callback("getMenuHelp", unicode(category), unicode(name), unicode(menu_type))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	272
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	273 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	274 in_signature='', out_signature='a(sss)',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	275 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	276 def getMenus(self, ):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	277 return self._callback("getMenus", )
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	278
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	279 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	280 in_signature='ssss', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	281 async_callbacks=None)
272 1d2e0dfe7114 bridge: core & frontend sides of bridge are now generated Goffi <goffi@goffi.org> parents: 267 diff changeset	282 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	283 return self._callback("getParamA", unicode(name), unicode(category), unicode(attribute), unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	284
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	285 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	286 in_signature='s', out_signature='s',
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	287 async_callbacks=('callback', 'errback'))
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	288 def getParams(self, profile_key="@DEFAULT@", callback=None, errback=None):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	289 return self._callback("getParams", unicode(profile_key), callback=callback, errback=errback)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	290
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	291 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	292 in_signature='', out_signature='as',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	293 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	294 def getParamsCategories(self, ):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	295 return self._callback("getParamsCategories", )
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	296
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	297 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	298 in_signature='ss', out_signature='s',
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	299 async_callbacks=('callback', 'errback'))
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	300 def getParamsForCategory(self, category, profile_key="@DEFAULT@", callback=None, errback=None):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	301 return self._callback("getParamsForCategory", unicode(category), unicode(profile_key), callback=callback, errback=errback)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	302
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	303 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	304 in_signature='s', out_signature='s',
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	305 async_callbacks=('callback', 'errback'))
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	306 def getParamsUI(self, profile_key="@DEFAULT@", callback=None, errback=None):
6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	307 return self._callback("getParamsUI", unicode(profile_key), callback=callback, errback=errback)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	308
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	309 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	310 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	311 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	312 def getPresenceStatus(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	313 return self._callback("getPresenceStatus", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	314
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	315 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	316 in_signature='s', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	317 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	318 def getProfileName(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	319 return self._callback("getProfileName", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	320
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	321 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	322 in_signature='', out_signature='as',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	323 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	324 def getProfilesList(self, ):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	325 return self._callback("getProfilesList", )
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	326
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	327 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	328 in_signature='s', out_signature='a{ss}',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	329 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	330 def getProgress(self, id):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	331 return self._callback("getProgress", unicode(id))
68 9b842086d915 multiple profiles update Goffi <goffi@goffi.org> parents: 67 diff changeset	332
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	333 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	334 in_signature='', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	335 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	336 def getVersion(self, ):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	337 return self._callback("getVersion", )
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	338
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	339 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	340 in_signature='s', out_signature='a{ss}',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	341 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	342 def getWaitingSub(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	343 return self._callback("getWaitingSub", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	344
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	345 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	346 in_signature='s', out_signature='b',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	347 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	348 def isConnected(self, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	349 return self._callback("isConnected", unicode(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	350
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	351 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	352 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	353 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	354 def launchAction(self, action_type, data, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	355 return self._callback("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	356
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	357 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	358 in_signature='ssssi', out_signature='s',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	359 async_callbacks=None)
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	360 def registerNewAccount(self, login, password, email, host, port=5222):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	361 return self._callback("registerNewAccount", unicode(login), unicode(password), unicode(email), unicode(host), port)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	362
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	363 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	364 in_signature='sssss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	365 async_callbacks=None)
272 1d2e0dfe7114 bridge: core & frontend sides of bridge are now generated Goffi <goffi@goffi.org> parents: 267 diff changeset	366 def sendMessage(self, to_jid, message, subject='', mess_type="chat", profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	367 return self._callback("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	368
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	369 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	370 in_signature='ssss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	371 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	372 def setParam(self, name, value, category, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	373 return self._callback("setParam", unicode(name), unicode(value), unicode(category), unicode(profile_key))
105 d2630fba8dfd params to XMLUI tools Goffi <goffi@goffi.org> parents: 101 diff changeset	374
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	375 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	376 in_signature='ssia{ss}s', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	377 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	378 def setPresence(self, to_jid='', show='', priority=0, statuses={}, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	379 return self._callback("setPresence", unicode(to_jid), unicode(show), priority, statuses, unicode(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	380
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	381 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	382 in_signature='sss', out_signature='',
4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	383 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	384 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	385 return self._callback("subscription", unicode(sub_type), unicode(entity), unicode(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	386
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	387 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
345 e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	388 in_signature='ssass', out_signature='',
e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	389 async_callbacks=None)
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	390 def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"):
423 6c20c76abdcc backend: - bridge async D-Bus method now automatically manage callback and errback, we just have to return a deferred Goffi <goffi@goffi.org> parents: 419 diff changeset	391 return self._callback("updateContact", unicode(entity_jid), unicode(name), groups, unicode(profile_key))
345 e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	392
101 783e9d6980ec Couchsurfing plugin: first draft Goffi <goffi@goffi.org> parents: 89 diff changeset	393
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	394 def __attributes(self, in_sign):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	395 """Return arguments to user given a in_sign
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	396 @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	397 @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	398 i=0
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	399 idx=0
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	400 attr=[]
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	401 while i<len(in_sign):
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	402 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	403 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	404
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	405 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	406 idx+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	407
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	408 if in_sign[i] == 'a':
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	409 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	410 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	411 i+=1
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	412 continue #we have a simple type for the array
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	413 opening_car = in_sign[i]
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	414 assert(opening_car in ['{','('])
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	415 closing_car = '}' if opening_car == '{' else ')'
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	416 opening_count = 1
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	417 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	418 i+=1
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	419 if i>=len(in_sign):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	420 raise ParseError("missing }")
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	421 if in_sign[i] == opening_car:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	422 opening_count+=1
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	423 if in_sign[i] == closing_car:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	424 opening_count-=1
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	425 if opening_count == 0:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	426 break
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	427 i+=1
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	428 return attr
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	429
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	430 def addMethod(self, name, int_suffix, in_sign, out_sign, method, async=False):
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	431 """Dynamically add a method to Dbus Bridge"""
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	432 inspect_args = inspect.getargspec(method)
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	433
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	434 _attributes = inspect_args.args
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	435 _defaults = list(inspect_args.defaults or [])
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	436
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	437 if inspect.ismethod(method):
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	438 #if we have a method, we don't want the first argument (usually 'self')
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	439 del(_attributes[0])
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	440
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	441 if async:
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	442 _attributes.extend(['callback','errback'])
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	443 _defaults.extend(['callback', 'errback'])
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	444
233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	445 attributes = ', '.join(_attributes)
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	446
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	447 #now we create a second list with default values
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	448 for i in range(1, len(_defaults)+1):
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	449 _attributes[-i] = "%s = %s" % (_attributes[-i], repr(_defaults[-i]))
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	450
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	451 attributes_defaults = ', '.join(_attributes)
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	452
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	453 code = compile ('def %(name)s (self,%(attributes_defaults)s): return self.cb["%(name)s"](%(attributes)s)' %
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	454 {'name':name, 'attributes_defaults':attributes_defaults, 'attributes':attributes}, '<DBus bridge>','exec')
c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	455 exec (code) #FIXME: to the same thing in a cleaner way, without compile/exec
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	456 method = locals()[name]
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	457 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	458 setattr(DbusObject, name, dbus.service.method(
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	459 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	460 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	461 function = getattr(self, name)
c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	462 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	463 func_table[function.__name__] = function #Needed for introspection
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	464
298 15c8916317d0 dbus bridge: added doc parameter, unmanaged yet Goffi <goffi@goffi.org> parents: 284 diff changeset	465 def addSignal(self, name, int_suffix, signature, doc={}):
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	466 """Dynamically add a signal to Dbus Bridge"""
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	467 attributes = ', '.join(self.__attributes(signature))
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	468 #TODO: use doc parameter to name attributes
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	469
337 4402ac630712 bridge: async callback managed in bridge_constructor + misc Goffi <goffi@goffi.org> parents: 336 diff changeset	470 #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	471 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	472 exec (code)
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	473 signal = locals()[name]
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	474 setattr(DbusObject, name, dbus.service.signal(
9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	475 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	476 function = getattr(self, name)
c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	477 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	478 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	479
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	480 class DBusBridge(Bridge):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	481 def __init__(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	482 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	483 Bridge.__init__(self)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	484 info ("Init DBus...")
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	485 self.session_bus = dbus.SessionBus()
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	486 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	487 self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	488
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	489 def actionResult(self, answer_type, id, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	490 self.dbus_bridge.actionResult(answer_type, id, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	491
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	492 def actionResultExt(self, answer_type, id, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	493 self.dbus_bridge.actionResultExt(answer_type, id, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	494
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	495 def askConfirmation(self, conf_type, id, data):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	496 self.dbus_bridge.askConfirmation(conf_type, id, data)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	497
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	498 def connected(self, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	499 self.dbus_bridge.connected(profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	500
274 c1ad04586edf Bridge: rename connection_error to connectionError for function name consistency Goffi <goffi@goffi.org> parents: 272 diff changeset	501 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	502 self.dbus_bridge.connectionError(error_type, profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	503
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	504 def contactDeleted(self, entity_jid, profile):
e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	505 self.dbus_bridge.contactDeleted(entity_jid, profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	506
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	507 def disconnected(self, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	508 self.dbus_bridge.disconnected(profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	509
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	510 def newAlert(self, message, title, alert_type, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	511 self.dbus_bridge.newAlert(message, title, alert_type, profile)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	512
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	513 def newContact(self, contact_jid, attributes, groups, profile):
e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	514 self.dbus_bridge.newContact(contact_jid, attributes, groups, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	515
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	516 def newMessage(self, from_jid, message, mess_type, to_jid, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	517 self.dbus_bridge.newMessage(from_jid, message, mess_type, to_jid, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	518
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	519 def paramUpdate(self, name, value, category, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	520 self.dbus_bridge.paramUpdate(name, value, category, profile)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	521
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	522 def presenceUpdate(self, entity_jid, show, priority, statuses, profile):
e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	523 self.dbus_bridge.presenceUpdate(entity_jid, show, priority, statuses, profile)
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	524
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	525 def subscribe(self, sub_type, entity_jid, profile):
e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	526 self.dbus_bridge.subscribe(sub_type, entity_jid, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	527
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	528 def updatedValue(self, name, value, profile):
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	529 self.dbus_bridge.updatedValue(name, value, profile)
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	530
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	531
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	532 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	533 debug("registering DBus bridge method [%s]", name)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	534 self.dbus_bridge.register(name, callback)
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	535
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	536 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	537 """Dynamically add a method to Dbus Bridge"""
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	538 #FIXME: doc parameter is kept only temporary, the time to remove it from calls
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	539 print ("Adding method [%s] to DBus bridge" % name)
468 c97640c90a94 D-Bus Bridge: use inspection to name attribute + fix asynchronous calls for dynamically added method, it now use deferred return value instead of callback/errback attributes Goffi <goffi@goffi.org> parents: 459 diff changeset	540 self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign, method, async)
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	541 self.register(name, method)
c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	542
298 15c8916317d0 dbus bridge: added doc parameter, unmanaged yet Goffi <goffi@goffi.org> parents: 284 diff changeset	543 def addSignal(self, name, int_suffix, signature, doc={}):
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	544 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	545 setattr(DBusBridge, name, getattr(self.dbus_bridge, name))

Mercurial > libervia-backend

annotate src/bridge/DBus.py @ 468:c97640c90a94