c2e 1.dev9__py3-none-any.whl → 1.dev11__py3-none-any.whl

c2e/dispatch.py

@@ -17,34 +17,89 @@ def dispatch(cli, line):
     if cmd.children:
         if not p.pos:
             return cli.safePrint(res('<red>Error:<reset> <gray>Missing subcommand<reset>'))
-    else:
-        return cmd.func(cli)
 
-    cname = p.pos[0]
-    child = cmd.children.get(cname)
-    if not child:
-        return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown subcommand {cname}<reset>'))
+        cname = p.pos[0]
+        child = cmd.children.get(cname)
+        if not child:
+            return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown subcommand {cname}<reset>'))
+
+        # child help
+        if 'help' in p.flags and len(p.pos) == 1:
+            return cli.safePrint(help_child(child))
+
+        if 'help' in p.flags and len(p.pos) >= 2:
+            an = p.pos[1]
+            meta = child.args_meta.get(an)
+            if not meta:
+                return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown argument {an}<reset>'))
+            return cli.safePrint(help_arg(child, meta))
+
+        arg = p.pos[1] if len(p.pos) > 1 else None
+        if child.requires_arg and arg is None:
+            return cli.safePrint(
+                res(f'<red>Error:<reset> <gray>Subcommand {child.name} requires an argument<reset>')
+            )
+
+        # bind params/flags into child.func globals
+        g = child.func.__globals__
+
+        for n, ps in child.params.items():
+            if n in p.params:
+                try:
+                    v = ps.type_(p.params[n])
+                except Exception:
+                    v = ps.default
+            else:
+                v = ps.default
+
+            def wrap(f=ps.func, val=v):
+                def w():
+                    return f(val)
+                return w
+
+            g[n] = wrap()
+
+        for n, fs in child.flags.items():
+            present = n in p.flags
+
+            def wrap(f=fs.func, pr=present):
+                def w():
+                    return pr
+                return w
 
-    if 'help' in p.flags and len(p.pos) == 1:
-        return cli.safePrint(help_child(child))
+            g[n] = wrap()
 
-    if 'help' in p.flags and len(p.pos) >= 2:
-        an = p.pos[1]
-        meta = child.args_meta.get(an)
+        f = child.func
+        if f.__code__.co_argcount >= 2:
+            return f(cli, arg)
+        return f(cli)
+
+    # This is the path your `stats` command should use.
+    # p.pos[0] is the "arg" (e.g. ram/cpu/uptime/...)
+    arg = p.pos[0] if p.pos else None
+
+    # arg-level help for top-level commands
+    if 'help' in p.flags and arg is not None:
+        meta = cmd.args_meta.get(arg)
         if not meta:
-            return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown argument {an}<reset>'))
-        return cli.safePrint(help_arg(child, meta))
+            return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown argument {arg}<reset>'))
+        # reuse help_arg, pretending cmd is a "child" of a synthetic parent
+        # or write a dedicated help if you want; for now we just show command help
+        return cli.safePrint(help_command(cmd))
+
+    if cmd.requires_arg and arg is None:
+        return cli.safePrint(
+            res(f'<red>Error:<reset> <gray>Command {cmd.name} requires an argument<reset>')
+        )
 
-    arg = p.pos[1] if len(p.pos) > 1 else None
-    if child.requires_arg and arg is None:
-        return cli.safePrint(res(f'<red>Error:<reset> <gray>Subcommand {child.name} requires an argument<reset>'))
+    # bind params/flags into cmd.func globals
+    g = cmd.func.__globals__
 
-    g = child.func.__globals__
-    for n, ps in child.params.items():
+    for n, ps in cmd.params.items():
         if n in p.params:
             try:
                 v = ps.type_(p.params[n])
-            except:
+            except Exception:
                 v = ps.default
         else:
             v = ps.default
@@ -56,7 +111,7 @@ def dispatch(cli, line):
 
         g[n] = wrap()
 
-    for n, fs in child.flags.items():
+    for n, fs in cmd.flags.items():
         present = n in p.flags
 
         def wrap(f=fs.func, pr=present):
@@ -66,7 +121,7 @@ def dispatch(cli, line):
 
         g[n] = wrap()
 
-    f = child.func
+    f = cmd.func
     if f.__code__.co_argcount >= 2:
         return f(cli, arg)
     return f(cli)

{c2e-1.dev9.dist-info → c2e-1.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: c2e
-Version: 1.dev9
+Version: 1.dev11
 Summary: C2E: Console Command Engine
 Author: iFamished
 License: GPL-3.0

c2e-1.dev11.dist-info/RECORD

@@ -0,0 +1,10 @@
+c2e/__init__.py,sha256=RUBqAulgYVahv2kdNx3OxZk2v4khVls31I16L-hO5cU,143
+c2e/colors.py,sha256=rPxMoWSYCxKmhhi1j7v1n7_bmayeeEC7MRmF7f8VoWU,109
+c2e/core.py,sha256=47B4VIofri2AonmB7V7SnPd6Ywvo_lus965wcw-0Vgg,1520
+c2e/dispatch.py,sha256=WX4WWxr2MOY57UDVctv52dFJfQMKl2Tk9NqpZ6Mm9z4,3767
+c2e/dsl.py,sha256=Z5vzMHnIF_2yJFu8jI81i-TFilncmJQOFGLiTLuzF7w,11769
+c2e-1.dev11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+c2e-1.dev11.dist-info/METADATA,sha256=ZPn7R6ptBleaB6gjmujk8Tm1Kz-V1Rxg2N3LCBe3vLg,2252
+c2e-1.dev11.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+c2e-1.dev11.dist-info/top_level.txt,sha256=6sdY2hp5dHTmmPH0RW1YdaTgxo3VM_O9qIq6zatMhsg,4
+c2e-1.dev11.dist-info/RECORD,,

c2e-1.dev9.dist-info/RECORD

@@ -1,10 +0,0 @@
-c2e/__init__.py,sha256=RUBqAulgYVahv2kdNx3OxZk2v4khVls31I16L-hO5cU,143
-c2e/colors.py,sha256=rPxMoWSYCxKmhhi1j7v1n7_bmayeeEC7MRmF7f8VoWU,109
-c2e/core.py,sha256=47B4VIofri2AonmB7V7SnPd6Ywvo_lus965wcw-0Vgg,1520
-c2e/dispatch.py,sha256=p725Hzsy__rhaaDUqO4fJXC-8uGIgyDQ87VoSYToX-g,2022
-c2e/dsl.py,sha256=Z5vzMHnIF_2yJFu8jI81i-TFilncmJQOFGLiTLuzF7w,11769
-c2e-1.dev9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-c2e-1.dev9.dist-info/METADATA,sha256=sG__l-g-XTyGgLSTR2umImjUgguvx8R4GCPjFlZ0loQ,2251
-c2e-1.dev9.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-c2e-1.dev9.dist-info/top_level.txt,sha256=6sdY2hp5dHTmmPH0RW1YdaTgxo3VM_O9qIq6zatMhsg,4
-c2e-1.dev9.dist-info/RECORD,,