mirror of
https://github.com/onyx-and-iris/obsws-cli.git
synced 2025-06-07 20:20:32 +01:00
write to rich consoles
patch bump
This commit is contained in:
parent
f223c51a71
commit
a82344b79e
@ -1,4 +1,4 @@
|
|||||||
# SPDX-FileCopyrightText: 2025-present onyx-and-iris <code@onyxandiris.online>
|
# SPDX-FileCopyrightText: 2025-present onyx-and-iris <code@onyxandiris.online>
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
__version__ = "0.12.5"
|
__version__ = "0.12.6"
|
||||||
|
@ -63,20 +63,19 @@ def _validate_scene_name_and_item_name(
|
|||||||
parent: Optional[str] = None,
|
parent: Optional[str] = None,
|
||||||
):
|
):
|
||||||
if not validate.scene_in_scenes(ctx, scene_name):
|
if not validate.scene_in_scenes(ctx, scene_name):
|
||||||
typer.echo(f"Scene '{scene_name}' not found.", err=True)
|
err_console.print(f"Scene '{scene_name}' not found.")
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
if parent:
|
if parent:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
||||||
typer.echo(
|
err_console.print(
|
||||||
f"Parent group '{parent}' not found in scene '{scene_name}'.",
|
f"Parent group '{parent}' not found in scene '{scene_name}'."
|
||||||
err=True,
|
|
||||||
)
|
)
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
else:
|
else:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
||||||
typer.echo(
|
err_console.print(
|
||||||
f"Item '{item_name}' not found in scene '{scene_name}'.", err=True
|
f"Item '{item_name}' not found in scene '{scene_name}'."
|
||||||
)
|
)
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
@ -96,7 +95,7 @@ def _get_scene_name_and_item_id(
|
|||||||
scene_item_id = item.get('sceneItemId')
|
scene_item_id = item.get('sceneItemId')
|
||||||
break
|
break
|
||||||
else:
|
else:
|
||||||
typer.echo(f"Item '{item_name}' not found in group '{parent}'.", err=True)
|
err_console.print(f"Item '{item_name}' not found in group '{parent}'.")
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
else:
|
else:
|
||||||
resp = ctx.obj.get_scene_item_id(scene_name, item_name)
|
resp = ctx.obj.get_scene_item_id(scene_name, item_name)
|
||||||
@ -124,7 +123,7 @@ def show(
|
|||||||
enabled=True,
|
enabled=True,
|
||||||
)
|
)
|
||||||
|
|
||||||
typer.echo(f"Item '{item_name}' in scene '{scene_name}' has been shown.")
|
out_console.print(f"Item '{item_name}' in scene '{scene_name}' has been shown.")
|
||||||
|
|
||||||
|
|
||||||
@_validate_scene_name_and_item_name
|
@_validate_scene_name_and_item_name
|
||||||
@ -146,7 +145,7 @@ def hide(
|
|||||||
enabled=False,
|
enabled=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
typer.echo(f"Item '{item_name}' in scene '{scene_name}' has been hidden.")
|
out_console.print(f"Item '{item_name}' in scene '{scene_name}' has been hidden.")
|
||||||
|
|
||||||
|
|
||||||
@_validate_scene_name_and_item_name
|
@_validate_scene_name_and_item_name
|
||||||
@ -159,20 +158,18 @@ def toggle(
|
|||||||
):
|
):
|
||||||
"""Toggle an item in a scene."""
|
"""Toggle an item in a scene."""
|
||||||
if not validate.scene_in_scenes(ctx, scene_name):
|
if not validate.scene_in_scenes(ctx, scene_name):
|
||||||
typer.echo(f"Scene '{scene_name}' not found.")
|
err_console.print(f"Scene '{scene_name}' not found.")
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
if parent:
|
if parent:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
||||||
typer.echo(
|
err_console.print(
|
||||||
f"Parent group '{parent}' not found in scene '{scene_name}'.", err=True
|
f"Parent group '{parent}' not found in scene '{scene_name}'."
|
||||||
)
|
)
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
else:
|
else:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
||||||
typer.echo(
|
err_console.print(f"Item '{item_name}' not found in scene '{scene_name}'.")
|
||||||
f"Item '{item_name}' not found in scene '{scene_name}'.", err=True
|
|
||||||
)
|
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
scene_name, scene_item_id = _get_scene_name_and_item_id(
|
scene_name, scene_item_id = _get_scene_name_and_item_id(
|
||||||
@ -191,7 +188,7 @@ def toggle(
|
|||||||
enabled=new_state,
|
enabled=new_state,
|
||||||
)
|
)
|
||||||
|
|
||||||
typer.echo(
|
out_console.print(
|
||||||
f"Item '{item_name}' in scene '{scene_name}' has been {'shown' if new_state else 'hidden'}."
|
f"Item '{item_name}' in scene '{scene_name}' has been {'shown' if new_state else 'hidden'}."
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -207,15 +204,13 @@ def visible(
|
|||||||
"""Check if an item in a scene is visible."""
|
"""Check if an item in a scene is visible."""
|
||||||
if parent:
|
if parent:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
||||||
typer.echo(
|
err_console.print(
|
||||||
f"Parent group '{parent}' not found in scene '{scene_name}'.", err=True
|
f"Parent group '{parent}' not found in scene '{scene_name}'."
|
||||||
)
|
)
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
else:
|
else:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
||||||
typer.echo(
|
err_console.print(f"Item '{item_name}' not found in scene '{scene_name}'.")
|
||||||
f"Item '{item_name}' not found in scene '{scene_name}'.", err=True
|
|
||||||
)
|
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
old_scene_name = scene_name
|
old_scene_name = scene_name
|
||||||
@ -229,7 +224,7 @@ def visible(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if parent:
|
if parent:
|
||||||
typer.echo(
|
out_console.print(
|
||||||
f"Item '{item_name}' in group '{parent}' in scene '{old_scene_name}' is currently {'visible' if enabled.scene_item_enabled else 'hidden'}."
|
f"Item '{item_name}' in group '{parent}' in scene '{old_scene_name}' is currently {'visible' if enabled.scene_item_enabled else 'hidden'}."
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
@ -237,7 +232,7 @@ def visible(
|
|||||||
# This is to avoid confusion with the parent group name
|
# This is to avoid confusion with the parent group name
|
||||||
# which is not the same as the scene name
|
# which is not the same as the scene name
|
||||||
# and is not needed in this case
|
# and is not needed in this case
|
||||||
typer.echo(
|
out_console.print(
|
||||||
f"Item '{item_name}' in scene '{scene_name}' is currently {'visible' if enabled.scene_item_enabled else 'hidden'}."
|
f"Item '{item_name}' in scene '{scene_name}' is currently {'visible' if enabled.scene_item_enabled else 'hidden'}."
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -298,15 +293,13 @@ def transform(
|
|||||||
"""Set the transform of an item in a scene."""
|
"""Set the transform of an item in a scene."""
|
||||||
if parent:
|
if parent:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
if not validate.item_in_scene_item_list(ctx, scene_name, parent):
|
||||||
typer.echo(
|
err_console.print(
|
||||||
f"Parent group '{parent}' not found in scene '{scene_name}'.", err=True
|
f"Parent group '{parent}' not found in scene '{scene_name}'."
|
||||||
)
|
)
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
else:
|
else:
|
||||||
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
if not validate.item_in_scene_item_list(ctx, scene_name, item_name):
|
||||||
typer.echo(
|
err_console.print(f"Item '{item_name}' not found in scene '{scene_name}'.")
|
||||||
f"Item '{item_name}' not found in scene '{scene_name}'.", err=True
|
|
||||||
)
|
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
old_scene_name = scene_name
|
old_scene_name = scene_name
|
||||||
@ -347,7 +340,7 @@ def transform(
|
|||||||
transform['scaleY'] = scale_y
|
transform['scaleY'] = scale_y
|
||||||
|
|
||||||
if not transform:
|
if not transform:
|
||||||
typer.echo('No transform options provided.', err=True)
|
err_console.print('No transform options provided.')
|
||||||
raise typer.Exit(1)
|
raise typer.Exit(1)
|
||||||
|
|
||||||
transform = ctx.obj.set_scene_item_transform(
|
transform = ctx.obj.set_scene_item_transform(
|
||||||
@ -357,7 +350,7 @@ def transform(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if parent:
|
if parent:
|
||||||
typer.echo(
|
out_console.print(
|
||||||
f"Item '{item_name}' in group '{parent}' in scene '{old_scene_name}' has been transformed."
|
f"Item '{item_name}' in group '{parent}' in scene '{old_scene_name}' has been transformed."
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
@ -365,4 +358,6 @@ def transform(
|
|||||||
# This is to avoid confusion with the parent group name
|
# This is to avoid confusion with the parent group name
|
||||||
# which is not the same as the scene name
|
# which is not the same as the scene name
|
||||||
# and is not needed in this case
|
# and is not needed in this case
|
||||||
typer.echo(f"Item '{item_name}' in scene '{scene_name}' has been transformed.")
|
out_console.print(
|
||||||
|
f"Item '{item_name}' in scene '{scene_name}' has been transformed."
|
||||||
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user