From 1a4a0f56dc17e68e5743fa3a550b46992ec461e1 Mon Sep 17 00:00:00 2001 From: Jordan Wiens Date: Thu, 15 Jul 2021 03:39:25 -0400 Subject: support for repository plugins loaded from a subdirectory --- python/pluginmanager.py | 5 +++++ python/scriptingprovider.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'python') diff --git a/python/pluginmanager.py b/python/pluginmanager.py index 15b98b55..31e63620 100644 --- a/python/pluginmanager.py +++ b/python/pluginmanager.py @@ -49,6 +49,11 @@ class RepoPlugin(object): """Relative path from the base of the repository to the actual plugin""" return core.BNPluginGetPath(self.handle) + @property + def subdir(self): + """Optional sub-directory the plugin code lives in as a relative path from the plugin root""" + return core.BNPluginGetSubdir(self.handle) + @property def dependencies(self): """Dependencies required for installing this plugin""" diff --git a/python/scriptingprovider.py b/python/scriptingprovider.py index 51972ae9..473cd36f 100644 --- a/python/scriptingprovider.py +++ b/python/scriptingprovider.py @@ -831,7 +831,10 @@ class PythonScriptingProvider(ScriptingProvider): if plugin_full_path not in sys.path: sys.path.append(plugin_full_path) - __import__(module) + if plugin.subdir: + __import__(module + "." + plugin.subdir.replace("/", ".")) + else: + __import__(module) return True except KeyError: log.log_error(f"Failed to find python plugin: {repo_path}/{module}") -- cgit v1.3.1