c2e 1.dev9__tar.gz → 1.dev11__tar.gz

{c2e-1.dev9/src/c2e.egg-info → c2e-1.dev11}/PKG-INFO

@@ -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.dev9 → c2e-1.dev11}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "c2e"
-version = "1-dev.9"
+version = "1-dev.11"
 description = "C2E: Console Command Engine"
 readme = "README.md"
 requires-python = ">=3.14"

c2e-1.dev11/src/c2e/dispatch.py

@@ -0,0 +1,127 @@
+from mapres import res
+from .dsl import COMMANDS, parse_line, help_command, help_child, help_arg
+
+
+def dispatch(cli, line):
+    p = parse_line(line)
+    if not p.sub:
+        return
+
+    cmd = COMMANDS.get(p.sub)
+    if not cmd:
+        return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown command {p.sub}<reset>'))
+
+    if 'help' in p.flags and not p.pos:
+        return cli.safePrint(help_command(cmd))
+
+    if cmd.children:
+        if not p.pos:
+            return cli.safePrint(res('<red>Error:<reset> <gray>Missing subcommand<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
+
+            g[n] = wrap()
+
+        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 {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>')
+        )
+
+    # bind params/flags into cmd.func globals
+    g = cmd.func.__globals__
+
+    for n, ps in cmd.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 cmd.flags.items():
+        present = n in p.flags
+
+        def wrap(f=fs.func, pr=present):
+            def w():
+                return pr
+            return w
+
+        g[n] = wrap()
+
+    f = cmd.func
+    if f.__code__.co_argcount >= 2:
+        return f(cli, arg)
+    return f(cli)

{c2e-1.dev9 → c2e-1.dev11/src/c2e.egg-info}/PKG-INFO

@@ -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.dev9/src/c2e/dispatch.py

@@ -1,72 +0,0 @@
-from mapres import res
-from .dsl import COMMANDS, parse_line, help_command, help_child, help_arg
-
-
-def dispatch(cli, line):
-    p = parse_line(line)
-    if not p.sub:
-        return
-
-    cmd = COMMANDS.get(p.sub)
-    if not cmd:
-        return cli.safePrint(res(f'<red>Error:<reset> <gray>Unknown command {p.sub}<reset>'))
-
-    if 'help' in p.flags and not p.pos:
-        return cli.safePrint(help_command(cmd))
-
-    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>'))
-
-    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>'))
-
-    g = child.func.__globals__
-    for n, ps in child.params.items():
-        if n in p.params:
-            try:
-                v = ps.type_(p.params[n])
-            except:
-                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
-
-        g[n] = wrap()
-
-    f = child.func
-    if f.__code__.co_argcount >= 2:
-        return f(cli, arg)
-    return f(cli)