Mercurial > libervia-backend
diff src/core/sat_main.py @ 2105:c96fe007ca41
core(constants): added a constant for profile extension (PLUGIN_EXT):
this constant may be modified if needed, which is the case on Android (it's modified by Cagou service's main.py), so platform detection is not needed anymore in sat_main.py.
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Sun, 25 Dec 2016 16:43:56 +0100 |
| parents | fbeeba721954 |
| children | 9c861d07b5b6 |
line wrap: on
line diff
--- a/src/core/sat_main.py Sat Dec 24 14:08:21 2016 +0100 +++ b/src/core/sat_main.py Sun Dec 25 16:43:56 2016 +0100 @@ -35,6 +35,7 @@ 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 @@ 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: