diff --git a/src/core/constants.py b/src/core/constants.py index fd4928df..2c57da4d 100644 --- a/src/core/constants.py +++ b/src/core/constants.py @@ -35,11 +35,14 @@ class Const(object): APP_URL = u'http://salut-a-toi.org' - # Main config ## + ## Runtime ## + PLUGIN_EXT = "py" + + ## Main config ## DEFAULT_BRIDGE = 'dbus' - # Protocol + ## Protocol ## XMPP_C2S_PORT = 5222 XMPP_KEEP_ALIFE = 180 XMPP_MAX_RETRIES = 2 diff --git a/src/core/sat_main.py b/src/core/sat_main.py index 24c2bcfb..54a95ec9 100644 --- a/src/core/sat_main.py +++ b/src/core/sat_main.py @@ -35,6 +35,7 @@ from sat.tools import trigger from sat.tools import utils from sat.tools.common import dynamic_import from sat.stdui import ui_contact_list, ui_profile_manager +import sat.plugins from glob import glob from uuid import uuid4 import sys @@ -154,15 +155,8 @@ class SAT(service.Service): def _import_plugins(self): """Import all plugins found in plugins directory""" - if sys.platform == "android": - # FIXME: android hack to load plugins from proper path - # TODO: move this in a separate module and/or use sat.conf to specify path - plugins_path = "/data/data/org.goffi.cagou.cagou/files/sat/plugins" - plugin_glob = "plugin*.pyo" - else: - import sat.plugins - plugins_path = os.path.dirname(sat.plugins.__file__) - plugin_glob = "plugin*.py" + plugins_path = os.path.dirname(sat.plugins.__file__) + plugin_glob = "plugin*." + C.PLUGIN_EXT plug_lst = [os.path.splitext(plugin)[0] for plugin in map(os.path.basename, glob(os.path.join(plugins_path, plugin_glob)))] plugins_to_import = {} # plugins we still have to import for plug in plug_lst: