Shinonome/caelestia-cli
1
0
Fork 1
mirror of https://github.com/caelestia-dots/cli.git synced 2026-06-16 05:49:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat: allow disabling print prefix

Browse Source
This commit is contained in:
2 * r + 2 * t
2026-06-15 23:47:40 +10:00
parent 56f2e94d5b
commit e02fc7427d
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/caelestia/subcommands/install.py
+3 -3
View File
@@ -125,11 +125,11 @@ class Command:
if not comp_arr:
return
print(format_msg(PROMPT_COLOUR, "Components to enable?"))
print(format_msg(PROMPT_COLOUR, True, "Components to enable?"))
max_idx_w = len(str(len(comp_arr)))
for i, comp in enumerate(comp_arr):
print(format_msg(PROMPT_COLOUR, f" {i + 1:<{max_idx_w}}\t{comp}"))
print(format_msg(PROMPT_COLOUR, "[A]ll or (1 2 3, 1-3, ^4)"))
print(format_msg(PROMPT_COLOUR, True, f" {i + 1:<{max_idx_w}}\t{comp}"))
print(format_msg(PROMPT_COLOUR, True, "[A]ll or (1 2 3, 1-3, ^4)"))
def _valid_v(v: str) -> int:
try:
src/caelestia/utils/io.py
+16 -16
View File
@@ -31,28 +31,28 @@ def log_exception(func):
return wrapper
def format_msg(colour: int, msg: str) -> str:
return f"\033[{colour}m:: {msg}\033[0m"
def format_msg(colour: int, prefix: bool, msg: str) -> str:
return f"\033[{colour}m{':: ' if prefix else ''}{msg}\033[0m"
def log(msg: str) -> None:
print(format_msg(LOG_COLOUR, msg))
def log(msg: str, prefix: bool = True) -> None:
print(format_msg(LOG_COLOUR, prefix, msg))
def info(msg: str) -> None:
print(format_msg(INFO_COLOUR, msg))
def info(msg: str, prefix: bool = True) -> None:
print(format_msg(INFO_COLOUR, prefix, msg))
def warn(msg: str) -> None:
print(format_msg(WARNING_COLOUR, f"Warning: {msg}"))
def warn(msg: str, prefix: bool = True) -> None:
print(format_msg(WARNING_COLOUR, prefix, f"Warning: {msg}"))
def error(err: str | Exception) -> None:
print(format_msg(ERROR_COLOUR, f"Error: {err}"), file=sys.stderr)
def error(err: str | Exception, prefix: bool = True) -> None:
print(format_msg(ERROR_COLOUR, prefix, f"Error: {err}"), file=sys.stderr)
def fatal(err: str | Exception) -> Never:
print(format_msg(ERROR_COLOUR, f"Fatal: {err}"), file=sys.stderr)
def fatal(err: str | Exception, prefix: bool = True) -> Never:
print(format_msg(ERROR_COLOUR, prefix, f"Fatal: {err}"), file=sys.stderr)
sys.exit(1)
@@ -68,13 +68,13 @@ def _input(prompt: str) -> str:
raise KeyboardInterrupt()
def prompt(msg: str, end: str = " ") -> str:
return _input(format_msg(PROMPT_COLOUR, msg) + end)
def prompt(msg: str, prefix: bool = True, end: str = " ") -> str:
return _input(format_msg(PROMPT_COLOUR, prefix, msg) + end)
def confirm(msg: str, default: bool = True) -> bool:
def confirm(msg: str, prefix: bool = True, default: bool = True) -> bool:
suffix = " [Y/n]" if default else " [y/N]"
answer = prompt(msg + suffix).strip().lower()
answer = prompt(msg + suffix, prefix=prefix).strip().lower()
if not answer:
return default
return answer in ("y", "yes")