mirror of
https://github.com/onyx-and-iris/vban-cli.git
synced 2026-04-16 02:23:30 +00:00
Compare commits
33 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 27290e1a0e | |||
| 6188da4f51 | |||
| 230e537414 | |||
| e6ebf86c86 | |||
| 1a0fb979e0 | |||
| 080e26f75f | |||
| f6d82c5064 | |||
| 627ada3b09 | |||
| f389eb53b8 | |||
| 341c81fde1 | |||
| e062da51ed | |||
| c82a021708 | |||
| 61a3bc38a8 | |||
| 8991737011 | |||
| 84d716b2ad | |||
| b58bb3dde7 | |||
| d414844f8f | |||
| f605178da6 | |||
| c535ae5571 | |||
| 7b5d2150c7 | |||
| 28ec67839a | |||
| dd0d150202 | |||
| 78952aa3ff | |||
| c4d67527f5 | |||
| b3cfc6bc4a | |||
| c642bbc1f2 | |||
| 61a37bcd0f | |||
| b62ee185c3 | |||
| c7365bfe4e | |||
| c660778698 | |||
| 5460965945 | |||
| d03049e713 | |||
| 1dd518095a |
10
.gitignore
vendored
10
.gitignore
vendored
@@ -1,13 +1,3 @@
|
||||
# Python-generated files
|
||||
__pycache__/
|
||||
*.py[oc]
|
||||
build/
|
||||
dist/
|
||||
wheels/
|
||||
*.egg-info
|
||||
|
||||
# Virtual environments
|
||||
.venv
|
||||
# Generated by ignr: github.com/onyx-and-iris/ignr
|
||||
|
||||
## Python ##
|
||||
|
||||
142
README.md
142
README.md
@@ -5,6 +5,8 @@
|
||||
|
||||
---
|
||||
|
||||
This CLI is still in an early stage of development with many more things that could be implemented. However, the commands that are implemented should be working without issues.
|
||||
|
||||
## Install
|
||||
|
||||
#### With uv
|
||||
@@ -47,40 +49,146 @@ export VBAN_CLI_STREAMNAME=Command1
|
||||
|
||||
## Use
|
||||
|
||||
```console
|
||||
Usage: vban-cli COMMAND
|
||||
### Strip Command
|
||||
|
||||
╭─ Commands ───────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│ bus Control the bus parameters. │
|
||||
│ strip Control the strip parameters. │
|
||||
│ --help (-h) Display this message and exit. │
|
||||
│ --version Display application version. │
|
||||
╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
|
||||
╭─ Parameters ─────────────────────────────────────────────────────────────────────────────────────╮
|
||||
│ --kind Kind of Voicemeeter [env var: VBAN_CLI_KIND] [default: potato] │
|
||||
│ --host VBAN host [env var: VBAN_CLI_HOST] [default: localhost] │
|
||||
│ --port VBAN port [env var: VBAN_CLI_PORT] [default: 6980] │
|
||||
│ --streamname VBAN stream name [env var: VBAN_CLI_STREAMNAME] [default: Command1] │
|
||||
╰──────────────────────────────────────────────────────────────────────────────────────────────────╯
|
||||
Usage: vban-cli strip \<index> COMMAND [ARGS]
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli strip 0 mute true
|
||||
|
||||
vban-cli strip 1 A1 true
|
||||
|
||||
vban-cli strip 2 gain -18.7
|
||||
```
|
||||
|
||||
For every command and subcommand there exists a `--help` flag for further usage information.
|
||||
see `vban-cli strip --help` for more info.
|
||||
|
||||
#### Strip EQ
|
||||
|
||||
Usage: vban-cli strip \<index> eq COMMAND [OPTIONS]
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli strip 0 eq on true
|
||||
```
|
||||
|
||||
see `vban-cli strip eq --help` for more info.
|
||||
|
||||
#### Strip EQ Cell Command
|
||||
|
||||
Usage: vban-cli strip \<index> eq cell \<band> COMMAND [ARGS]
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli strip 0 eq cell 0 on false
|
||||
|
||||
vban-cli strip 3 eq cell 2 freq 1500
|
||||
|
||||
vban-cli strip 4 eq cell 5 type 5
|
||||
```
|
||||
|
||||
see `vban-cli strip eq cell --help` for more info.
|
||||
|
||||
#### Strip Gainlayer Command
|
||||
|
||||
Usage: vban-cli strip \<index> gainlayer \<gainlayer_index> COMMAND [OPTIONS] [ARGS]
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli strip 0 gainlayer 0 level
|
||||
|
||||
vban-cli strip 3 gainlayer 2 level -13.5
|
||||
```
|
||||
|
||||
see `vban-cli strip gainlayer --help` for more info.
|
||||
|
||||
### Bus Command
|
||||
|
||||
Usage: vban-cli bus \<index> COMMAND [ARGS]
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli bus 0 mode tvmix
|
||||
|
||||
vban-cli bus 1 mute true
|
||||
```
|
||||
|
||||
see `vban-cli bus --help` for more info.
|
||||
|
||||
### Command Command
|
||||
|
||||
Usage: vban-cli command COMMAND
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli command show
|
||||
|
||||
vban-cli command restart
|
||||
```
|
||||
|
||||
see `vban-cli command --help` for more info.
|
||||
|
||||
### Recorder Command
|
||||
|
||||
Usage: vban-cli recorder COMMAND
|
||||
|
||||
examples:
|
||||
|
||||
```console
|
||||
vban-cli recorder play
|
||||
|
||||
vban-cli recorder rew
|
||||
|
||||
vban-cli recorder replay
|
||||
```
|
||||
|
||||
see `vban-cli recorder --help` for more info.
|
||||
|
||||
### Sendtext Command
|
||||
|
||||
Usage: vban-cli sendtext TEXT
|
||||
|
||||
examples:
|
||||
|
||||
*To Voicemeeter*
|
||||
|
||||
```console
|
||||
vban-cli sendtext 'Strip[0].Mute=1;Bus[0].Mono=2'
|
||||
```
|
||||
|
||||
*To Matrix*
|
||||
|
||||
```console
|
||||
vban-cli sendtext 'Command.Version = ?'
|
||||
|
||||
vban-cli sendtext 'Point(ASIO128.IN[1..4],ASIO128.OUT[1]).dBGain = -3.0'
|
||||
```
|
||||
|
||||
see `vban-cli sendtext --help` for more info.
|
||||
|
||||
---
|
||||
|
||||
## Implementation Notes
|
||||
|
||||
1. The VBAN TEXT subprotocol defines two packet structures [ident:0][ident-0] and [ident:1][ident-1]. Neither of them contain the data for Bus EQ parameters.
|
||||
2. Packet structure with [ident:1][ident-1] is emitted by the VBAN server only on pdirty events. This means we do not receive the initial state of those parameters on initial subscription. Therefore any commands which are intended to fetch the value of parameters defined in packet [ident:1][ident-1] will not work in this CLI.
|
||||
2. Packet structure with [ident:1][ident-1] is emitted by the VBAN server only on pdirty events. This means we do not receive the current state of those parameters on initial subscription. Therefore any commands which are intended to fetch the value of parameters defined in packet [ident:1][ident-1] will not work in this CLI.
|
||||
3. Packet structure with [ident:1][ident-1] defines parameteric EQ data only for the [first channel][ident-1-peq].
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Further Notes
|
||||
|
||||
I've made the effort to set up the basic skeletal structure of the CLI as well as demonstrate how to combine subcommand groups with subcommand groups so more can be implemented, it just needs doing. There may be restrictions on some things however, for example, retrieving values is only possible for parameters [defined in the protocol](https://github.com/onyx-and-iris/Voicemeeter-SDK/blob/3be2c1c36563afbd6df3da8436406c77d2cc1f10/VoicemeeterRemote.h#L787). Setting parameters can be done for anything possible by a string request.
|
||||
|
||||
Shell completion scripts are available (for zsh, bash and fish) but they haven't been thoroughly tested.
|
||||
|
||||
If there's something missing that you would like to see added the best bet is to submit a PR. You may raise an issue and if it's quick and simple to do I may (or may not) do it.
|
||||
|
||||
---
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
[project]
|
||||
name = "vban-cli"
|
||||
version = "0.3.0"
|
||||
version = "0.9.0"
|
||||
description = "A command-line interface for Voicemeeter leveraging VBAN."
|
||||
readme = "README.md"
|
||||
license = { text = "LICENSE" }
|
||||
requires-python = ">=3.13"
|
||||
dependencies = ["cyclopts>=4.6.0", "vban-cmd>=2.6.0"]
|
||||
dependencies = ["cyclopts>=4.6.0", "loguru>=0.7.3", "vban-cmd>=2.8.1"]
|
||||
classifiers = [
|
||||
"Development Status :: 3 - Alpha",
|
||||
"Programming Language :: Python",
|
||||
@@ -24,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 }
|
||||
|
||||
@@ -2,10 +2,10 @@ from dataclasses import dataclass
|
||||
from typing import Annotated
|
||||
|
||||
import vban_cmd
|
||||
from cyclopts import App, Parameter, config
|
||||
from cyclopts import App, Argument, Parameter, config
|
||||
|
||||
from . import __version__ as version
|
||||
from . import bus, console, strip
|
||||
from . import bus, command, console, recorder, strip
|
||||
from .context import Context
|
||||
|
||||
app = App(
|
||||
@@ -16,6 +16,9 @@ app = App(
|
||||
)
|
||||
app.command(strip.app.meta, name='strip')
|
||||
app.command(bus.app.meta, name='bus')
|
||||
app.command(command.app, name='command')
|
||||
app.command(recorder.app, name='recorder')
|
||||
app.register_install_completion_command()
|
||||
|
||||
|
||||
@Parameter(name='*')
|
||||
@@ -32,17 +35,34 @@ def launcher(
|
||||
*tokens: Annotated[str, Parameter(show=False, allow_leading_hyphen=True)],
|
||||
vban_config: Annotated[VBANConfig, Parameter()] = VBANConfig(),
|
||||
):
|
||||
command, bound, _ = app.parse_args(tokens)
|
||||
if tokens[0] == '--install-completion':
|
||||
return command(*bound.args, **bound.kwargs)
|
||||
|
||||
disable_rt_listeners = False
|
||||
if command.__name__ == 'sendtext':
|
||||
disable_rt_listeners = True
|
||||
|
||||
with vban_cmd.api(
|
||||
vban_config.kind,
|
||||
ip=vban_config.host,
|
||||
port=vban_config.port,
|
||||
streamname=vban_config.streamname,
|
||||
disable_rt_listeners=disable_rt_listeners,
|
||||
) as client:
|
||||
additional_kwargs = {}
|
||||
command, bound, _ = app.parse_args(tokens)
|
||||
additional_kwargs['ctx'] = Context(client=client)
|
||||
return command(*bound.args, **bound.kwargs, ctx=Context(client=client))
|
||||
|
||||
return command(*bound.args, **bound.kwargs, **additional_kwargs)
|
||||
|
||||
@app.command(name='sendtext')
|
||||
def sendtext(
|
||||
text: Annotated[str, Argument()],
|
||||
/,
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Send a text command to the current Voicemeeter/Matrix instance."""
|
||||
if resp := ctx.client.sendtext(text):
|
||||
console.out.print(resp)
|
||||
|
||||
|
||||
def run():
|
||||
|
||||
@@ -4,9 +4,9 @@ from cyclopts import App, Argument, Parameter
|
||||
|
||||
from . import console
|
||||
from .context import Context
|
||||
from .help import CustomHelpFormatter
|
||||
from .help import BusHelpFormatter
|
||||
|
||||
app = App(name='bus', help_formatter=CustomHelpFormatter())
|
||||
app = App(name='bus', help_formatter=BusHelpFormatter())
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 1.
|
||||
# app.command(eq.app.meta, name='eq')
|
||||
|
||||
@@ -20,6 +20,8 @@ def launcher(
|
||||
"""Control the bus parameters."""
|
||||
additional_kwargs = {}
|
||||
command, bound, _ = app.parse_args(tokens)
|
||||
if tokens[0] == 'eq':
|
||||
additional_kwargs['eq_kind'] = app.name[0]
|
||||
if index is not None:
|
||||
additional_kwargs['index'] = index
|
||||
if ctx is not None:
|
||||
@@ -30,7 +32,9 @@ def launcher(
|
||||
|
||||
@app.command(name='mono')
|
||||
def mono(
|
||||
new_value: Annotated[Optional[bool], Argument()] = None,
|
||||
new_value: Annotated[
|
||||
Optional[Literal['off', 'mono', 'stereoreverse']], Argument()
|
||||
] = None,
|
||||
*,
|
||||
index: Annotated[int, Parameter(show=False)] = None,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
@@ -39,13 +43,13 @@ def mono(
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_value : bool, optional
|
||||
new_value : {'off', 'mono', 'stereoreverse'}, optional
|
||||
If provided, sets the mono state to this value. If not provided, the current mono state is printed.
|
||||
"""
|
||||
if new_value is None:
|
||||
console.out.print(ctx.client.bus[index].mono)
|
||||
console.out.print(['off', 'mono', 'stereoreverse'][ctx.client.bus[index].mono])
|
||||
return
|
||||
ctx.client.bus[index].mono = new_value
|
||||
ctx.client.bus[index].mono = ['off', 'mono', 'stereoreverse'].index(new_value)
|
||||
|
||||
|
||||
@app.command(name='mute')
|
||||
|
||||
49
src/vban_cli/command.py
Normal file
49
src/vban_cli/command.py
Normal file
@@ -0,0 +1,49 @@
|
||||
from typing import Annotated
|
||||
|
||||
from cyclopts import App, Parameter
|
||||
|
||||
from . import console
|
||||
from .context import Context
|
||||
from .help import BaseHelpFormatter
|
||||
|
||||
app = App(name='command', help_formatter=BaseHelpFormatter())
|
||||
|
||||
|
||||
@app.command(name='show')
|
||||
def show(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Bring the Voicemeeter GUI to the foreground."""
|
||||
ctx.client.command.show()
|
||||
console.out.print('Voicemeeter GUI should now be in the foreground.')
|
||||
|
||||
|
||||
@app.command(name='hide')
|
||||
def hide(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Send the Voicemeeter GUI to the background."""
|
||||
ctx.client.command.hide()
|
||||
console.out.print('Voicemeeter GUI should now be in the background.')
|
||||
|
||||
|
||||
@app.command(name='shutdown')
|
||||
def shutdown(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Shut down Voicemeeter."""
|
||||
ctx.client.command.shutdown()
|
||||
console.out.print('Voicemeeter should now be shut down.')
|
||||
|
||||
|
||||
@app.command(name='restart')
|
||||
def restart(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Restart the Voicemeeter engine."""
|
||||
ctx.client.command.restart()
|
||||
console.out.print('Voicemeeter engine should now be restarting.')
|
||||
@@ -3,9 +3,9 @@ from typing import Annotated
|
||||
from cyclopts import App, Argument, Parameter
|
||||
|
||||
from .context import Context
|
||||
from .help import CustomHelpFormatter
|
||||
from .help import StripHelpFormatter
|
||||
|
||||
app = App(name='comp', help_formatter=CustomHelpFormatter())
|
||||
app = App(name='comp', help_formatter=StripHelpFormatter())
|
||||
|
||||
|
||||
@app.meta.default
|
||||
|
||||
@@ -3,9 +3,9 @@ from typing import Annotated
|
||||
from cyclopts import App, Argument, Parameter
|
||||
|
||||
from .context import Context
|
||||
from .help import CustomHelpFormatter
|
||||
from .help import StripHelpFormatter
|
||||
|
||||
app = App(name='denoiser', help_formatter=CustomHelpFormatter())
|
||||
app = App(name='denoiser', help_formatter=StripHelpFormatter())
|
||||
|
||||
|
||||
@app.meta.default
|
||||
|
||||
@@ -3,30 +3,32 @@ from typing import Annotated
|
||||
from cyclopts import App, Argument, Parameter
|
||||
|
||||
from .context import Context
|
||||
from .help import CustomHelpFormatter
|
||||
from .help import CellHelpFormatter, EqHelpFormatter
|
||||
|
||||
app = App(name='eq', help_formatter=CustomHelpFormatter())
|
||||
cell_app = App(name='cell', help_formatter=CellHelpFormatter())
|
||||
|
||||
app = App(name='eq', help_formatter=EqHelpFormatter())
|
||||
app.command(cell_app.meta, name='cell')
|
||||
|
||||
|
||||
@app.meta.default
|
||||
def launcher(
|
||||
band: Annotated[int, Argument()] = None,
|
||||
*tokens: Annotated[str, Parameter(show=False, allow_leading_hyphen=True)],
|
||||
eq_kind: Annotated[str, Parameter(show=False)] = None,
|
||||
index: Annotated[int, Argument()] = None,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Control the EQ parameters.
|
||||
|
||||
Only channel 0 is supported, see https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 3.
|
||||
"""
|
||||
"""Control the EQ parameters."""
|
||||
additional_kwargs = {}
|
||||
command, bound, _ = app.parse_args(tokens)
|
||||
if index is not None:
|
||||
additional_kwargs['index'] = index
|
||||
if band is not None:
|
||||
additional_kwargs['band'] = band
|
||||
if ctx is not None:
|
||||
additional_kwargs['ctx'] = ctx
|
||||
match eq_kind:
|
||||
case 'strip':
|
||||
target = ctx.client.strip[index].eq
|
||||
case 'bus':
|
||||
target = ctx.client.bus[index].eq
|
||||
case _:
|
||||
raise ValueError(f'Invalid eq_kind: {eq_kind}')
|
||||
additional_kwargs['target'] = target
|
||||
|
||||
return command(*bound.args, **bound.kwargs, **additional_kwargs)
|
||||
|
||||
@@ -35,9 +37,7 @@ def launcher(
|
||||
def on(
|
||||
new_state: Annotated[bool, Argument()] = None,
|
||||
*,
|
||||
index: Annotated[int, Parameter(show=False)] = None,
|
||||
band: Annotated[int, Parameter(show=False)] = None,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the on state of the specified EQ band.
|
||||
|
||||
@@ -48,6 +48,123 @@ def on(
|
||||
"""
|
||||
if new_state is None:
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 2.
|
||||
# console.out.print(ctx.client.strip[index].eq.channel[0].cell[band].on)
|
||||
# console.out.print(target.on)
|
||||
return
|
||||
ctx.client.strip[index].eq.channel[0].cell[band].on = new_state
|
||||
target.on = new_state
|
||||
|
||||
|
||||
@cell_app.meta.default
|
||||
def cell_launcher(
|
||||
band: Annotated[int, Argument()] = None,
|
||||
*tokens: Annotated[str, Parameter(show=False, allow_leading_hyphen=True)],
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Control the EQ Cell parameters.
|
||||
|
||||
Only channel 0 is supported, see https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 3.
|
||||
"""
|
||||
additional_kwargs = {}
|
||||
command, bound, _ = cell_app.parse_args(tokens)
|
||||
additional_kwargs['target'] = target.channel[0].cell[band]
|
||||
|
||||
return command(*bound.args, **bound.kwargs, **additional_kwargs)
|
||||
|
||||
|
||||
@cell_app.command(name='on')
|
||||
def cell_on(
|
||||
new_state: Annotated[bool, Argument()] = None,
|
||||
*,
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the on state of the specified EQ cell.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_state : bool
|
||||
If provided, sets the on state to this value. If not provided, the current on state is printed.
|
||||
"""
|
||||
if new_state is None:
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 2.
|
||||
# console.out.print(target.on)
|
||||
return
|
||||
target.on = new_state
|
||||
|
||||
|
||||
@cell_app.command(name='freq')
|
||||
def cell_freq(
|
||||
new_freq: Annotated[float, Argument()] = None,
|
||||
*,
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the frequency of the specified EQ cell.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_freq : float
|
||||
If provided, sets the frequency to this value. If not provided, the current frequency is printed.
|
||||
"""
|
||||
if new_freq is None:
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 2.
|
||||
# console.out.print(target.f)
|
||||
return
|
||||
target.f = new_freq
|
||||
|
||||
|
||||
@cell_app.command(name='gain')
|
||||
def cell_gain(
|
||||
new_gain: Annotated[float, Argument()] = None,
|
||||
*,
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the gain of the specified EQ cell.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_gain : float
|
||||
If provided, sets the gain to this value. If not provided, the current gain is printed.
|
||||
"""
|
||||
if new_gain is None:
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 2.
|
||||
# console.out.print(target.gain)
|
||||
return
|
||||
target.gain = new_gain
|
||||
|
||||
|
||||
@cell_app.command(name='quality')
|
||||
def cell_q(
|
||||
new_q: Annotated[float, Argument()] = None,
|
||||
*,
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the Q of the specified EQ cell.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_q : float
|
||||
If provided, sets the Q to this value. If not provided, the current Q is printed.
|
||||
"""
|
||||
if new_q is None:
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 2.
|
||||
# console.out.print(target.q)
|
||||
return
|
||||
target.q = new_q
|
||||
|
||||
|
||||
@cell_app.command(name='type')
|
||||
def cell_type(
|
||||
new_type: Annotated[int, Argument()] = None,
|
||||
*,
|
||||
target: Annotated[object, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the type of the specified EQ cell.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_type : int
|
||||
If provided, sets the type to this value. If not provided, the current type is printed.
|
||||
"""
|
||||
if new_type is None:
|
||||
# See https://github.com/onyx-and-iris/vban-cli?tab=readme-ov-file#implementation-notes - 2.
|
||||
# console.out.print(target.type)
|
||||
return
|
||||
target.type = new_type
|
||||
|
||||
51
src/vban_cli/gainlayer.py
Normal file
51
src/vban_cli/gainlayer.py
Normal file
@@ -0,0 +1,51 @@
|
||||
from typing import Annotated
|
||||
|
||||
from cyclopts import App, Argument, Parameter
|
||||
|
||||
from . import console
|
||||
from .context import Context
|
||||
from .help import GainlayerHelpFormatter
|
||||
|
||||
app = App(name='gainlayer', help_formatter=GainlayerHelpFormatter())
|
||||
|
||||
|
||||
@app.meta.default
|
||||
def launcher(
|
||||
gainlayer_index: Annotated[int, Argument()] = None,
|
||||
*tokens: Annotated[str, Parameter(show=False, allow_leading_hyphen=True)],
|
||||
index: Annotated[int, Argument()] = None,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Control the gainlayers."""
|
||||
additional_kwargs = {}
|
||||
command, bound, _ = app.parse_args(tokens)
|
||||
if index is not None and gainlayer_index is not None:
|
||||
additional_kwargs['strip_index'] = index
|
||||
additional_kwargs['gainlayer_index'] = gainlayer_index
|
||||
else:
|
||||
raise ValueError('Both gainlayer_index and index must be provided.')
|
||||
if ctx is not None:
|
||||
additional_kwargs['ctx'] = ctx
|
||||
|
||||
return command(*bound.args, **bound.kwargs, **additional_kwargs)
|
||||
|
||||
|
||||
@app.command(name='level')
|
||||
def level(
|
||||
new_level: Annotated[float, Argument()] = None,
|
||||
*,
|
||||
strip_index: Annotated[int, Parameter(show=False)] = None,
|
||||
gainlayer_index: Annotated[int, Parameter(show=False)] = None,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Get or set the level of the specified gainlayer.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
new_level : float
|
||||
If provided, sets the level to this value. If not provided, the current level is printed.
|
||||
"""
|
||||
if new_level is None:
|
||||
console.out.print(ctx.client.strip[strip_index].gainlayer[gainlayer_index].gain)
|
||||
return
|
||||
ctx.client.strip[strip_index].gainlayer[gainlayer_index].gain = new_level
|
||||
@@ -3,9 +3,9 @@ from typing import Annotated
|
||||
from cyclopts import App, Argument, Parameter
|
||||
|
||||
from .context import Context
|
||||
from .help import CustomHelpFormatter
|
||||
from .help import StripHelpFormatter
|
||||
|
||||
app = App(name='gate', help_formatter=CustomHelpFormatter())
|
||||
app = App(name='gate', help_formatter=StripHelpFormatter())
|
||||
|
||||
|
||||
@app.meta.default
|
||||
|
||||
@@ -4,31 +4,24 @@ from cyclopts.help import DefaultFormatter, HelpPanel
|
||||
from rich.console import Console, ConsoleOptions
|
||||
|
||||
|
||||
class CustomHelpFormatter(DefaultFormatter):
|
||||
"""Custom help formatter that injects an index argument into the usage line and filters it out from the parameters list.
|
||||
|
||||
This formatter modifies the usage line to include an <index> argument after the 'strip' command,
|
||||
and filters out any parameters related to 'index' from the Parameters section of the help output.
|
||||
"""
|
||||
|
||||
def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None:
|
||||
"""Render the usage line with index argument injected."""
|
||||
if usage:
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+[a-z]+)\s+(COMMAND)', r'\1 <index> \2', str(usage)
|
||||
)
|
||||
console.print(f'[bold]Usage:[/bold] {modified_usage}')
|
||||
class BaseHelpFormatter(DefaultFormatter):
|
||||
"""Base help formatter that provides common functionality."""
|
||||
|
||||
def __call__(
|
||||
self, console: Console, options: ConsoleOptions, panel: HelpPanel
|
||||
) -> None:
|
||||
"""Render a help panel, filtering out the index parameter from Parameters sections."""
|
||||
"""Render a help panel, filtering out hidden parameters from Parameters sections."""
|
||||
if panel.title == 'Parameters':
|
||||
filtered_entries = [
|
||||
entry
|
||||
for entry in panel.entries
|
||||
if not (
|
||||
entry.names and any('index' in name.lower() for name in entry.names)
|
||||
entry.names
|
||||
and any(
|
||||
param in name.lower()
|
||||
for name in entry.names
|
||||
for param in self.get_filtered_params()
|
||||
)
|
||||
)
|
||||
]
|
||||
|
||||
@@ -41,3 +34,94 @@ class CustomHelpFormatter(DefaultFormatter):
|
||||
super().__call__(console, options, filtered_panel)
|
||||
else:
|
||||
super().__call__(console, options, panel)
|
||||
|
||||
def get_filtered_params(self):
|
||||
"""Return list of parameter names to filter out of help output."""
|
||||
return ['index', 'band', 'ctx', 'target', 'eq_kind']
|
||||
|
||||
|
||||
class StripHelpFormatter(BaseHelpFormatter):
|
||||
"""Help formatter for strip commands that injects <index> after 'strip'."""
|
||||
|
||||
def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None:
|
||||
"""Render the usage line with index argument injected after 'strip'.
|
||||
|
||||
Handles both command groups (COMMAND) and individual commands (commandname [ARGS/OPTIONS]).
|
||||
"""
|
||||
if usage:
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+strip)\s+(\w+\s+\[[^\]]+\]|\w+\s+\[[^\]]+\]|\w+(?:\s+\[[^\]]+\])*|COMMAND)',
|
||||
r'\1 <index> \2',
|
||||
str(usage),
|
||||
)
|
||||
if modified_usage == str(usage):
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+strip)\s+(\w+)', r'\1 <index> \2', str(usage)
|
||||
)
|
||||
console.print(f'[bold]Usage:[/bold] {modified_usage}')
|
||||
|
||||
|
||||
class BusHelpFormatter(BaseHelpFormatter):
|
||||
"""Help formatter for bus commands that injects <index> after 'bus'."""
|
||||
|
||||
def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None:
|
||||
"""Render the usage line with index argument injected after 'bus'.
|
||||
|
||||
Handles both command groups (COMMAND) and individual commands (commandname [ARGS/OPTIONS])."""
|
||||
if usage:
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+bus)\s+(\w+\s+\[[^\]]+\]|\w+\s+\[[^\]]+\]|\w+(?:\s+\[[^\]]+\])*|COMMAND)',
|
||||
r'\1 <index> \2',
|
||||
str(usage),
|
||||
)
|
||||
if modified_usage == str(usage):
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+bus)\s+(\w+)', r'\1 <index> \2', str(usage)
|
||||
)
|
||||
console.print(f'[bold]Usage:[/bold] {modified_usage}')
|
||||
|
||||
|
||||
class EqHelpFormatter(BaseHelpFormatter):
|
||||
"""Help formatter for eq commands that works with both strip and bus commands.
|
||||
|
||||
Injects <index> after 'strip' or 'bus' and <band> after 'cell'."""
|
||||
|
||||
def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None:
|
||||
"""Render the usage line with proper <index> placement for both strip and bus commands."""
|
||||
if usage:
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+)(\w+)(\s+eq\s+)(COMMAND)', r'\1\2 <index>\3\4', str(usage)
|
||||
)
|
||||
console.print(f'[bold]Usage:[/bold] {modified_usage}')
|
||||
|
||||
|
||||
class GainlayerHelpFormatter(BaseHelpFormatter):
|
||||
"""Help formatter for gainlayer commands that works with strip commands.
|
||||
|
||||
Injects <index> after 'strip' and <gainlayer_index> after 'gainlayer'."""
|
||||
|
||||
def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None:
|
||||
"""Render the usage line with proper <index> placement for strip commands."""
|
||||
if usage:
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+strip)(\s+gainlayer\s+)(COMMAND)',
|
||||
r'\1 <index>\2<[cyan]gainlayer_index[/cyan]> \3',
|
||||
str(usage),
|
||||
)
|
||||
console.print(f'[bold]Usage:[/bold] {modified_usage}')
|
||||
|
||||
|
||||
class CellHelpFormatter(BaseHelpFormatter):
|
||||
"""Help formatter for cell commands that works with both strip and bus commands.
|
||||
|
||||
Injects <index> after 'strip' or 'bus' and <band> after 'cell'."""
|
||||
|
||||
def render_usage(self, console: Console, options: ConsoleOptions, usage) -> None:
|
||||
"""Render the usage line with proper <index> and <band> placement."""
|
||||
if usage:
|
||||
modified_usage = re.sub(
|
||||
r'(\S+\s+)(\w+)(\s+eq\s+cell\s+)(COMMAND)',
|
||||
r'\1\2 <index>\3<[cyan]band[/cyan]> \4',
|
||||
str(usage),
|
||||
)
|
||||
console.print(f'[bold]Usage:[/bold] {modified_usage}')
|
||||
|
||||
118
src/vban_cli/recorder.py
Normal file
118
src/vban_cli/recorder.py
Normal file
@@ -0,0 +1,118 @@
|
||||
from pathlib import Path
|
||||
from typing import Annotated
|
||||
|
||||
from cyclopts import App, Parameter, validators
|
||||
|
||||
from . import console, validation
|
||||
from .context import Context
|
||||
from .help import BaseHelpFormatter
|
||||
|
||||
app = App(name='recorder', help_formatter=BaseHelpFormatter())
|
||||
|
||||
|
||||
@app.command(name='play')
|
||||
def play(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Start the recorder playback."""
|
||||
ctx.client.recorder.play()
|
||||
console.out.print('Recorder playback started.')
|
||||
|
||||
|
||||
@app.command(name='stop')
|
||||
def stop(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Stop the recorder playback."""
|
||||
ctx.client.recorder.stop()
|
||||
console.out.print('Recorder playback stopped.')
|
||||
|
||||
|
||||
@app.command(name='pause')
|
||||
def pause(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Pause the recorder playback."""
|
||||
ctx.client.recorder.pause()
|
||||
console.out.print('Recorder playback paused.')
|
||||
|
||||
|
||||
@app.command(name='replay')
|
||||
def replay(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Replay the recorder playback."""
|
||||
ctx.client.recorder.replay()
|
||||
console.out.print('Recorder playback replay started.')
|
||||
|
||||
|
||||
@app.command(name='record')
|
||||
def record(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Start recording."""
|
||||
ctx.client.recorder.record()
|
||||
console.out.print('Recording started.')
|
||||
|
||||
|
||||
@app.command(name='ff')
|
||||
def ff(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Fast forward the recorder playback."""
|
||||
ctx.client.recorder.ff()
|
||||
console.out.print('Recorder playback fast forwarded.')
|
||||
|
||||
|
||||
@app.command(name='rew')
|
||||
def rew(
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Rewind the recorder playback."""
|
||||
ctx.client.recorder.rew()
|
||||
console.out.print('Recorder playback rewound.')
|
||||
|
||||
|
||||
@app.command(name='load')
|
||||
def load(
|
||||
file_path: Annotated[
|
||||
Path,
|
||||
Parameter(
|
||||
help='The path to the recording file to load.',
|
||||
validator=validators.Path(exists=True),
|
||||
),
|
||||
],
|
||||
/,
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Load a file into the recorder.
|
||||
|
||||
note: This command may only work if vban-cli is running on localhost and may not work if vban-cli is running on a remote server."""
|
||||
ctx.client.recorder.load(file_path)
|
||||
console.out.print(f'Loaded file: {file_path}')
|
||||
|
||||
|
||||
@app.command(name='goto')
|
||||
def goto(
|
||||
time_string: Annotated[
|
||||
str,
|
||||
Parameter(
|
||||
help='The timestamp to go to in the recorder playback (format: HH:MM:SS).',
|
||||
validator=validation.is_valid_time_string,
|
||||
),
|
||||
],
|
||||
/,
|
||||
*,
|
||||
ctx: Annotated[Context, Parameter(show=False)] = None,
|
||||
):
|
||||
"""Go to a specific timestamp in the recorder playback."""
|
||||
ctx.client.recorder.goto(time_string)
|
||||
console.out.print(f'Went to timestamp {time_string} in recorder playback.')
|
||||
@@ -2,15 +2,16 @@ from typing import Annotated, Optional
|
||||
|
||||
from cyclopts import App, Argument, Parameter
|
||||
|
||||
from . import comp, console, denoiser, eq, gate
|
||||
from . import comp, console, denoiser, eq, gainlayer, gate
|
||||
from .context import Context
|
||||
from .help import CustomHelpFormatter
|
||||
from .help import StripHelpFormatter
|
||||
|
||||
app = App(name='strip', help_formatter=CustomHelpFormatter())
|
||||
app = App(name='strip', help_formatter=StripHelpFormatter())
|
||||
app.command(eq.app.meta, name='eq')
|
||||
app.command(comp.app.meta, name='comp')
|
||||
app.command(gate.app.meta, name='gate')
|
||||
app.command(denoiser.app.meta, name='denoiser')
|
||||
app.command(gainlayer.app.meta, name='gainlayer')
|
||||
|
||||
|
||||
@app.meta.default
|
||||
@@ -22,6 +23,8 @@ def launcher(
|
||||
"""Control the strip parameters."""
|
||||
additional_kwargs = {}
|
||||
command, bound, _ = app.parse_args(tokens)
|
||||
if tokens[0] == 'eq':
|
||||
additional_kwargs['eq_kind'] = app.name[0]
|
||||
if index is not None:
|
||||
additional_kwargs['index'] = index
|
||||
if ctx is not None:
|
||||
|
||||
9
src/vban_cli/validation.py
Normal file
9
src/vban_cli/validation.py
Normal file
@@ -0,0 +1,9 @@
|
||||
import re
|
||||
|
||||
|
||||
def is_valid_time_string(type_, value: str) -> str:
|
||||
"""Validate if the given string is a valid time format (HH:MM:SS)."""
|
||||
pattern = r'^(?:[01]\d|2[0123]):(?:[012345]\d):(?:[012345]\d)$'
|
||||
if not re.match(pattern, value):
|
||||
raise ValueError('Invalid time format. Expected HH:MM:SS.')
|
||||
return value
|
||||
41
uv.lock
generated
41
uv.lock
generated
@@ -11,6 +11,15 @@ wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/3a/2a/7cc015f5b9f5db42b7d48157e23356022889fc354a2813c15934b7cb5c0e/attrs-25.4.0-py3-none-any.whl", hash = "sha256:adcf7e2a1fb3b36ac48d97835bb6d8ade15b8dcce26aba8bf1d14847b57a3373", size = 67615, upload-time = "2025-10-06T13:54:43.17Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "colorama"
|
||||
version = "0.4.6"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cyclopts"
|
||||
version = "4.6.0"
|
||||
@@ -44,6 +53,19 @@ wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/02/10/5da547df7a391dcde17f59520a231527b8571e6f46fc8efb02ccb370ab12/docutils-0.22.4-py3-none-any.whl", hash = "sha256:d0013f540772d1420576855455d050a2180186c91c15779301ac2ccb3eeb68de", size = 633196, upload-time = "2025-12-18T19:00:18.077Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "loguru"
|
||||
version = "0.7.3"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
dependencies = [
|
||||
{ name = "colorama", marker = "sys_platform == 'win32'" },
|
||||
{ name = "win32-setctime", marker = "sys_platform == 'win32'" },
|
||||
]
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/3a/05/a1dae3dffd1116099471c643b8924f5aa6524411dc6c63fdae648c4f1aca/loguru-0.7.3.tar.gz", hash = "sha256:19480589e77d47b8d85b2c827ad95d49bf31b0dcde16593892eb51dd18706eb6", size = 63559, upload-time = "2024-12-06T11:20:56.608Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/0c/29/0348de65b8cc732daa3e33e67806420b2ae89bdce2b04af740289c5c6c8c/loguru-0.7.3-py3-none-any.whl", hash = "sha256:31a33c10c8e1e10422bfd431aeb5d351c7cf7fa671e3c4df004162264b28220c", size = 61595, upload-time = "2024-12-06T11:20:54.538Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "markdown-it-py"
|
||||
version = "4.0.0"
|
||||
@@ -102,23 +124,34 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "vban-cli"
|
||||
version = "0.3.0"
|
||||
version = "0.9.0"
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "cyclopts" },
|
||||
{ name = "loguru" },
|
||||
{ name = "vban-cmd" },
|
||||
]
|
||||
|
||||
[package.metadata]
|
||||
requires-dist = [
|
||||
{ name = "cyclopts", specifier = ">=4.6.0" },
|
||||
{ name = "vban-cmd", directory = "../vban-cmd-python" },
|
||||
{ name = "loguru", specifier = ">=0.7.3" },
|
||||
{ name = "vban-cmd", editable = "../vban-cmd-python" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vban-cmd"
|
||||
version = "2.6.0"
|
||||
source = { directory = "../vban-cmd-python" }
|
||||
version = "2.8.0"
|
||||
source = { editable = "../vban-cmd-python" }
|
||||
|
||||
[package.metadata]
|
||||
requires-dist = [{ name = "tomli", marker = "python_full_version < '3.11'", specifier = ">=2.0.1,<3.0" }]
|
||||
|
||||
[[package]]
|
||||
name = "win32-setctime"
|
||||
version = "1.2.0"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/b3/8f/705086c9d734d3b663af0e9bb3d4de6578d08f46b1b101c2442fd9aecaa2/win32_setctime-1.2.0.tar.gz", hash = "sha256:ae1fdf948f5640aae05c511ade119313fb6a30d7eabe25fef9764dca5873c4c0", size = 4867, upload-time = "2024-12-07T15:28:28.314Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/e1/07/c6fe3ad3e685340704d314d765b7912993bcb8dc198f0e7a89382d37974b/win32_setctime-1.2.0-py3-none-any.whl", hash = "sha256:95d644c4e708aba81dc3704a116d8cbc974d70b3bdb8be1d150e36be6e9d1390", size = 4083, upload-time = "2024-12-07T15:28:26.465Z" },
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user