erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cli: rich initial integration

Browse source
This commit is contained in:
Goffi 2023-10-18 15:30:07 +02:00
commit bd2db73ee5
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libervia/cli/base.py
View file

@ -52,6 +52,7 @@ from libervia.frontends.bridge.bridge_frontend import BridgeException
from libervia.frontends.tools import misc from libervia.frontends.tools import misc
import xml.etree.ElementTree as ET # FIXME: used temporarily to manage XMLUI import xml.etree.ElementTree as ET # FIXME: used temporarily to manage XMLUI
from collections import OrderedDict from collections import OrderedDict
from rich import console
## bridge handling ## bridge handling
# we get bridge name from conf and initialise the right class accordingly # we get bridge name from conf and initialise the right class accordingly
@ -106,6 +107,7 @@ class LiberviaCli:
@attribute progress_failure(callable): method to call when progress failed @attribute progress_failure(callable): method to call when progress failed
by default display a message by default display a message
""" """
self.console = console.Console(theme=C.THEME_DEFAULT)
self.sat_conf = main_config self.sat_conf = main_config
self.set_color_theme() self.set_color_theme()
bridge_module = dynamic_import.bridge(bridge_name, 'libervia.frontends.bridge') bridge_module = dynamic_import.bridge(bridge_name, 'libervia.frontends.bridge')
@ -734,6 +736,7 @@ class LiberviaCli:
def run(cls): def run(cls):
cls()._run() cls()._run()
def _read_stdin(self, stdin_fut): def _read_stdin(self, stdin_fut):
"""Callback called by ainput to read stdin""" """Callback called by ainput to read stdin"""
line = sys.stdin.readline() line = sys.stdin.readline()
@ -1122,6 +1125,13 @@ class CommandBase:
def progress_id(self): def progress_id(self):
return self.host.progress_id return self.host.progress_id
@property
def console(self):
return self.host.console
def print(self, *args, **kwargs):
self.host.console.print(*args, **kwargs)
async def set_progress_id(self, progress_id): async def set_progress_id(self, progress_id):
return await self.host.set_progress_id(progress_id) return await self.host.set_progress_id(progress_id)

10
libervia/cli/constants.py
View file

@ -19,6 +19,7 @@
from libervia.frontends.quick_frontend import constants from libervia.frontends.quick_frontend import constants
from libervia.backend.tools.common.ansi import ANSI as A from libervia.backend.tools.common.ansi import ANSI as A
from rich.theme import Theme
class Const(constants.Const): class Const(constants.Const):
@ -83,3 +84,12 @@ class Const(constants.Const):
# Files # Files
A_DIRECTORY = A.BOLD + A.FG_CYAN A_DIRECTORY = A.BOLD + A.FG_CYAN
A_FILE = A.FG_WHITE A_FILE = A.FG_WHITE
# rich
THEME_DEFAULT = Theme({
"priority_low": "green",
"priority_medium": "yellow",
"priority_high": "bold magenta",
"priority_urgent": "bold red",
"notif_title": "bold",
})