forked from Shinonome/caelestia-cli
feat: allow disabling print prefix
This commit is contained in:
@@ -125,11 +125,11 @@ class Command:
|
|||||||
if not comp_arr:
|
if not comp_arr:
|
||||||
return
|
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)))
|
max_idx_w = len(str(len(comp_arr)))
|
||||||
for i, comp in enumerate(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, True, 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, "[A]ll or (1 2 3, 1-3, ^4)"))
|
||||||
|
|
||||||
def _valid_v(v: str) -> int:
|
def _valid_v(v: str) -> int:
|
||||||
try:
|
try:
|
||||||
|
|||||||
+16
-16
@@ -31,28 +31,28 @@ def log_exception(func):
|
|||||||
return wrapper
|
return wrapper
|
||||||
|
|
||||||
|
|
||||||
def format_msg(colour: int, msg: str) -> str:
|
def format_msg(colour: int, prefix: bool, msg: str) -> str:
|
||||||
return f"\033[{colour}m:: {msg}\033[0m"
|
return f"\033[{colour}m{':: ' if prefix else ''}{msg}\033[0m"
|
||||||
|
|
||||||
|
|
||||||
def log(msg: str) -> None:
|
def log(msg: str, prefix: bool = True) -> None:
|
||||||
print(format_msg(LOG_COLOUR, msg))
|
print(format_msg(LOG_COLOUR, prefix, msg))
|
||||||
|
|
||||||
|
|
||||||
def info(msg: str) -> None:
|
def info(msg: str, prefix: bool = True) -> None:
|
||||||
print(format_msg(INFO_COLOUR, msg))
|
print(format_msg(INFO_COLOUR, prefix, msg))
|
||||||
|
|
||||||
|
|
||||||
def warn(msg: str) -> None:
|
def warn(msg: str, prefix: bool = True) -> None:
|
||||||
print(format_msg(WARNING_COLOUR, f"Warning: {msg}"))
|
print(format_msg(WARNING_COLOUR, prefix, f"Warning: {msg}"))
|
||||||
|
|
||||||
|
|
||||||
def error(err: str | Exception) -> None:
|
def error(err: str | Exception, prefix: bool = True) -> None:
|
||||||
print(format_msg(ERROR_COLOUR, f"Error: {err}"), file=sys.stderr)
|
print(format_msg(ERROR_COLOUR, prefix, f"Error: {err}"), file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
def fatal(err: str | Exception) -> Never:
|
def fatal(err: str | Exception, prefix: bool = True) -> Never:
|
||||||
print(format_msg(ERROR_COLOUR, f"Fatal: {err}"), file=sys.stderr)
|
print(format_msg(ERROR_COLOUR, prefix, f"Fatal: {err}"), file=sys.stderr)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
@@ -68,13 +68,13 @@ def _input(prompt: str) -> str:
|
|||||||
raise KeyboardInterrupt()
|
raise KeyboardInterrupt()
|
||||||
|
|
||||||
|
|
||||||
def prompt(msg: str, end: str = " ") -> str:
|
def prompt(msg: str, prefix: bool = True, end: str = " ") -> str:
|
||||||
return _input(format_msg(PROMPT_COLOUR, msg) + end)
|
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]"
|
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:
|
if not answer:
|
||||||
return default
|
return default
|
||||||
return answer in ("y", "yes")
|
return answer in ("y", "yes")
|
||||||
|
|||||||
Reference in New Issue
Block a user