Solves #124 + discover-plugin argparse enhancement

No need of -d flag to specifiy directories

lodel/plugin/core_scripts.py

@@ -9,7 +9,8 @@ class DiscoverPlugin(lodel_script.LodelScript):
     
     @classmethod
     def argparser_config(cls, parser):
-        parser.add_argument('-d', '--directory',
+        #parser.add_argument('-d', '--directory',
+        parser.add_argument('PLUGIN_PATH',
             help="Directory to walk through looking for lodel2 plugins",
             nargs='+')
         parser.add_argument('-l', '--list-only', default=False,
@@ -20,11 +21,11 @@ without modifying existing cache")
     @classmethod
     def run(cls, args):
         from lodel.plugin.plugins import Plugin
-        if args.directory is None or len(args.directory) == 0:
+        if args.PLUGIN_PATH is None or len(args.PLUGIN_PATH) == 0:
             cls.help_exit("Specify a least one directory")
         no_cache = args.list_only
-        res = Plugin.discover(args.directory, no_cache)
-        print("Found plugins in : %s" % ', '.join(args.directory))
+        res = Plugin.discover(args.PLUGIN_PATH, no_cache)
+        print("Found plugins in : %s" % ', '.join(args.PLUGIN_PATH))
         for pname, pinfos in res['plugins'].items():
             print("\t- %s(%s) in %s" % (
                 pname, pinfos['version'], pinfos['path']))

lodel/plugin/scripts.py

@@ -142,19 +142,23 @@ def main_run():
     if len(sys.argv) == 1:
         default_parser.print_help()
         exit(1)
-    args = default_parser.parse_args()
-    if args.list_actions:
-        print("Available actions :")
-        for sname in sorted(__registered_scripts.keys()):
-            print("\t- %s" % __registered_scripts[sname])
-        exit(0)
     #preparing sys.argv (deleting action)
     action = sys.argv[1].lower()
-    del(sys.argv[1])
     if action not in __registered_scripts:
+        #Trying to parse argument with default parser
+        print("PASSAGE")
+        args = default_parser.parse_args()
+        if args.list_actions:
+            print("Available actions :")
+            for sname in sorted(__registered_scripts.keys()):
+                print("\t- %s" % __registered_scripts[sname])
+            exit(0)
+
         print("Unknow action '%s'\n" % action, file=sys.stderr)
         default_parser.print_help()
         exit(1)
+    #OK action is known, preparing argv to pass it to the action script
+    del(sys.argv[1])
     script = __registered_scripts[action]
     ret = script._run()
     ret = 0 if ret is None else ret

plugins/dummy/main.py

@@ -25,3 +25,10 @@ I'm a custom method on an instance of class %s" % self.__class__)
 def dummy_instance_method(self):
     print("Hello world !\
 I'm a custom method on class %s" % self.__class__)
+
+
+@LodelHook('lodel2_loader_main')
+def foofun(hname, caller, payload):
+    from lodel import dyncode
+    print("Hello world ! I read dyncode from lodel.dyncode : ",
+        dyncode.dynclasses)