refactor(cli): use wrapper callback instead of spreading return

loqusion · May 6, 2024 · b29e1da · b29e1da
1 parent b169d08
commit b29e1da
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 43 deletions.
diff --git a/src/hyprshade/cli/toggle.py b/src/hyprshade/cli/toggle.py
@@ -14,17 +14,13 @@
     ContextObject,
     MergedVarOption,
     ShaderParamType,
-    optional_param,
+    optional_argument,
     variables_option,
 )
 
 
 @click.command(short_help="Toggle screen shader")
-@click.argument(
-    "shader",
-    type=ShaderParamType(),
-    **optional_param("SHADER"),
-)
+@optional_argument("shader", type=ShaderParamType(), metavar="SHADER")
 @click.option(
     "--fallback",
     metavar="SHADER",

diff --git a/src/hyprshade/cli/utils.py b/src/hyprshade/cli/utils.py
@@ -41,22 +41,28 @@ def validate_optional_param(
     return None if len(value) == 0 else value[0]
 
 
-def optional_param(
-    metavar: str | None = None, *, callback: Callable | None = None
-) -> dict[str, Any]:
+def optional_argument(
+    *param_decls: str,
+    cls: type[click.Argument] | None = None,
+    metavar: str,
+    **attrs: Any,
+) -> Callable[[FC], FC]:
     def merged_callback(
         ctx: click.Context, param: click.Argument, value: tuple[T, ...]
     ):
-        value2 = validate_optional_param(ctx, param, value)
-        if callback is not None:
-            return callback(ctx, param, value2)
-        return value2
-
-    return {
-        "metavar": metavar,
-        "nargs": -1,
-        "callback": merged_callback,
-    }
+        optional_value = validate_optional_param(ctx, param, value)
+        if (callback := attrs.get("callback")) is not None:  # pragma: no cover
+            return callback(ctx, param, optional_value)
+        return optional_value
+
+    return click.argument(
+        *param_decls,
+        cls=cls,
+        metavar=metavar,
+        **attrs,
+        nargs=-1,
+        callback=merged_callback,
+    )
 
 
 class ShaderParamType(click.ParamType):

diff --git a/tests/cli/utils/test_click_utils.py b/tests/cli/utils/test_click_utils.py
@@ -16,27 +16,3 @@ def test_single(self):
     def test_rejects_multiple(self):
         with pytest.raises(click.UsageError):
             utils.validate_optional_param(None, None, ("foo", "bar"))
-
-
-class TestOptionalParam:
-    def test_basic(self):
-        o = utils.optional_param("FOO")
-        assert o["metavar"] == "FOO"
-        assert o["nargs"] == -1
-        assert o["callback"] is not None
-
-    def test_callback(self):
-        o = utils.optional_param("FOO")
-        callback = o["callback"]
-        assert callback(None, None, ("foo",)) == "foo"
-        assert callback(None, None, ()) is None
-
-    def test_given_callback(self):
-        o = utils.optional_param("FOO", callback=lambda *_: "bar")
-        callback = o["callback"]
-        assert callback(None, None, ("foo",)) == "bar"
-
-    def test_callback_synergy(self):
-        o = utils.optional_param("FOO", callback=lambda _1, _2, x: x + "bar")
-        callback = o["callback"]
-        assert callback(None, None, ("foo",)) == "foobar"