libervia-backend: sat/bridge/dbus

annotate sat/bridge/dbus_bridge.py @ 3151:f9f05d8ccba6

changelog: update

author	Goffi <goffi@goffi.org>
date	Wed, 29 Jan 2020 20:52:23 +0100
parents	830fce0db15d
children	d10b2368684e

rev	line source
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	1 #!/usr/bin/env python3
3137 559a625a236b fixed shebangs Goffi <goffi@goffi.org> parents: 3136 diff changeset	2
3143 830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	3 # SàT communication bridge
3136 9d0df638c8b4 dates update Goffi <goffi@goffi.org> parents: 3123 diff changeset	4 # Copyright (C) 2009-2020 Jérôme Poisson (goffi@goffi.org)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	5
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	6 # This program is free software: you can redistribute it and/or modify
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	7 # it under the terms of the GNU Affero General Public License as published by
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	8 # the Free Software Foundation, either version 3 of the License, or
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	9 # (at your option) any later version.
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	10
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	11 # This program is distributed in the hope that it will be useful,
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	12 # but WITHOUT ANY WARRANTY; without even the implied warranty of
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	13 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	14 # GNU Affero General Public License for more details.
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	15
609 84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	16 # You should have received a copy of the GNU Affero General Public License
84a6e83157c2 fixed licences in docstrings (they are now in comments) Goffi <goffi@goffi.org> parents: 595 diff changeset	17 # along with this program. If not, see <http://www.gnu.org/licenses/>.
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	18
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	19 from sat.core.i18n import _
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	20 import dbus
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	21 import dbus.service
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	22 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	23 import inspect
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	24 from sat.core.log import getLogger
3143 830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	25 from sat.tools import config
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	26 from twisted.internet.defer import Deferred
627 d207c2186519 core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised: Goffi <goffi@goffi.org> parents: 609 diff changeset	27 from sat.core.exceptions import BridgeInitError
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	28
3143 830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	29
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	30 log = getLogger(__name__)
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	31
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	32 # Interface prefix
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	33 const_INT_PREFIX = config.getConfig(
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	34 config.parseMainConf(),
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	35 "",
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	36 "bridge_dbus_int_prefix",
830fce0db15d bridge (dbus): new `bridge_dbus_int_prefix` option (in `[DEFAULT]` settings) to change interface prefix Goffi <goffi@goffi.org> parents: 3137 diff changeset	37 "org.salutatoi.SAT")
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	38 const_ERROR_PREFIX = const_INT_PREFIX + ".error"
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	39 const_OBJ_PATH = "/org/salutatoi/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	40 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	41 const_PLUGIN_SUFFIX = ".plugin"
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	42
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	43
477 031b0e0aaab8 plugin groupblog: subscriptions/notifications Goffi <goffi@goffi.org> parents: 469 diff changeset	44 class ParseError(Exception):
031b0e0aaab8 plugin groupblog: subscriptions/notifications Goffi <goffi@goffi.org> parents: 469 diff changeset	45 pass
031b0e0aaab8 plugin groupblog: subscriptions/notifications Goffi <goffi@goffi.org> parents: 469 diff changeset	46
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	47
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	48 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	49 _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	50
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	51
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 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	53 _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	54
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	55
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	56 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	57 _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	58
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	59
424 72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	60 class DeferredNotAsync(dbus.DBusException):
72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	61 _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	62
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	63
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	64 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	65 def __init__(self, twisted_error):
1073 f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	66 """
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	67
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	68 @param twisted_error (Failure): instance of twisted Failure
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	69 @return: DBusException
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	70 """
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	71 super(GenericException, self).__init__()
751 1def5b7edf9f core, bridge: better GenericException handling Goffi <goffi@goffi.org> parents: 698 diff changeset	72 try:
1def5b7edf9f core, bridge: better GenericException handling Goffi <goffi@goffi.org> parents: 698 diff changeset	73 # twisted_error.value is a class
1062 95758ef3faa8 bridge: async failures are more detailed (full class name + error message) souliane <souliane@mailoo.org> parents: 1060 diff changeset	74 class_ = twisted_error.value().__class__
751 1def5b7edf9f core, bridge: better GenericException handling Goffi <goffi@goffi.org> parents: 698 diff changeset	75 except TypeError:
1def5b7edf9f core, bridge: better GenericException handling Goffi <goffi@goffi.org> parents: 698 diff changeset	76 # twisted_error.value is an instance
1062 95758ef3faa8 bridge: async failures are more detailed (full class name + error message) souliane <souliane@mailoo.org> parents: 1060 diff changeset	77 class_ = twisted_error.value.__class__
1073 f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	78 message = twisted_error.getErrorMessage()
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	79 try:
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	80 self.args = (message, twisted_error.value.condition)
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	81 except AttributeError:
f094583732de bridge: DBusException also transports the twisted failure condition souliane <souliane@mailoo.org> parents: 1062 diff changeset	82 self.args = (message,)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	83 self._dbus_error_name = ".".join(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	84 [const_ERROR_PREFIX, class_.__module__, class_.__name__]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	85 )
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	86
419 6c167a2e04b8 bridge: added generic D-Bus exception management + asyncCreateProfile method Goffi <goffi@goffi.org> parents: 413 diff changeset	87
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	88 class DbusObject(dbus.service.Object):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	89 def __init__(self, bus, path):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	90 dbus.service.Object.__init__(self, bus, path)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	91 log.debug("Init DbusObject...")
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	92 self.cb = {}
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	93
2086 4633cfcbcccb bridge (D-Bus): bad design fixes: Goffi <goffi@goffi.org> parents: 2085 diff changeset	94 def register_method(self, name, cb):
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	95 self.cb[name] = cb
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	96
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	97 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	98 """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	99 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	100 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	101 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	102
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	103 if "callback" in kwargs:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	104 # we must have errback too
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	105 if not "errback" in kwargs:
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	106 log.error("errback is missing in method call [%s]" % 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	107 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	108 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	109 errback = kwargs.pop("errback")
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	110 async_ = True
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	111 else:
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	112 async_ = False
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	113 result = self.cb[name](args, *kwargs)
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	114 if async_:
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	115 if not isinstance(result, Deferred):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	116 log.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	117 raise AsyncNotDeferred
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	118 result.addCallback(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	119 lambda result: callback() if result is None else callback(result)
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	120 )
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	121 result.addErrback(lambda err: errback(GenericException(err)))
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	122 else:
424 72c13313b6d6 bridge: added check that synchronous method does not return a deferred Goffi <goffi@goffi.org> parents: 423 diff changeset	123 if isinstance(result, Deferred):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	124 log.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	125 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	126 return result
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	127
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	128 ### signals ###
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	129
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	130 @dbus.service.signal(const_INT_PREFIX + const_PLUGIN_SUFFIX, signature="")
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	131 def dummySignal(self):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	132 # FIXME: workaround for addSignal (doesn't work if one method doensn't
371 3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	133 # 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	134 # further investigations
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	135 pass
3ea41a199b36 bridge refactoring: categories are now core and plugin instead of communication and request Goffi <goffi@goffi.org> parents: 365 diff changeset	136
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	137 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
2854 eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	138 signature='sa{ss}s')
eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	139 def _debug(self, action, params, profile):
eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	140 pass
eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	141
eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	142 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	143 signature='a{ss}sis')
1599 e2ed8009e66e backend, bridge, frontends: actionNew has now a security_limit argument + added some docstring to explain data argument Goffi <goffi@goffi.org> parents: 1595 diff changeset	144 def actionNew(self, action_data, id, security_limit, profile):
1467 ceba6fd77739 core, bridge: new signal actionNew to launch an action from the backend (e.g. display a dialog message): Goffi <goffi@goffi.org> parents: 1435 diff changeset	145 pass
ceba6fd77739 core, bridge: new signal actionNew to launch an action from the backend (e.g. display a dialog message): Goffi <goffi@goffi.org> parents: 1435 diff changeset	146
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	147 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	148 signature='ss')
2894 c7c52c0dc13a core, quick_frontend(app): fixed connected signal handling Goffi <goffi@goffi.org> parents: 2892 diff changeset	149 def connected(self, jid_s, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	150 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	151
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	152 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	153 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	154 def contactDeleted(self, entity_jid, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	155 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	156
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	157 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	158 signature='s')
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	159 def disconnected(self, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	160 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	161
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	162 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	163 signature='ssss')
504 65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	164 def entityDataUpdated(self, jid, name, value, profile):
65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	165 pass
65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	166
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	167 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
2655 b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	168 signature='sss')
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	169 def messageEncryptionStarted(self, to_jid, encryption_data, profile_key):
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	170 pass
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	171
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	172 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	173 signature='sa{ss}s')
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	174 def messageEncryptionStopped(self, to_jid, encryption_data, profile_key):
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	175 pass
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	176
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	177 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	178 signature='sdssa{ss}a{ss}sa{ss}s')
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	179 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile):
1955 633b5c21aefd backend, frontend: messages refactoring (huge commit, not finished): Goffi <goffi@goffi.org> parents: 1934 diff changeset	180 pass
633b5c21aefd backend, frontend: messages refactoring (huge commit, not finished): Goffi <goffi@goffi.org> parents: 1934 diff changeset	181
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	182 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	183 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	184 def newContact(self, contact_jid, attributes, groups, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	185 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	186
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	187 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	188 signature='ssss')
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	189 def paramUpdate(self, name, value, category, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	190 pass
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	191
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	192 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	193 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	194 def presenceUpdate(self, entity_jid, show, priority, statuses, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	195 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	196
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	197 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	198 signature='sss')
1917 05a5a125a238 bridge (frontend): raise a BridgeExceptionNoService on org.freedesktop.DBus.Error.Spawn.ExecFailed D-Bus error Goffi <goffi@goffi.org> parents: 1766 diff changeset	199 def progressError(self, id, error, profile):
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	200 pass
7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	201
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	202 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	203 signature='sa{ss}s')
1626 63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	204 def progressFinished(self, id, metadata, profile):
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	205 pass
7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	206
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	207 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	208 signature='sa{ss}s')
1626 63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	209 def progressStarted(self, id, metadata, profile):
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	210 pass
7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	211
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	212 @dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	213 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	214 def subscribe(self, sub_type, entity_jid, profile):
336 953536246d9d core: added email in registerNewAccount Goffi <goffi@goffi.org> parents: 300 diff changeset	215 pass
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	216
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	217 ### methods ###
952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	218
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	219 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	220 in_signature='s', out_signature='a(a{ss}si)',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	221 async_callbacks=None)
1622 5b24d6bf5d15 core, bridge: actionsGet: Goffi <goffi@goffi.org> parents: 1599 diff changeset	222 def actionsGet(self, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	223 return self._callback("actionsGet", str(profile_key))
1622 5b24d6bf5d15 core, bridge: actionsGet: Goffi <goffi@goffi.org> parents: 1599 diff changeset	224
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	225 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	226 in_signature='ss', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 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 addContact(self, entity_jid, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	229 return self._callback("addContact", str(entity_jid), str(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	230
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	231 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	232 in_signature='s', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	233 async_callbacks=('callback', 'errback'))
893 308a96bc7c1b core, frontends: add method asyncDeleteProfile, remove synchronous methods createProfile and deleteProfile souliane <souliane@mailoo.org> parents: 811 diff changeset	234 def asyncDeleteProfile(self, profile, callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	235 return self._callback("asyncDeleteProfile", str(profile), callback=callback, errback=errback)
893 308a96bc7c1b core, frontends: add method asyncDeleteProfile, remove synchronous methods createProfile and deleteProfile souliane <souliane@mailoo.org> parents: 811 diff changeset	236
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	237 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	238 in_signature='sssis', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	239 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	240 def asyncGetParamA(self, name, category, attribute="value", security_limit=-1, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	241 return self._callback("asyncGetParamA", str(name), str(category), str(attribute), security_limit, str(profile_key), callback=callback, errback=errback)
413 dd4caab17008 core: - individual parameters managed through sqlite Goffi <goffi@goffi.org> parents: 399 diff changeset	242
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	243 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
3123 130f9cb6e0ab core (memory/params): added `extra` argument to filter out params notably in `getParamsUI`: Goffi <goffi@goffi.org> parents: 3102 diff changeset	244 in_signature='sisss', out_signature='a{ss}',
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	245 async_callbacks=('callback', 'errback'))
3123 130f9cb6e0ab core (memory/params): added `extra` argument to filter out params notably in `getParamsUI`: Goffi <goffi@goffi.org> parents: 3102 diff changeset	246 def asyncGetParamsValuesFromCategory(self, category, security_limit=-1, app="", extra="", profile_key="@DEFAULT@", callback=None, errback=None):
130f9cb6e0ab core (memory/params): added `extra` argument to filter out params notably in `getParamsUI`: Goffi <goffi@goffi.org> parents: 3102 diff changeset	247 return self._callback("asyncGetParamsValuesFromCategory", str(category), security_limit, str(app), str(extra), str(profile_key), callback=callback, errback=errback)
1587 698d6755d62a core, bridge (params): added asyncGetParamsValuesFromCategory (yes that's a long name!) method to retrive params names and values for a given category Goffi <goffi@goffi.org> parents: 1586 diff changeset	248
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	249 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	250 in_signature='ssa{ss}', out_signature='b',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	251 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	252 def connect(self, profile_key="@DEFAULT@", password='', options={}, callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	253 return self._callback("connect", str(profile_key), str(password), options, callback=callback, errback=errback)
2142 be96beb7ca14 core, bridge, frontends: renamed asyncConnect to connect, and added options parameters (not used yet) Goffi <goffi@goffi.org> parents: 2126 diff changeset	254
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	255 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	256 in_signature='ss', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	257 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	258 def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	259 return self._callback("delContact", str(entity_jid), str(profile_key), callback=callback, errback=errback)
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	260
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	261 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	262 in_signature='asa(ss)bbbbbs', out_signature='(a{sa(sss)}a{sa(sss)}a{sa(sss)})',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	263 async_callbacks=('callback', 'errback'))
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	264 def discoFindByFeatures(self, namespaces, identities, bare_jid=False, service=True, roster=True, own_jid=True, local_device=False, profile_key="@DEFAULT@", callback=None, errback=None):
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	265 return self._callback("discoFindByFeatures", namespaces, identities, bare_jid, service, roster, own_jid, local_device, str(profile_key), callback=callback, errback=errback)
2534 7da86e1633a5 core: new discoFindFeatures method which return all server services/roster entities implementing a set of features. Goffi <goffi@goffi.org> parents: 2483 diff changeset	266
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	267 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	268 in_signature='ssbs', out_signature='(asa(sss)a{sa(a{ss}as)})',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	269 async_callbacks=('callback', 'errback'))
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	270 def discoInfos(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None):
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	271 return self._callback("discoInfos", str(entity_jid), str(node), use_cache, str(profile_key), callback=callback, errback=errback)
963 723f28cd15c7 core (disco): added discoInfos and discoItems bridge methods Goffi <goffi@goffi.org> parents: 943 diff changeset	272
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	273 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	274 in_signature='ssbs', out_signature='a(sss)',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	275 async_callbacks=('callback', 'errback'))
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	276 def discoItems(self, entity_jid, node=u'', use_cache=True, profile_key="@DEFAULT@", callback=None, errback=None):
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	277 return self._callback("discoItems", str(entity_jid), str(node), use_cache, str(profile_key), callback=callback, errback=errback)
963 723f28cd15c7 core (disco): added discoInfos and discoItems bridge methods Goffi <goffi@goffi.org> parents: 943 diff changeset	278
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	279 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	280 in_signature='s', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	281 async_callbacks=('callback', 'errback'))
2144 1d3f73e065e1 core, jp: component handling + client handling refactoring: Goffi <goffi@goffi.org> parents: 2142 diff changeset	282 def disconnect(self, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	283 return self._callback("disconnect", str(profile_key), callback=callback, errback=errback)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	284
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	285 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2733 e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	286 in_signature='s', out_signature='s',
e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	287 async_callbacks=None)
e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	288 def encryptionNamespaceGet(self, arg_0):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	289 return self._callback("encryptionNamespaceGet", str(arg_0))
2733 e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	290
e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	291 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
3102 7574f795bd1e core, bridge: encryptionPluginsGet now returns a serialised list + added "directed" in metadata Goffi <goffi@goffi.org> parents: 3066 diff changeset	292 in_signature='', out_signature='s',
2658 4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	293 async_callbacks=None)
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	294 def encryptionPluginsGet(self, ):
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	295 return self._callback("encryptionPluginsGet", )
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	296
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	297 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2733 e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	298 in_signature='sss', out_signature='s',
e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	299 async_callbacks=('callback', 'errback'))
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	300 def encryptionTrustUIGet(self, to_jid, namespace, profile_key, callback=None, errback=None):
ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	301 return self._callback("encryptionTrustUIGet", str(to_jid), str(namespace), str(profile_key), callback=callback, errback=errback)
2733 e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	302
e347e32aa07f core (memory/encryption): new encryptionNamespaceGet and encryptionTrustUIGet methods: Goffi <goffi@goffi.org> parents: 2658 diff changeset	303 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	304 in_signature='ss', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	305 async_callbacks=None)
365 efbfccfed623 core: local_dir moved to config file Goffi <goffi@goffi.org> parents: 364 diff changeset	306 def getConfig(self, section, name):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	307 return self._callback("getConfig", str(section), str(name))
364 312ca6f9d84a core: configuration file Goffi <goffi@goffi.org> parents: 360 diff changeset	308
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	309 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	310 in_signature='s', out_signature='a(sa{ss}as)',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	311 async_callbacks=('callback', 'errback'))
1262 f8a8434dbac7 core: improved roster management + misc: Goffi <goffi@goffi.org> parents: 1224 diff changeset	312 def getContacts(self, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	313 return self._callback("getContacts", str(profile_key), callback=callback, errback=errback)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	314
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	315 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	316 in_signature='ss', out_signature='as',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	317 async_callbacks=None)
501 e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 480 diff changeset	318 def getContactsFromGroup(self, group, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	319 return self._callback("getContactsFromGroup", str(group), str(profile_key))
501 e9634d2e7b38 core, quick_frontend, primitivus, wix: Contacts List refactoring phase 1: Goffi <goffi@goffi.org> parents: 480 diff changeset	320
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	321 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	322 in_signature='asass', out_signature='a{sa{ss}}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	323 async_callbacks=None)
1314 bb9c32249778 core: added getEntitiesData which get cache data for several entities at once Goffi <goffi@goffi.org> parents: 1290 diff changeset	324 def getEntitiesData(self, jids, keys, profile):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	325 return self._callback("getEntitiesData", jids, keys, str(profile))
1314 bb9c32249778 core: added getEntitiesData which get cache data for several entities at once Goffi <goffi@goffi.org> parents: 1290 diff changeset	326
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	327 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	328 in_signature='sass', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	329 async_callbacks=None)
504 65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	330 def getEntityData(self, jid, keys, profile):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	331 return self._callback("getEntityData", str(jid), keys, str(profile))
504 65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	332
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	333 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	334 in_signature='s', out_signature='a{sa{ss}}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	335 async_callbacks=('callback', 'errback'))
1482 80cd55dd5b04 core, bridge: added getFeatures method: Goffi <goffi@goffi.org> parents: 1467 diff changeset	336 def getFeatures(self, profile_key, callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	337 return self._callback("getFeatures", str(profile_key), callback=callback, errback=errback)
1482 80cd55dd5b04 core, bridge: added getFeatures method: Goffi <goffi@goffi.org> parents: 1467 diff changeset	338
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	339 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	340 in_signature='ss', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	341 async_callbacks=None)
1290 faa1129559b8 core, frontends: refactoring to base Libervia on QuickFrontend (big mixed commit): Goffi <goffi@goffi.org> parents: 1262 diff changeset	342 def getMainResource(self, contact_jid, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	343 return self._callback("getMainResource", str(contact_jid), str(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	344
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	345 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	346 in_signature='ssss', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	347 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	348 def getParamA(self, name, category, attribute="value", profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	349 return self._callback("getParamA", str(name), str(category), str(attribute), str(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	350
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	351 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	352 in_signature='', out_signature='as',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	353 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	354 def getParamsCategories(self, ):
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	355 return self._callback("getParamsCategories", )
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	356
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	357 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
3123 130f9cb6e0ab core (memory/params): added `extra` argument to filter out params notably in `getParamsUI`: Goffi <goffi@goffi.org> parents: 3102 diff changeset	358 in_signature='isss', out_signature='s',
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	359 async_callbacks=('callback', 'errback'))
3123 130f9cb6e0ab core (memory/params): added `extra` argument to filter out params notably in `getParamsUI`: Goffi <goffi@goffi.org> parents: 3102 diff changeset	360 def getParamsUI(self, security_limit=-1, app='', extra='', profile_key="@DEFAULT@", callback=None, errback=None):
130f9cb6e0ab core (memory/params): added `extra` argument to filter out params notably in `getParamsUI`: Goffi <goffi@goffi.org> parents: 3102 diff changeset	361 return self._callback("getParamsUI", security_limit, str(app), str(extra), str(profile_key), callback=callback, errback=errback)
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	362
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	363 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	364 in_signature='s', out_signature='a{sa{s(sia{ss})}}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	365 async_callbacks=None)
943 71926ec2114d core (memory): entities cache improvments: Goffi <goffi@goffi.org> parents: 917 diff changeset	366 def getPresenceStatuses(self, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	367 return self._callback("getPresenceStatuses", str(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	368
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	369 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	370 in_signature='', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	371 async_callbacks=('callback', 'errback'))
1023 8bae81e254a2 core: added a getReady method which can be called by frontends to ensure that backend is fully initialised before doing anything + this ckeck is automatically done in asyncConnect Goffi <goffi@goffi.org> parents: 1015 diff changeset	372 def getReady(self, callback=None, errback=None):
8bae81e254a2 core: added a getReady method which can be called by frontends to ensure that backend is fully initialised before doing anything + this ckeck is automatically done in asyncConnect Goffi <goffi@goffi.org> parents: 1015 diff changeset	373 return self._callback("getReady", callback=callback, errback=errback)
8bae81e254a2 core: added a getReady method which can be called by frontends to ensure that backend is fully initialised before doing anything + this ckeck is automatically done in asyncConnect Goffi <goffi@goffi.org> parents: 1015 diff changeset	374
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	375 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	376 in_signature='', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	377 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	378 def getVersion(self, ):
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	379 return self._callback("getVersion", )
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	380
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	381 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	382 in_signature='s', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	383 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	384 def getWaitingSub(self, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	385 return self._callback("getWaitingSub", str(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	386
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	387 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	388 in_signature='ssiba{ss}s', out_signature='a(sdssa{ss}a{ss}sa{ss})',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	389 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	390 def historyGet(self, from_jid, to_jid, limit, between=True, filters='', profile="@NONE@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	391 return self._callback("historyGet", str(from_jid), str(to_jid), limit, between, filters, str(profile), callback=callback, errback=errback)
1955 633b5c21aefd backend, frontend: messages refactoring (huge commit, not finished): Goffi <goffi@goffi.org> parents: 1934 diff changeset	392
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	393 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
3066 2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	394 in_signature='s', out_signature='s',
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	395 async_callbacks=None)
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	396 def imageCheck(self, arg_0):
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	397 return self._callback("imageCheck", str(arg_0))
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	398
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	399 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	400 in_signature='sii', out_signature='s',
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	401 async_callbacks=('callback', 'errback'))
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	402 def imageResize(self, image_path, width, height, callback=None, errback=None):
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	403 return self._callback("imageResize", str(image_path), width, height, callback=callback, errback=errback)
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	404
2cc2f65379f7 core: added imageCheck and imageResize methods: Goffi <goffi@goffi.org> parents: 3028 diff changeset	405 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	406 in_signature='s', out_signature='b',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	407 async_callbacks=None)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	408 def isConnected(self, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	409 return self._callback("isConnected", str(profile_key))
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	410
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	411 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	412 in_signature='sa{ss}s', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	413 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	414 def launchAction(self, callback_id, data, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	415 return self._callback("launchAction", str(callback_id), data, str(profile_key), callback=callback, errback=errback)
60 9764e027ecc0 SàT: multi-profile parameters, first draft Goffi <goffi@goffi.org> parents: 57 diff changeset	416
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	417 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	418 in_signature='s', out_signature='b',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	419 async_callbacks=None)
1015 fee00f2e11c2 memory, jp: added jp commands to load/save parameters template souliane <souliane@mailoo.org> parents: 993 diff changeset	420 def loadParamsTemplate(self, filename):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	421 return self._callback("loadParamsTemplate", str(filename))
1015 fee00f2e11c2 memory, jp: added jp commands to load/save parameters template souliane <souliane@mailoo.org> parents: 993 diff changeset	422
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	423 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	424 in_signature='ss', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	425 async_callbacks=None)
2126 2f264f3df280 core (menus): improvments: Goffi <goffi@goffi.org> parents: 2113 diff changeset	426 def menuHelpGet(self, menu_id, language):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	427 return self._callback("menuHelpGet", str(menu_id), str(language))
2126 2f264f3df280 core (menus): improvments: Goffi <goffi@goffi.org> parents: 2113 diff changeset	428
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	429 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	430 in_signature='sasa{ss}is', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	431 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	432 def menuLaunch(self, menu_type, path, data, security_limit, profile_key, callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	433 return self._callback("menuLaunch", str(menu_type), path, data, security_limit, str(profile_key), callback=callback, errback=errback)
2126 2f264f3df280 core (menus): improvments: Goffi <goffi@goffi.org> parents: 2113 diff changeset	434
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	435 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	436 in_signature='si', out_signature='a(ssasasa{ss})',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	437 async_callbacks=None)
2126 2f264f3df280 core (menus): improvments: Goffi <goffi@goffi.org> parents: 2113 diff changeset	438 def menusGet(self, language, security_limit):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	439 return self._callback("menusGet", str(language), security_limit)
2126 2f264f3df280 core (menus): improvments: Goffi <goffi@goffi.org> parents: 2113 diff changeset	440
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	441 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2658 4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	442 in_signature='ss', out_signature='s',
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	443 async_callbacks=None)
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	444 def messageEncryptionGet(self, to_jid, profile_key):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	445 return self._callback("messageEncryptionGet", str(to_jid), str(profile_key))
2658 4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	446
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	447 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	448 in_signature='ssbs', out_signature='',
2743 da59ff099b32 core (memory/encryption), plugin OTR: finished OTR integration in encryption: Goffi <goffi@goffi.org> parents: 2733 diff changeset	449 async_callbacks=('callback', 'errback'))
da59ff099b32 core (memory/encryption), plugin OTR: finished OTR integration in encryption: Goffi <goffi@goffi.org> parents: 2733 diff changeset	450 def messageEncryptionStart(self, to_jid, namespace='', replace=False, profile_key="@NONE@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	451 return self._callback("messageEncryptionStart", str(to_jid), str(namespace), replace, str(profile_key), callback=callback, errback=errback)
2658 4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	452
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	453 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
4e130cc9bfc0 core (memore/encryption): new methods and checks: Goffi <goffi@goffi.org> parents: 2655 diff changeset	454 in_signature='ss', out_signature='',
2743 da59ff099b32 core (memory/encryption), plugin OTR: finished OTR integration in encryption: Goffi <goffi@goffi.org> parents: 2733 diff changeset	455 async_callbacks=('callback', 'errback'))
da59ff099b32 core (memory/encryption), plugin OTR: finished OTR integration in encryption: Goffi <goffi@goffi.org> parents: 2733 diff changeset	456 def messageEncryptionStop(self, to_jid, profile_key, callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	457 return self._callback("messageEncryptionStop", str(to_jid), str(profile_key), callback=callback, errback=errback)
2646 712cb4ff3e13 core: new EncryptionHandler class which manage encrypted session as a core feature: Goffi <goffi@goffi.org> parents: 2628 diff changeset	458
712cb4ff3e13 core: new EncryptionHandler class which manage encrypted session as a core feature: Goffi <goffi@goffi.org> parents: 2628 diff changeset	459 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	460 in_signature='sa{ss}a{ss}sa{ss}s', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	461 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	462 def messageSend(self, to_jid, message, subject={}, mess_type="auto", extra={}, profile_key="@NONE@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	463 return self._callback("messageSend", str(to_jid), message, subject, str(mess_type), extra, str(profile_key), callback=callback, errback=errback)
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	464
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	465 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	466 in_signature='', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	467 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	468 def namespacesGet(self, ):
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	469 return self._callback("namespacesGet", )
2443 81a45e7886c9 core: added a mechanism to associate short names to namespaces: Goffi <goffi@goffi.org> parents: 2414 diff changeset	470
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	471 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	472 in_signature='sis', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	473 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	474 def paramsRegisterApp(self, xml, security_limit=-1, app=''):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	475 return self._callback("paramsRegisterApp", str(xml), security_limit, str(app))
777 5642939d254e core, bridge: new method paramsRegisterApp to register frontend's specific parameters souliane <souliane@mailoo.org> parents: 773 diff changeset	476
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	477 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	478 in_signature='sss', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	479 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	480 def profileCreate(self, profile, password='', component='', callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	481 return self._callback("profileCreate", str(profile), str(password), str(component), callback=callback, errback=errback)
2144 1d3f73e065e1 core, jp: component handling + client handling refactoring: Goffi <goffi@goffi.org> parents: 2142 diff changeset	482
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	483 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	484 in_signature='s', out_signature='b',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	485 async_callbacks=None)
1592 d6d655238a93 bridge: new core method profileStartSession to start a session without connecting the profile Goffi <goffi@goffi.org> parents: 1587 diff changeset	486 def profileIsSessionStarted(self, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	487 return self._callback("profileIsSessionStarted", str(profile_key))
1592 d6d655238a93 bridge: new core method profileStartSession to start a session without connecting the profile Goffi <goffi@goffi.org> parents: 1587 diff changeset	488
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	489 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	490 in_signature='s', out_signature='s',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	491 async_callbacks=None)
2168 255830fdb80b core, bridge: renamed getProfileName to profileNameGet according to new conventions Goffi <goffi@goffi.org> parents: 2150 diff changeset	492 def profileNameGet(self, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	493 return self._callback("profileNameGet", str(profile_key))
2168 255830fdb80b core, bridge: renamed getProfileName to profileNameGet according to new conventions Goffi <goffi@goffi.org> parents: 2150 diff changeset	494
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	495 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	496 in_signature='s', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	497 async_callbacks=None)
2083 7999d5299ddc bridge(D-Bus): minotr argument name fix Goffi <goffi@goffi.org> parents: 2050 diff changeset	498 def profileSetDefault(self, profile):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	499 return self._callback("profileSetDefault", str(profile))
1595 a3d0cfa5b7a6 core, bridge: added a profileSetDefault method Goffi <goffi@goffi.org> parents: 1592 diff changeset	500
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	501 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	502 in_signature='ss', out_signature='b',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	503 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	504 def profileStartSession(self, password='', profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	505 return self._callback("profileStartSession", str(password), str(profile_key), callback=callback, errback=errback)
1592 d6d655238a93 bridge: new core method profileStartSession to start a session without connecting the profile Goffi <goffi@goffi.org> parents: 1587 diff changeset	506
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	507 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	508 in_signature='bb', out_signature='as',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	509 async_callbacks=None)
2146 1bb9bf1b4150 core, frontends: getProfilesList renamed to profilesGetList + behaviour change: Goffi <goffi@goffi.org> parents: 2144 diff changeset	510 def profilesListGet(self, clients=True, components=False):
1bb9bf1b4150 core, frontends: getProfilesList renamed to profilesGetList + behaviour change: Goffi <goffi@goffi.org> parents: 2144 diff changeset	511 return self._callback("profilesListGet", clients, components)
1bb9bf1b4150 core, frontends: getProfilesList renamed to profilesGetList + behaviour change: Goffi <goffi@goffi.org> parents: 2144 diff changeset	512
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	513 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	514 in_signature='ss', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	515 async_callbacks=None)
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	516 def progressGet(self, id, profile):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	517 return self._callback("progressGet", str(id), str(profile))
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	518
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	519 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	520 in_signature='s', out_signature='a{sa{sa{ss}}}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	521 async_callbacks=None)
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	522 def progressGetAll(self, profile):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	523 return self._callback("progressGetAll", str(profile))
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	524
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	525 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	526 in_signature='s', out_signature='a{sa{sa{ss}}}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	527 async_callbacks=None)
1626 63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	528 def progressGetAllMetadata(self, profile):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	529 return self._callback("progressGetAllMetadata", str(profile))
1626 63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	530
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	531 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2892 82b781c46841 core: added a rosterResync method to bridge: Goffi <goffi@goffi.org> parents: 2854 diff changeset	532 in_signature='s', out_signature='',
82b781c46841 core: added a rosterResync method to bridge: Goffi <goffi@goffi.org> parents: 2854 diff changeset	533 async_callbacks=('callback', 'errback'))
82b781c46841 core: added a rosterResync method to bridge: Goffi <goffi@goffi.org> parents: 2854 diff changeset	534 def rosterResync(self, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	535 return self._callback("rosterResync", str(profile_key), callback=callback, errback=errback)
2892 82b781c46841 core: added a rosterResync method to bridge: Goffi <goffi@goffi.org> parents: 2854 diff changeset	536
82b781c46841 core: added a rosterResync method to bridge: Goffi <goffi@goffi.org> parents: 2854 diff changeset	537 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	538 in_signature='s', out_signature='b',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	539 async_callbacks=None)
1015 fee00f2e11c2 memory, jp: added jp commands to load/save parameters template souliane <souliane@mailoo.org> parents: 993 diff changeset	540 def saveParamsTemplate(self, filename):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	541 return self._callback("saveParamsTemplate", str(filename))
1015 fee00f2e11c2 memory, jp: added jp commands to load/save parameters template souliane <souliane@mailoo.org> parents: 993 diff changeset	542
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	543 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	544 in_signature='s', out_signature='a{ss}',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	545 async_callbacks=('callback', 'errback'))
2113 9c861d07b5b6 core: added sessionGetInfos bridge method to retrieve various data on current profile session + client.started keep start time Goffi <goffi@goffi.org> parents: 2086 diff changeset	546 def sessionInfosGet(self, profile_key, callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	547 return self._callback("sessionInfosGet", str(profile_key), callback=callback, errback=errback)
2113 9c861d07b5b6 core: added sessionGetInfos bridge method to retrieve various data on current profile session + client.started keep start time Goffi <goffi@goffi.org> parents: 2086 diff changeset	548
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	549 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	550 in_signature='sssis', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	551 async_callbacks=None)
641 49587e170f53 core: added the security_limit to setParam souliane <souliane@mailoo.org> parents: 636 diff changeset	552 def setParam(self, name, value, category, security_limit=-1, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	553 return self._callback("setParam", str(name), str(value), str(category), security_limit, str(profile_key))
105 d2630fba8dfd params to XMLUI tools Goffi <goffi@goffi.org> parents: 101 diff changeset	554
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	555 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	556 in_signature='ssa{ss}s', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	557 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	558 def setPresence(self, to_jid='', show='', statuses={}, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	559 return self._callback("setPresence", str(to_jid), str(show), statuses, str(profile_key))
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	560
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	561 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	562 in_signature='sss', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	563 async_callbacks=None)
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	564 def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	565 return self._callback("subscription", str(sub_type), str(entity), str(profile_key))
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	566
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	567 @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	568 in_signature='ssass', out_signature='',
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	569 async_callbacks=('callback', 'errback'))
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	570 def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@", callback=None, errback=None):
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	571 return self._callback("updateContact", str(entity_jid), str(name), groups, str(profile_key), callback=callback, errback=errback)
345 e6047415868d Bridge: added updateContact method Goffi <goffi@goffi.org> parents: 337 diff changeset	572
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	573 def __attributes(self, in_sign):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	574 """Return arguments to user given a in_sign
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	575 @param in_sign: in_sign in the short form (using s,a,i,b etc)
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	576 @return: list of arguments that correspond to a in_sign (e.g.: "sss" return "arg1, arg2, arg3")"""
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	577 i = 0
1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	578 idx = 0
1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	579 attr = []
1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	580 while i < len(in_sign):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	581 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	582 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	583
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	584 attr.append("arg_%i" % idx)
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	585 idx += 1
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	586
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	587 if in_sign[i] == "a":
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	588 i += 1
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	589 if (
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	590 in_sign[i] != "{" and in_sign[i] != "("
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	591 ): # FIXME: must manage tuples out of arrays
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	592 i += 1
1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	593 continue # we have a simple type for the array
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	594 opening_car = in_sign[i]
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	595 assert opening_car in ["{", "("]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	596 closing_car = "}" if opening_car == "{" else ")"
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	597 opening_count = 1
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	598 while True: # we have a dict or a list of tuples
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	599 i += 1
1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	600 if i >= len(in_sign):
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	601 raise ParseError("missing }")
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	602 if in_sign[i] == opening_car:
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	603 opening_count += 1
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	604 if in_sign[i] == closing_car:
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	605 opening_count -= 1
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	606 if opening_count == 0:
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	607 break
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	608 i += 1
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	609 return attr
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	610
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	611 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	612 """Dynamically add a method to Dbus Bridge"""
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	613 inspect_args = inspect.getfullargspec(method)
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	614
469 db4c2b82bab6 D-Bus bridge: fixed getRoomsSubjects call + fixed dynamic addition of methods + added getLastGroupBlogs method Goffi <goffi@goffi.org> parents: 468 diff changeset	615 _arguments = inspect_args.args
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	616 _defaults = list(inspect_args.defaults or [])
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	617
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	618 if inspect.ismethod(method):
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	619 # if we have a method, we don't want the first argument (usually 'self')
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	620 del (_arguments[0])
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	621
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	622 # first arguments are for the _callback method
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	623 arguments_callback = ", ".join(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	624 [repr(name)]
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	625 + (
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	626 (_arguments + ["callback=callback", "errback=errback"])
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	627 if async_
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	628 else _arguments
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	629 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	630 )
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	631
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	632 if async_:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	633 _arguments.extend(["callback", "errback"])
469 db4c2b82bab6 D-Bus bridge: fixed getRoomsSubjects call + fixed dynamic addition of methods + added getLastGroupBlogs method Goffi <goffi@goffi.org> parents: 468 diff changeset	634 _defaults.extend([None, None])
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	635
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	636 # now we create a second list with default values
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	637 for i in range(1, len(_defaults) + 1):
469 db4c2b82bab6 D-Bus bridge: fixed getRoomsSubjects call + fixed dynamic addition of methods + added getLastGroupBlogs method Goffi <goffi@goffi.org> parents: 468 diff changeset	638 _arguments[-i] = "%s = %s" % (_arguments[-i], repr(_defaults[-i]))
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	639
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	640 arguments_defaults = ", ".join(_arguments)
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	641
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	642 code = compile(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	643 "def %(name)s (self,%(arguments_defaults)s): return self._callback(%(arguments_callback)s)"
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	644 % {
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	645 "name": name,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	646 "arguments_defaults": arguments_defaults,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	647 "arguments_callback": arguments_callback,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	648 },
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	649 "<DBus bridge>",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	650 "exec",
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	651 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	652 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	653 method = locals()[name]
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	654 async_callbacks = ("callback", "errback") if async_ else None
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	655 setattr(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	656 DbusObject,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	657 name,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	658 dbus.service.method(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	659 const_INT_PREFIX + int_suffix,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	660 in_signature=in_sign,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	661 out_signature=out_sign,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	662 async_callbacks=async_callbacks,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	663 )(method),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	664 )
284 c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	665 function = getattr(self, name)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	666 func_table = self._dbus_class_table[
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	667 self.__class__.__module__ + "." + self.__class__.__name__
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	668 ][function._dbus_interface]
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	669 func_table[function.__name__] = function # Needed for introspection
587 952322b1d490 Remove trailing whitespaces. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 572 diff changeset	670
298 15c8916317d0 dbus bridge: added doc parameter, unmanaged yet Goffi <goffi@goffi.org> parents: 284 diff changeset	671 def addSignal(self, name, int_suffix, signature, doc={}):
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	672 """Dynamically add a signal to Dbus Bridge"""
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	673 attributes = ", ".join(self.__attributes(signature))
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	674 # TODO: use doc parameter to name attributes
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	675
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	676 # code = compile ('def '+name+' (self,'+attributes+'): log.debug ("'+name+' signal")', '<DBus bridge>','exec') #XXX: the log.debug is too annoying with xmllog
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	677 code = compile(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	678 "def " + name + " (self," + attributes + "): pass", "<DBus bridge>", "exec"
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	679 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	680 exec(code)
73 9d113b5471e6 Dynamic signal addition in bridge Goffi <goffi@goffi.org> parents: 72 diff changeset	681 signal = locals()[name]
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	682 setattr(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	683 DbusObject,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	684 name,
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	685 dbus.service.signal(const_INT_PREFIX + int_suffix, signature=signature)(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	686 signal
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	687 ),
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	688 )
284 c25371424090 dbus bridge: fixed introspection for dynamically added methods and signals Goffi <goffi@goffi.org> parents: 274 diff changeset	689 function = getattr(self, name)
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	690 func_table = self._dbus_class_table[
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	691 self.__class__.__module__ + "." + self.__class__.__name__
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	692 ][function._dbus_interface]
595 1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	693 func_table[function.__name__] = function # Needed for introspection
1f160467f5de Fix pep8 support in src/bridge. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 587 diff changeset	694
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	695
2086 4633cfcbcccb bridge (D-Bus): bad design fixes: Goffi <goffi@goffi.org> parents: 2085 diff changeset	696 class Bridge(object):
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	697 def __init__(self):
c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	698 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	699 log.info("Init DBus...")
627 d207c2186519 core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised: Goffi <goffi@goffi.org> parents: 609 diff changeset	700 try:
d207c2186519 core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised: Goffi <goffi@goffi.org> parents: 609 diff changeset	701 self.session_bus = dbus.SessionBus()
d207c2186519 core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised: Goffi <goffi@goffi.org> parents: 609 diff changeset	702 except dbus.DBusException as e:
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	703 if e._dbus_error_name == "org.freedesktop.DBus.Error.NotSupported":
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	704 log.error(
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	705 _(
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	706 "D-Bus is not launched, please see README to see instructions on how to launch it"
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	707 )
56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	708 )
627 d207c2186519 core, bridge, jp, quick_frontend: SàT stop more gracefully if bridge can't be initialised: Goffi <goffi@goffi.org> parents: 609 diff changeset	709 raise BridgeInitError
10 14d7861ca59e refactoring: CONST replaced by const Goffi <goffi@goffi.org> parents: 7 diff changeset	710 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	711 self.dbus_bridge = DbusObject(self.session_bus, const_OBJ_PATH)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	712
2854 eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	713 def _debug(self, action, params, profile):
eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	714 self.dbus_bridge._debug(action, params, profile)
eb9fa72eb62b core: added a "_debug" signal: Goffi <goffi@goffi.org> parents: 2771 diff changeset	715
1599 e2ed8009e66e backend, bridge, frontends: actionNew has now a security_limit argument + added some docstring to explain data argument Goffi <goffi@goffi.org> parents: 1595 diff changeset	716 def actionNew(self, action_data, id, security_limit, profile):
e2ed8009e66e backend, bridge, frontends: actionNew has now a security_limit argument + added some docstring to explain data argument Goffi <goffi@goffi.org> parents: 1595 diff changeset	717 self.dbus_bridge.actionNew(action_data, id, security_limit, profile)
1467 ceba6fd77739 core, bridge: new signal actionNew to launch an action from the backend (e.g. display a dialog message): Goffi <goffi@goffi.org> parents: 1435 diff changeset	718
2894 c7c52c0dc13a core, quick_frontend(app): fixed connected signal handling Goffi <goffi@goffi.org> parents: 2892 diff changeset	719 def connected(self, jid_s, profile):
c7c52c0dc13a core, quick_frontend(app): fixed connected signal handling Goffi <goffi@goffi.org> parents: 2892 diff changeset	720 self.dbus_bridge.connected(jid_s, profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	721
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	722 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	723 self.dbus_bridge.contactDeleted(entity_jid, profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	724
66 8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	725 def disconnected(self, profile):
8147b4f40809 SàT: multi-profile: DBus signals and frontend adaptation (first draft) Goffi <goffi@goffi.org> parents: 65 diff changeset	726 self.dbus_bridge.disconnected(profile)
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	727
504 65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	728 def entityDataUpdated(self, jid, name, value, profile):
65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	729 self.dbus_bridge.entityDataUpdated(jid, name, value, profile)
65ecbb473cbb core, quick frontend, plugin xep-0054, bridge: use of memory's entities data for vcard: Goffi <goffi@goffi.org> parents: 501 diff changeset	730
2655 b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	731 def messageEncryptionStarted(self, to_jid, encryption_data, profile_key):
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	732 self.dbus_bridge.messageEncryptionStarted(to_jid, encryption_data, profile_key)
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	733
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	734 def messageEncryptionStopped(self, to_jid, encryption_data, profile_key):
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	735 self.dbus_bridge.messageEncryptionStopped(to_jid, encryption_data, profile_key)
b8600f8130ac core (bridge): new messageEncryptionStarted and messageEncryptionStopped signals (not used yet) Goffi <goffi@goffi.org> parents: 2646 diff changeset	736
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	737 def messageNew(self, uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile):
779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	738 self.dbus_bridge.messageNew(uid, timestamp, from_jid, to_jid, message, subject, mess_type, extra, profile)
1955 633b5c21aefd backend, frontend: messages refactoring (huge commit, not finished): Goffi <goffi@goffi.org> parents: 1934 diff changeset	739
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	740 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	741 self.dbus_bridge.newContact(contact_jid, attributes, groups, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	742
267 bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	743 def paramUpdate(self, name, value, category, profile):
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	744 self.dbus_bridge.paramUpdate(name, value, category, profile)
bdcd535e179e Bridge constructor: Goffi <goffi@goffi.org> parents: 266 diff changeset	745
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	746 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	747 self.dbus_bridge.presenceUpdate(entity_jid, show, priority, statuses, profile)
49 9c79eb49d51f DBus bridge improvment: Goffi <goffi@goffi.org> parents: 37 diff changeset	748
1917 05a5a125a238 bridge (frontend): raise a BridgeExceptionNoService on org.freedesktop.DBus.Error.Spawn.ExecFailed D-Bus error Goffi <goffi@goffi.org> parents: 1766 diff changeset	749 def progressError(self, id, error, profile):
05a5a125a238 bridge (frontend): raise a BridgeExceptionNoService on org.freedesktop.DBus.Error.Spawn.ExecFailed D-Bus error Goffi <goffi@goffi.org> parents: 1766 diff changeset	750 self.dbus_bridge.progressError(id, error, profile)
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	751
1626 63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	752 def progressFinished(self, id, metadata, profile):
63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	753 self.dbus_bridge.progressFinished(id, metadata, profile)
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	754
1626 63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	755 def progressStarted(self, id, metadata, profile):
63cef4dbf2a4 core, plugins file, XEP-0234, bridge: progression api enhancement: Goffi <goffi@goffi.org> parents: 1622 diff changeset	756 self.dbus_bridge.progressStarted(id, metadata, profile)
1522 7d7e57a84792 core: progression handling improvments: Goffi <goffi@goffi.org> parents: 1482 diff changeset	757
387 e66d300c5d42 frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix Goffi <goffi@goffi.org> parents: 371 diff changeset	758 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	759 self.dbus_bridge.subscribe(sub_type, entity_jid, profile)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	760
2086 4633cfcbcccb bridge (D-Bus): bad design fixes: Goffi <goffi@goffi.org> parents: 2085 diff changeset	761 def register_method(self, name, callback):
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	762 log.debug("registering DBus bridge method [%s]" % name)
2086 4633cfcbcccb bridge (D-Bus): bad design fixes: Goffi <goffi@goffi.org> parents: 2085 diff changeset	763 self.dbus_bridge.register_method(name, callback)
0 c4bc297b82f0 sat: goffi@necton2 parents: diff changeset	764
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	765 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	766 """Dynamically add a method to Dbus Bridge"""
2624 56f94936df1e code style reformatting using black Goffi <goffi@goffi.org> parents: 2595 diff changeset	767 # FIXME: doc parameter is kept only temporary, the time to remove it from calls
993 301b342c697a core: use of the new core.log module: Goffi <goffi@goffi.org> parents: 963 diff changeset	768 log.debug("Adding method [%s] to DBus bridge" % name)
3028 ab2696e34d29 Python 3 port: Goffi <goffi@goffi.org> parents: 2894 diff changeset	769 self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign, method, async_)
2086 4633cfcbcccb bridge (D-Bus): bad design fixes: Goffi <goffi@goffi.org> parents: 2085 diff changeset	770 self.register_method(name, method)
7 c14a3a7018a5 added dynamic exportation of Dbus bridge method (usefull for plugins) Goffi <goffi@goffi.org> parents: 1 diff changeset	771
298 15c8916317d0 dbus bridge: added doc parameter, unmanaged yet Goffi <goffi@goffi.org> parents: 284 diff changeset	772 def addSignal(self, name, int_suffix, signature, doc={}):
300 233e6fce0b49 DBus bridge: using new generated bridge Goffi <goffi@goffi.org> parents: 298 diff changeset	773 self.dbus_bridge.addSignal(name, int_suffix, signature, doc)
2628 779351da2c13 core, frontends: replaced org\.goffi namespaces by org.salutatoi + fixed generation: Goffi <goffi@goffi.org> parents: 2624 diff changeset	774 setattr(Bridge, name, getattr(self.dbus_bridge, name))

Mercurial > libervia-backend

annotate sat/bridge/dbus_bridge.py @ 3151:f9f05d8ccba6