From a6791d55acb1a4f084f3ee05ce97eed28552bdf9 Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Wed, 30 Jan 2019 13:51:09 +0000 Subject: [PATCH] Plugin routes are now fully qualified --- openflexure_microscope/plugins/loader.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/openflexure_microscope/plugins/loader.py b/openflexure_microscope/plugins/loader.py index 9f42f1e7..565d2089 100644 --- a/openflexure_microscope/plugins/loader.py +++ b/openflexure_microscope/plugins/loader.py @@ -63,12 +63,24 @@ def check_module(module_path): # If all checks pass, return True return True +def name_from_module(plugin_path): + path_array = plugin_path.split('.') + + print(path_array) + + # Truncate namespace of default plugins + if path_array[0:2] == ['openflexure_microscope', 'plugins']: + path_array = path_array[2:] + + return '/'.join(path_array) + + def load_plugin_module(plugin_path): # If the loader was found (i.e. plugin probably exists) if check_module(plugin_path): plugin_module = importlib.import_module(plugin_path) - plugin_name = plugin_path.split('.')[-1] + plugin_name = name_from_module(plugin_path) # If no loader was found, try finding a file from path else: