From fa812a86a42ac19c738934d19ee824a64cd1be72 Mon Sep 17 00:00:00 2001 From: Jerome Leonard Date: Wed, 3 May 2017 12:36:45 +0200 Subject: [PATCH] #21 manage module path --- contrib/misp-modules-loader.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/contrib/misp-modules-loader.py b/contrib/misp-modules-loader.py index 9f2718467..e8afc72f8 100644 --- a/contrib/misp-modules-loader.py +++ b/contrib/misp-modules-loader.py @@ -8,16 +8,18 @@ import json +def mod(path): + dirname = os.path.dirname(path) + name = os.path.basename(path).split('.')[0] + return [dirname, name] -# modules_path = "./misp-modules/misp_modules/modules/expansion" -# sys.path.append(modules_path) def run(argv): try: opts, args = getopt.getopt(argv, 'hp:i:r:', ["help","path=", "info=","run="]) except getopt.GetoptError as err: print(__file__ + " --info ") - print(__file__ + " --path --run ") + print(__file__ + " --run ") print(str(err)) sys.exit(2) @@ -31,14 +33,11 @@ def run(argv): print(__file__ + " --run ") sys.exit() - elif opt in ('-p', '--path'): - path = arg - sys.path.append(path) - elif opt in ('-r', '--run'): - module = arg + path = arg if path: - m = __import__(module) + sys.path.append(mod(path)[0]) + m = __import__(mod(path)[1]) data = json.load(sys.stdin) print(json.dumps(m.handler(json.dumps(data))))