onyx_online/obsws-cli
1
0
Fork 0
mirror of https://github.com/onyx-and-iris/obsws-cli.git synced 2025-06-27 14:00:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

by setting values in the default style to 'none' we avoid the rich markup errors in console.highlight

Browse Source 
add comment to util.check_mark and test only NO_COLOR

patch bump
This commit is contained in:
onyx-and-iris 2025-06-22 10:14:46 +01:00
parent 55e60ff977
commit 7bec573ef9
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
obsws_cli/__about__.py
View File

@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2025-present onyx-and-iris <code@onyxandiris.online>
#
# SPDX-License-Identifier: MIT
__version__ = "0.18.2"
__version__ = "0.18.3"

2
obsws_cli/console.py
View File

@ -9,6 +9,4 @@ err = Console(stderr=True, style='bold red')
def highlight(ctx: typer.Context, text: str) -> str:
"""Highlight text using the current context's style."""
if ctx.obj['style'].name == 'no_colour':
return text
return f'[{ctx.obj["style"].highlight}]{text}[/{ctx.obj["style"].highlight}]'

2
obsws_cli/filter.py
View File

@ -72,7 +72,7 @@ def list_(
table.add_row(
filter['filterName'],
util.snakecase_to_titlecase(filter['filterKind']),
util.check_mark(ctx, filter['filterEnabled']),
util.check_mark(filter['filterEnabled']),
'\n'.join(
[
f'{util.snakecase_to_titlecase(k):<20} {v:>10}'

2
obsws_cli/group.py
View File

@ -68,7 +68,7 @@ def list_(
table.add_row(
str(item_id),
group_name,
util.check_mark(ctx, is_enabled),
util.check_mark(is_enabled),
)
console.out.print(table)

2
obsws_cli/input.py
View File

@ -81,7 +81,7 @@ def list_(
input_mark = ''
try:
input_muted = ctx.obj['obsws'].get_input_mute(name=input_name).input_muted
input_mark = util.check_mark(ctx, input_muted)
input_mark = util.check_mark(input_muted)
except obsws.error.OBSSDKRequestError as e:
if e.code == 604: # Input does not support audio
input_mark = 'N/A'

4
obsws_cli/scene.py
View File

@ -50,13 +50,13 @@ def list_(
if uuid:
table.add_row(
scene_name,
util.check_mark(ctx, scene_name == active_scene, empty_if_false=True),
util.check_mark(scene_name == active_scene, empty_if_false=True),
scene_uuid,
)
else:
table.add_row(
scene_name,
util.check_mark(ctx, scene_name == active_scene, empty_if_false=True),
util.check_mark(scene_name == active_scene, empty_if_false=True),
)
console.out.print(table)

8
obsws_cli/sceneitem.py
View File

@ -107,7 +107,7 @@ def list_(
str(group_item_id),
group_item_name,
item_name,
util.check_mark(ctx, is_enabled and group_item_enabled),
util.check_mark(is_enabled and group_item_enabled),
group_item_source_uuid,
)
else:
@ -115,7 +115,7 @@ def list_(
str(group_item_id),
group_item_name,
item_name,
util.check_mark(ctx, is_enabled and group_item_enabled),
util.check_mark(is_enabled and group_item_enabled),
)
else:
if uuid:
@ -123,7 +123,7 @@ def list_(
str(item_id),
item_name,
'',
util.check_mark(ctx, is_enabled),
util.check_mark(is_enabled),
source_uuid,
)
else:
@ -131,7 +131,7 @@ def list_(
str(item_id),
item_name,
'',
util.check_mark(ctx, is_enabled),
util.check_mark(is_enabled),
)
console.out.print(table)

6
obsws_cli/styles.py
View File

@ -21,9 +21,9 @@ class Style:
name: str = 'no_colour'
description: str = 'Style disabled'
border: str | None = None
column: str | None = None
highlight: str | None = None
border: str = 'none'
column: str = 'none'
highlight: str = 'none'
no_border: bool = False
def __post_init__(self):

10
obsws_cli/util.py
View File

@ -2,19 +2,21 @@
import os
import typer
def snakecase_to_titlecase(snake_str: str) -> str:
"""Convert a snake_case string to a title case string."""
return snake_str.replace('_', ' ').title()
def check_mark(ctx: typer.Context, value: bool, empty_if_false: bool = False) -> str:
def check_mark(value: bool, empty_if_false: bool = False) -> str:
"""Return a check mark or cross mark based on the boolean value."""
if empty_if_false and not value:
return ''
if os.getenv('NO_COLOR', '') != '' or ctx.obj['style'].name == 'no_colour':
# For all other output rich gracefully handles colourless output
# but here we must handle it manually
# If NO_COLOR is set, return simple check or cross marks
# Otherwise, return colored check or cross marks
if os.getenv('NO_COLOR', '') != '':
return '✓' if value else '✗'
return '✅' if value else '❌'