CuteEngineering/cutekit
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow short arguments to have values

Browse source
This commit is contained in:
Sleepy Monax 2024-02-21 16:00:17 +01:00
parent 51cdca006c
commit 99e6f9b38e
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cutekit/cli.py
View file

@ -292,6 +292,9 @@ class Field:
if self.longName is None: if self.longName is None:
self.longName = name self.longName = name
def isBool(self) -> bool:
return self._fieldType == bool
def isList(self) -> bool: def isList(self) -> bool:
return ( return (
isinstance(self._fieldType, GenericAlias) isinstance(self._fieldType, GenericAlias)
@ -520,9 +523,18 @@ class Schema:
break break
toks = parseArg(stack.pop(0)) toks = parseArg(stack.pop(0))
for tok in toks: while len(toks) > 0:
tok = toks.pop(0)
if isinstance(tok, ArgumentToken): if isinstance(tok, ArgumentToken):
arg = self._lookupArg(tok.key, tok.short) arg = self._lookupArg(tok.key, tok.short)
if tok.short and not arg.isBool():
if len(stack) == 0:
raise ValueError(
f"Expected value for argument '-{arg.shortName}'"
)
arg.putValue(res, parseValue(stack.pop(0)))
else:
arg.putValue(res, tok.value, tok.subkey) arg.putValue(res, tok.value, tok.subkey)
elif isinstance(tok, OperandToken): elif isinstance(tok, OperandToken):
self._setOperand(res, tok.value) self._setOperand(res, tok.value)

20
tests/test_cli.py
View file

@ -121,10 +121,13 @@ def extractParse(type: type[utils.T], args: list[str]) -> utils.T:
class IntArg: class IntArg:
value: int = cli.arg(None, "value") value: int = cli.arg("v", "value")
def test_cli_arg_int(): def test_cli_arg_int():
assert_equal(extractParse(IntArg, ["-v", "-1"]).value, -1)
assert_equal(extractParse(IntArg, ["-v", "0"]).value, 0)
assert_equal(extractParse(IntArg, ["-v", "1"]).value, 1)
assert_equal(extractParse(IntArg, ["--value=-1"]).value, -1) assert_equal(extractParse(IntArg, ["--value=-1"]).value, -1)
assert_equal(extractParse(IntArg, ["--value=0"]).value, 0) assert_equal(extractParse(IntArg, ["--value=0"]).value, 0)
@ -132,19 +135,24 @@ def test_cli_arg_int():
class StrArg: class StrArg:
value: str = cli.arg(None, "value") value: str = cli.arg("v", "value")
def test_cli_arg_str1(): def test_cli_arg_str1():
assert_equal(extractParse(StrArg, ["--value=foo"]).value, "foo") assert_equal(extractParse(StrArg, ["--value=foo"]).value, "foo")
assert_equal(extractParse(StrArg, ["-v", "foo"]).value, "foo")
assert_equal(extractParse(StrArg, ["--value='foo, bar'"]).value, "foo, bar") assert_equal(extractParse(StrArg, ["--value='foo, bar'"]).value, "foo, bar")
assert_equal(extractParse(StrArg, ["-v", "'foo, bar'"]).value, "foo, bar")
class BoolArg: class BoolArg:
value: bool = cli.arg(None, "value") value: bool = cli.arg("v", "value")
def test_cli_arg_bool(): def test_cli_arg_bool():
assert_is(extractParse(BoolArg, []).value, False)
assert_is(extractParse(BoolArg, ["-v"]).value, True)
assert_is(extractParse(BoolArg, ["--value"]).value, True) assert_is(extractParse(BoolArg, ["--value"]).value, True)
assert_is(extractParse(BoolArg, ["--value=true"]).value, True) assert_is(extractParse(BoolArg, ["--value=true"]).value, True)
@ -165,17 +173,19 @@ def test_cli_arg_bool():
class IntListArg: class IntListArg:
value: list[int] = cli.arg(None, "value") value: list[int] = cli.arg("v", "value")
def test_cli_arg_list_int1(): def test_cli_arg_list_int1():
assert_equal(extractParse(IntListArg, []).value, []) assert_equal(extractParse(IntListArg, []).value, [])
assert_equal(extractParse(IntListArg, ["--value=1", "--value=2"]).value, [1, 2]) assert_equal(extractParse(IntListArg, ["--value=1", "--value=2"]).value, [1, 2])
assert_equal(extractParse(IntListArg, ["-v", "1", "-v", "2"]).value, [1, 2])
assert_equal(extractParse(IntListArg, ["--value=1,2"]).value, [1, 2]) assert_equal(extractParse(IntListArg, ["--value=1,2"]).value, [1, 2])
assert_equal(extractParse(IntListArg, ["-v", "1,2"]).value, [1, 2])
class StrListArg: class StrListArg:
value: list[str] = cli.arg(None, "value") value: list[str] = cli.arg("v", "value")
def test_cli_arg_list_str(): def test_cli_arg_list_str():