From b3cfc6bc4a3dc8ebbbb8090008808bb7a32db820 Mon Sep 17 00:00:00 2001 From: onyx-and-iris Date: Sun, 1 Mar 2026 01:04:54 +0000 Subject: [PATCH] remove StripSubcommandHelpFormatter, StripHelpFormatter now handles commands + command groups. --- pyproject.toml | 8 ++------ src/vban_cli/comp.py | 4 ++-- src/vban_cli/denoiser.py | 4 ++-- src/vban_cli/gate.py | 4 ++-- src/vban_cli/help.py | 12 ------------ 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1884c54..eb5c1f8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,11 +5,7 @@ description = "A command-line interface for Voicemeeter leveraging VBAN." readme = "README.md" license = { text = "LICENSE" } requires-python = ">=3.13" -dependencies = [ - "cyclopts>=4.6.0", - "loguru>=0.7.3", - "vban-cmd>=2.6.0", -] +dependencies = ["cyclopts>=4.6.0", "loguru>=0.7.3", "vban-cmd>=2.6.0"] classifiers = [ "Development Status :: 3 - Alpha", "Programming Language :: Python", @@ -28,4 +24,4 @@ vban-cli = "vban_cli.app:run" package = true [tool.uv.sources] -vban-cmd = { path = "../vban-cmd-python" } +vban-cmd = { path = "../vban-cmd-python", editable = true } diff --git a/src/vban_cli/comp.py b/src/vban_cli/comp.py index 75ecef0..bf012fb 100644 --- a/src/vban_cli/comp.py +++ b/src/vban_cli/comp.py @@ -3,9 +3,9 @@ from typing import Annotated from cyclopts import App, Argument, Parameter from .context import Context -from .help import StripSubcommandHelpFormatter +from .help import StripHelpFormatter -app = App(name='comp', help_formatter=StripSubcommandHelpFormatter()) +app = App(name='comp', help_formatter=StripHelpFormatter()) @app.meta.default diff --git a/src/vban_cli/denoiser.py b/src/vban_cli/denoiser.py index e7ea36d..cc290b0 100644 --- a/src/vban_cli/denoiser.py +++ b/src/vban_cli/denoiser.py @@ -3,9 +3,9 @@ from typing import Annotated from cyclopts import App, Argument, Parameter from .context import Context -from .help import StripSubcommandHelpFormatter +from .help import StripHelpFormatter -app = App(name='denoiser', help_formatter=StripSubcommandHelpFormatter()) +app = App(name='denoiser', help_formatter=StripHelpFormatter()) @app.meta.default diff --git a/src/vban_cli/gate.py b/src/vban_cli/gate.py index 2e96d5a..ede7238 100644 --- a/src/vban_cli/gate.py +++ b/src/vban_cli/gate.py @@ -3,9 +3,9 @@ from typing import Annotated from cyclopts import App, Argument, Parameter from .context import Context -from .help import StripSubcommandHelpFormatter +from .help import StripHelpFormatter -app = App(name='gate', help_formatter=StripSubcommandHelpFormatter()) +app = App(name='gate', help_formatter=StripHelpFormatter()) @app.meta.default diff --git a/src/vban_cli/help.py b/src/vban_cli/help.py index ebdf52f..51eaa58 100644 --- a/src/vban_cli/help.py +++ b/src/vban_cli/help.py @@ -61,18 +61,6 @@ class StripHelpFormatter(BaseHelpFormatter): console.print(f'[bold]Usage:[/bold] {modified_usage}') -class StripSubcommandHelpFormatter(BaseHelpFormatter): - """Help formatter for strip subcommands that injects after 'strip'.""" - - def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None: - """Render the usage line with index argument injected after 'strip'.""" - if usage: - modified_usage = re.sub( - r'(\S+\s+strip)\s+(\w+)\s+(COMMAND)', r'\1 \2 \3', str(usage) - ) - console.print(f'[bold]Usage:[/bold] {modified_usage}') - - class BusHelpFormatter(BaseHelpFormatter): """Help formatter for bus commands that injects after 'bus'."""